From f99fae0bdfdec6a5aa40aee2df67a0de710f7892 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Thu, 3 Feb 2022 14:49:34 -0300 Subject: [PATCH] 18682: update nginx-formula version in the installer MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- tools/salt-install/local.params.example.multiple_hosts | 2 +- .../local.params.example.single_host_multiple_hostnames | 2 +- .../local.params.example.single_host_single_hostname | 2 +- tools/salt-install/provision.sh | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/salt-install/local.params.example.multiple_hosts b/tools/salt-install/local.params.example.multiple_hosts index cb0afecc46..98f9b7582a 100644 --- a/tools/salt-install/local.params.example.multiple_hosts +++ b/tools/salt-install/local.params.example.multiple_hosts @@ -120,7 +120,7 @@ RELEASE="production" # Formulas versions # ARVADOS_TAG="2.2.0" # POSTGRES_TAG="v0.43.0" -# NGINX_TAG="temp-fix-missing-statements-in-pillar" +# NGINX_TAG="v2.8.0" # DOCKER_TAG="v2.0.7" # LOCALE_TAG="v0.3.4" # LETSENCRYPT_TAG="v2.1.0" diff --git a/tools/salt-install/local.params.example.single_host_multiple_hostnames b/tools/salt-install/local.params.example.single_host_multiple_hostnames index ef47467e57..04c6d0f3d1 100644 --- a/tools/salt-install/local.params.example.single_host_multiple_hostnames +++ b/tools/salt-install/local.params.example.single_host_multiple_hostnames @@ -96,7 +96,7 @@ RELEASE="production" # Formulas versions # ARVADOS_TAG="2.2.0" # POSTGRES_TAG="v0.43.0" -# NGINX_TAG="temp-fix-missing-statements-in-pillar" +# NGINX_TAG="v2.8.0" # DOCKER_TAG="v2.0.7" # LOCALE_TAG="v0.3.4" # LETSENCRYPT_TAG="v2.1.0" diff --git a/tools/salt-install/local.params.example.single_host_single_hostname b/tools/salt-install/local.params.example.single_host_single_hostname index d09cdb2ef0..65995c4a47 100644 --- a/tools/salt-install/local.params.example.single_host_single_hostname +++ b/tools/salt-install/local.params.example.single_host_single_hostname @@ -83,7 +83,7 @@ RELEASE="production" # Formulas versions # ARVADOS_TAG="2.2.0" # POSTGRES_TAG="v0.43.0" -# NGINX_TAG="temp-fix-missing-statements-in-pillar" +# NGINX_TAG="v2.8.0" # DOCKER_TAG="v2.0.7" # LOCALE_TAG="v0.3.4" # LETSENCRYPT_TAG="v2.1.0" diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh index 594dad2ebb..f5724d4c8b 100755 --- a/tools/salt-install/provision.sh +++ b/tools/salt-install/provision.sh @@ -205,7 +205,7 @@ VERSION="latest" # Other formula versions we depend on POSTGRES_TAG="v0.43.0" -NGINX_TAG="temp-fix-missing-statements-in-pillar" +NGINX_TAG="v2.8.0" DOCKER_TAG="v2.0.7" LOCALE_TAG="v0.3.4" LETSENCRYPT_TAG="v2.1.0" @@ -316,7 +316,7 @@ git clone --quiet https://github.com/saltstack-formulas/docker-formula.git ${F_D git clone --quiet https://github.com/saltstack-formulas/locale-formula.git ${F_DIR}/locale ( cd locale && git checkout --quiet tags/"${LOCALE_TAG}" -b "${LOCALE_TAG}" ) -git clone --quiet https://github.com/netmanagers/nginx-formula.git ${F_DIR}/nginx +git clone --quiet https://github.com/saltstack-formulas/nginx-formula.git ${F_DIR}/nginx ( cd nginx && git checkout --quiet tags/"${NGINX_TAG}" -b "${NGINX_TAG}" ) git clone --quiet https://github.com/saltstack-formulas/postgres-formula.git ${F_DIR}/postgres -- 2.30.2