From 71ebed69637f474c43072deb53658961f03b87c7 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Thu, 11 May 2023 08:31:39 -0700 Subject: [PATCH 1/2] Updates repo gpgkey url with correct value for 3006 and later --- modules/defs/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/defs/main.tf b/modules/defs/main.tf index 86d0360..52e7322 100644 --- 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"}" } ) } From e123622210b3e3c9a006787e7c81106e8ecb6126 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Thu, 11 May 2023 08:31:43 -0700 Subject: [PATCH 2/2] Bumps version to 6.1.2 --- .bumpversion.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ed090d5..9cfe368 100644 --- 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