[ARVADOS] updated: 2.1.0-951-g4afe6f9a7

[Git user]

Summary of changes:
 tools/salt-install/provision.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

       via  4afe6f9a74c5ccefb0cc7ba3e51a3a50cd531248 (commit)
       via  85e8f2b722f1a319e6269aca68d20cdcfd482e99 (commit)
      from  e506fa36be9b9b2cb67abb8cd964358394a3a4fe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 4afe6f9a74c5ccefb0cc7ba3e51a3a50cd531248
Merge: e506fa36b 85e8f2b72
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Fri Jun 18 12:45:40 2021 -0300

    Merge branch '17823-use-saltstack-formulas-nginx-formula'
    
    closes #17823
    
    Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>


commit 85e8f2b722f1a319e6269aca68d20cdcfd482e99
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Fri Jun 18 12:34:14 2021 -0300

    17823: change references back to saltstack-formulas' nginx formula
    
    Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>

diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index 7faf5c2fb..5cd376844 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -139,7 +139,7 @@ ARVADOS_TAG="main"
 
 # Other formula versions we depend on
 POSTGRES_TAG="v0.41.6"
-NGINX_TAG="temp-fix-missing-statements-in-pillar"
+NGINX_TAG="v2.7.4"
 DOCKER_TAG="v1.0.0"
 LOCALE_TAG="v0.3.4"
 LETSENCRYPT_TAG="v2.1.0"
@@ -219,8 +219,7 @@ cd ${F_DIR} || exit 1
 git clone --branch "${ARVADOS_TAG}"     https://git.arvados.org/arvados-formula.git
 git clone --branch "${DOCKER_TAG}"      https://github.com/saltstack-formulas/docker-formula.git
 git clone --branch "${LOCALE_TAG}"      https://github.com/saltstack-formulas/locale-formula.git
-# git clone --branch "${NGINX_TAG}"       https://github.com/saltstack-formulas/nginx-formula.git
-git clone --branch "${NGINX_TAG}"       https://github.com/netmanagers/nginx-formula.git
+git clone --branch "${NGINX_TAG}"       https://github.com/saltstack-formulas/nginx-formula.git
 git clone --branch "${POSTGRES_TAG}"    https://github.com/saltstack-formulas/postgres-formula.git
 git clone --branch "${LETSENCRYPT_TAG}" https://github.com/saltstack-formulas/letsencrypt-formula.git
 

-----------------------------------------------------------------------


hooks/post-receive
--