Merge branch 'master' into fix-yumrepos

voxpupuli · Sep 22, 2018 · 7573a17 · 7573a17
2 parents e56b7d2 + 48fbf8b
commit 7573a17
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/data/RedHat.yaml b/data/RedHat.yaml
@@ -13,8 +13,8 @@ gitlab::repository_configuration:
       ensure: 'present'
       assumeyes: true
       enabled: 1
-      baseurl: "https://packages.gitlab.com/gitlab/gitlab-ee/el/%{facts.os.release.major}/$basearch"
-      gpgkey: "https://packages.gitlab.com/gpg.key"
+      baseurl: "https://packages.gitlab.com/gitlab/gitlab-%{lookup('gitlab::edition')}/el/%{facts.os.release.major}/$basearch"
+      gpgkey: "https://packages.gitlab.com/gitlab/gitlab-%{lookup('gitlab::edition')}/gpgkey https://packages.gitlab.com/gitlab/gitlab-%{lookup('gitlab::edition')}/gpgkey/gitlab-gitlab-%{lookup('gitlab::edition')}-3D645A26AB9FBD22.pub.gpg"
       gpgcheck: 1
       repo_gpgcheck: 1
       sslverify: 1

diff --git a/metadata.json b/metadata.json
@@ -14,11 +14,11 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.0 < 6.0.0"
+      "version_requirement": ">= 4.13.1 < 6.0.0"
     },
     {
       "name": "puppetlabs/apt",
-      "version_requirement": ">=4.4.0 < 6.0.0"
+      "version_requirement": ">= 4.4.0 < 7.0.0"
     }
   ],
   "operatingsystem_support": [