[arvados] created: 2.7.0-5832-ge89e1e8c0f
git repository hosting
git at public.arvados.org
Tue Jan 16 14:19:50 UTC 2024
at e89e1e8c0f1907525559c8152f3286a70fe623cb (commit)
commit e89e1e8c0f1907525559c8152f3286a70fe623cb
Author: Brett Smith <brett.smith at curii.com>
Date: Tue Jan 16 09:17:04 2024 -0500
21383: Update Salt installer formulas
I'm not aware of any specific reason we need this, but it's good
maintenance since I'm in here anyway.
letsencrypt 3.0.0 does introduce a backwards incompatible change because
it no longer installs the Apache plugin by default. Since we never
wanted that plugin and always specify the pkgs we want anyway, this
shouldn't affect us.
https://github.com/saltstack-formulas/letsencrypt-formula/blob/master/CHANGELOG.md#300-2021-07-02
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index 2ed946a2cd..b6870f297b 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -293,8 +293,8 @@ POSTGRES_TAG="0.45.0-debian12"
POSTGRES_URL="https://github.com/brettcs/postgres-formula.git"
NGINX_TAG="v2.8.1"
DOCKER_TAG="v2.4.2"
-LOCALE_TAG="v0.3.4"
-LETSENCRYPT_TAG="v2.1.0"
+LOCALE_TAG="v0.3.5"
+LETSENCRYPT_TAG="v3.2.0"
LOGROTATE_TAG="v0.14.0"
PROMETHEUS_TAG="v5.6.5"
GRAFANA_TAG="v3.1.3"
commit 616199aba0034474679b9de9aa31eb61e4afeb6e
Author: Brett Smith <brett.smith at curii.com>
Date: Mon Jan 15 15:29:34 2024 -0500
21383: Use postgres formula with support for Debian 12
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index 0faea568c8..2ed946a2cd 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -289,8 +289,8 @@ SALT_VERSION="3006"
# Other formula versions we depend on
#POSTGRES_TAG="v0.44.0"
#POSTGRES_URL="https://github.com/saltstack-formulas/postgres-formula.git"
-POSTGRES_TAG="0.45.0-bugfix327"
-POSTGRES_URL="https://github.com/arvados/postgres-formula.git"
+POSTGRES_TAG="0.45.0-debian12"
+POSTGRES_URL="https://github.com/brettcs/postgres-formula.git"
NGINX_TAG="v2.8.1"
DOCKER_TAG="v2.4.2"
LOCALE_TAG="v0.3.4"
commit f5b53d8547947c16ea27ddb3d45ec4d51cfc28da
Author: Brett Smith <brett.smith at curii.com>
Date: Mon Jan 15 13:39:34 2024 -0500
21383: Upgrade Salt installer to Salt 3006
Salt 3006 is the first version to support Python 3.11, included with
Debian 12.
Because 3006 is the current stable, we have to update the bootstrap
invocation to match. I guess we'll have to make another change after it
becomes old-stable.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index eb09dddf2c..0faea568c8 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -284,7 +284,7 @@ VERSION="latest"
# We pin the salt version to avoid potential incompatibilities when a new
# stable version is released.
-SALT_VERSION="3004"
+SALT_VERSION="3006"
# Other formula versions we depend on
#POSTGRES_TAG="v0.44.0"
@@ -387,7 +387,7 @@ else
echo "Salt already installed"
else
curl -L https://bootstrap.saltstack.com -o /tmp/bootstrap_salt.sh
- sh /tmp/bootstrap_salt.sh -XdfP -x python3 old-stable ${SALT_VERSION}
+ sh /tmp/bootstrap_salt.sh -XdfP -x python3 stable ${SALT_VERSION}
/bin/systemctl stop salt-minion.service
/bin/systemctl disable salt-minion.service
fi
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list