Merge pull request #94 from lorengordon/fix/yum-defs

plus3it · May 11, 2023 · 3493e9b · 3493e9b
2 parents e8fc9e3 + e123622
commit 3493e9b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.1.1
+current_version = 6.1.2
 commit = True
 message = Bumps version to {new_version}
 tag = False

diff --git a/modules/defs/main.tf b/modules/defs/main.tf
@@ -29,7 +29,7 @@ locals {
             {
               name    = "salt-reposync-${platform}"
               baseurl = "${repo.repo_endpoint}/${repo_path}/${version}"
-              gpgkey  = "${repo.repo_endpoint}/${repo_path}/${version}/SALTSTACK-GPG-KEY.pub"
+              gpgkey  = "${repo.repo_endpoint}/${repo_path}/${version}/${tonumber(substr(version, 0, 4)) >= 3006 ? "SALT-PROJECT-GPG-PUBKEY-2023.pub" : "SALTSTACK-GPG-KEY.pub"}"
             }
           )
         }