From 9f1a7c27ae16a2e77325f72b8695cfe89cab70ae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Tue, 13 Apr 2021 18:20:12 -0300 Subject: [PATCH] fix(provision): temp fix for nginx formula issue with snippets MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit refs #17246 Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- ...cal.params.example.single_host_multiple_hostnames | 12 ++++++------ .../local.params.example.single_host_single_hostname | 12 ++++++------ tools/salt-install/provision.sh | 6 ++++-- 3 files changed, 16 insertions(+), 14 deletions(-) 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 e64423aa86..73630defc1 100644 --- a/tools/salt-install/local.params.example.single_host_multiple_hostnames +++ b/tools/salt-install/local.params.example.single_host_multiple_hostnames @@ -80,9 +80,9 @@ BRANCH="master" # Usually there's no need to modify things below this line # Formulas versions -ARVADOS_TAG="v1.1.4" -POSTGRES_TAG="v0.41.6" -NGINX_TAG="master" -DOCKER_TAG="v1.0.0" -LOCALE_TAG="v0.3.4" -LETSENCRYPT_TAG="v2.1.0" +# ARVADOS_TAG="v1.1.4" +# POSTGRES_TAG="v0.41.6" +# NGINX_TAG="temp-fix-missing-statements-in-pillar" +# DOCKER_TAG="v1.0.0" +# 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 264f2a72e7..0bc96e3e1e 100644 --- a/tools/salt-install/local.params.example.single_host_single_hostname +++ b/tools/salt-install/local.params.example.single_host_single_hostname @@ -83,9 +83,9 @@ VERSION="latest" # Usually there's no need to modify things below this line # Formulas versions -ARVADOS_TAG="v1.1.4" -POSTGRES_TAG="v0.41.6" -NGINX_TAG="v2.5.0" -DOCKER_TAG="v1.0.0" -LOCALE_TAG="v0.3.4" -LETSENCRYPT_TAG="v2.1.0" +# ARVADOS_TAG="v1.1.4" +# POSTGRES_TAG="v0.41.6" +# NGINX_TAG="temp-fix-missing-statements-in-pillar" +# DOCKER_TAG="v1.0.0" +# 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 51acc8e4a2..81abc257f2 100755 --- a/tools/salt-install/provision.sh +++ b/tools/salt-install/provision.sh @@ -128,9 +128,11 @@ WORKBENCH2_EXT_SSL_PORT=3001 RELEASE="production" VERSION="latest" -ARVADOS_TAG="v1.1.4" + +# Formulas versions +ARVADOS_TAG="v.1.1.4" POSTGRES_TAG="v0.41.6" -NGINX_TAG="v2.5.0" +NGINX_TAG="temp-fix-missing-statements-in-pillar" DOCKER_TAG="v1.0.0" LOCALE_TAG="v0.3.4" LETSENCRYPT_TAG="v2.1.0" -- 2.30.2