Merge pull request #172 from mhyzon/master

Fix repo URL for RHEL 7. Enable gpgcheck and add in gitlab-ee key.
voxpupuli · Dec 12, 2017 · c55c995 · c55c995
2 parents 687bbc5 + 9088ccc
commit c55c995
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -51,13 +51,18 @@
       }
       'redhat': {
 
+        $gpgkey = $edition ? {
+            'ee'    => 'https://packages.gitlab.com/gitlab/gitlab-ee/gpgkey/gitlab-gitlab-ee-3D645A26AB9FBD22.pub.gpg',
+            default => 'https://packages.gitlab.com/gpg.key',
+        }
+
         yumrepo { "gitlab_official_${edition}":
           descr         => 'Official repository for Gitlab',
-          baseurl       => "https://packages.gitlab.com/gitlab/gitlab-${edition}/el/\$releasever/\$basearch",
+          baseurl       => "https://packages.gitlab.com/gitlab/gitlab-${edition}/el/${::operatingsystemmajrelease}/\$basearch",
           enabled       => 1,
-          gpgcheck      => 0,
-          gpgkey        => 'https://packages.gitlab.com/gpg.key',
           repo_gpgcheck => 1,
+          gpgcheck      => 1,
+          gpgkey        => $gpgkey,
           sslcacert     => '/etc/pki/tls/certs/ca-bundle.crt',
           sslverify     => 1,
         }