[ARVADOS] created: 2.1.0-2062-gfdca3159f
Git user
git at public.arvados.org
Tue Mar 15 00:13:14 UTC 2022
at fdca3159ff580f8cb7b4db551467368d1b7d840e (commit)
commit fdca3159ff580f8cb7b4db551467368d1b7d840e
Author: Javier Bértoli <jbertoli at curii.com>
Date: Mon Mar 14 21:12:20 2022 -0300
Upgrade nginx, docker and postgresql formulas in the installer
no issue #
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>
diff --git a/tools/salt-install/local.params.example.multiple_hosts b/tools/salt-install/local.params.example.multiple_hosts
index 221e7b35e..32d1f8bb9 100644
--- a/tools/salt-install/local.params.example.multiple_hosts
+++ b/tools/salt-install/local.params.example.multiple_hosts
@@ -119,8 +119,8 @@ RELEASE="production"
# Formulas versions
# ARVADOS_TAG="2.2.0"
-# POSTGRES_TAG="v0.43.0"
-# NGINX_TAG="v2.8.0"
-# DOCKER_TAG="v2.0.7"
+# POSTGRES_TAG="v0.44.0"
+# NGINX_TAG="v2.8.1"
+# DOCKER_TAG="v2.4.2"
# 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 77015248c..d6bfb102e 100644
--- a/tools/salt-install/local.params.example.single_host_multiple_hostnames
+++ b/tools/salt-install/local.params.example.single_host_multiple_hostnames
@@ -70,8 +70,8 @@ RELEASE="production"
# Formulas versions
# ARVADOS_TAG="2.2.0"
-# POSTGRES_TAG="v0.43.0"
-# NGINX_TAG="v2.8.0"
-# DOCKER_TAG="v2.0.7"
+# POSTGRES_TAG="v0.44.0"
+# NGINX_TAG="v2.8.1"
+# DOCKER_TAG="v2.4.2"
# 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 a1cd491bc..b6c7e5f7a 100644
--- a/tools/salt-install/local.params.example.single_host_single_hostname
+++ b/tools/salt-install/local.params.example.single_host_single_hostname
@@ -79,7 +79,7 @@ RELEASE="production"
# Formulas versions
# ARVADOS_TAG="2.2.0"
# POSTGRES_TAG="v0.44.0"
-# NGINX_TAG="v2.8.0"
-# DOCKER_TAG="v2.4.0"
+# NGINX_TAG="v2.8.1"
+# DOCKER_TAG="v2.4.2"
# 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 7ab2b33b2..3b5c8cd2e 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -208,8 +208,8 @@ VERSION="latest"
# Other formula versions we depend on
POSTGRES_TAG="v0.44.0"
-NGINX_TAG="v2.8.0"
-DOCKER_TAG="v2.4.0"
+NGINX_TAG="v2.8.1"
+DOCKER_TAG="v2.4.2"
LOCALE_TAG="v0.3.4"
LETSENCRYPT_TAG="v2.1.0"
commit 9b3fcc8816cc0f612a743fba47500965ef8a6d82
Author: Javier Bértoli <jbertoli at curii.com>
Date: Mon Mar 14 21:11:42 2022 -0300
18681: install passenger conditionally, only when required
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>
diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_passenger.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_passenger.sls
index d9644e564..a1d7efde6 100644
--- a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_passenger.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_passenger.sls
@@ -15,7 +15,7 @@
### NGINX
nginx:
- install_from_phusionpassenger: true
+ __NGINX_INSTALL_SOURCE__: true
lookup:
passenger_package: {{ passenger_pkg }}
### PASSENGER
@@ -25,11 +25,15 @@ nginx:
### SERVER
server:
config:
+ # As we now differentiate where passenger is required or not, we need to
+ # load this module conditionally, so we add this conditional just to use
+ # the same pillar file
+ {% if "install_from_phusionpassenger" == "____NGINX_INSTALL_SOURCE__" %}
# This is required to get the passenger module loaded
# In Debian it can be done with this
# include: 'modules-enabled/*.conf'
load_module: {{ passenger_mod }}
-
+ {% endif %}
worker_processes: 4
### SNIPPETS
diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_passenger.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_passenger.sls
index 886aab876..c376cd0aa 100644
--- a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_passenger.sls
+++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_passenger.sls
@@ -15,7 +15,7 @@
### NGINX
nginx:
- install_from_phusionpassenger: true
+ __NGINX_INSTALL_SOURCE__: true
lookup:
passenger_package: {{ passenger_pkg }}
### PASSENGER
@@ -25,11 +25,15 @@ nginx:
### SERVER
server:
config:
+ # As we now differentiate where passenger is required or not, we need to
+ # load this module conditionally, so we add this conditional just to use
+ # the same pillar file
+ {% if "install_from_phusionpassenger" == "____NGINX_INSTALL_SOURCE__" %}
# This is required to get the passenger module loaded
# In Debian it can be done with this
# include: 'modules-enabled/*.conf'
load_module: {{ passenger_mod }}
-
+ {% endif %}
worker_processes: 4
### SNIPPETS
diff --git a/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_passenger.sls b/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_passenger.sls
index bce51f29e..9db093677 100644
--- a/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_passenger.sls
+++ b/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_passenger.sls
@@ -15,7 +15,7 @@
### NGINX
nginx:
- install_from_phusionpassenger: true
+ __NGINX_INSTALL_SOURCE__: true
lookup:
passenger_package: {{ passenger_pkg }}
### PASSENGER
@@ -25,11 +25,15 @@ nginx:
### SERVER
server:
config:
+ # As we now differentiate where passenger is required or not, we need to
+ # load this module conditionally, so we add this conditional just to use
+ # the same pillar file
+ {% if "install_from_phusionpassenger" == "____NGINX_INSTALL_SOURCE__" %}
# This is required to get the passenger module loaded
# In Debian it can be done with this
# include: 'modules-enabled/*.conf'
load_module: {{ passenger_mod }}
-
+ {% endif %}
worker_processes: 4
### SNIPPETS
diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index 7b1d14828..7ab2b33b2 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -165,6 +165,8 @@ LOG_LEVEL="info"
CONTROLLER_EXT_SSL_PORT=443
TESTS_DIR="tests"
+NGINX_INSTALL_SOURCE="install_from_repo"
+
CLUSTER=""
DOMAIN=""
@@ -474,6 +476,7 @@ if [ -d "${SOURCE_STATES_DIR}" ]; then
s#__WORKBENCH2_INT_IP__#${WORKBENCH2_INT_IP}#g;
s#__DATABASE_INT_IP__#${DATABASE_INT_IP}#g;
s#__WEBSHELL_EXT_SSL_PORT__#${WEBSHELL_EXT_SSL_PORT}#g;
+ s#__SHELL_INT_IP__#${SHELL_INT_IP}#g;
s#__WEBSOCKET_EXT_SSL_PORT__#${WEBSOCKET_EXT_SSL_PORT}#g;
s#__WORKBENCH1_EXT_SSL_PORT__#${WORKBENCH1_EXT_SSL_PORT}#g;
s#__WORKBENCH2_EXT_SSL_PORT__#${WORKBENCH2_EXT_SSL_PORT}#g;
@@ -558,6 +561,10 @@ if [ -z "${ROLES}" ]; then
echo " - nginx_workbench_configuration" >> ${P_DIR}/top.sls
echo " - postgresql" >> ${P_DIR}/top.sls
+ # We need to tweak the Nginx's pillar depending whether we want plan nginx or nginx+passenger
+ NGINX_INSTALL_SOURCE="install_from_phusionpassenger"
+ sed -i "s/__NGINX_INSTALL_SOURCE__/${NGINX_INSTALL_SOURCE}/g" ${P_DIR}/nginx_passenger.sls
+
if [ "${SSL_MODE}" = "lets-encrypt" ]; then
if [ "${USE_LETSENCRYPT_ROUTE53}" = "yes" ]; then
grep -q "aws_credentials" ${P_DIR}/top.sls || echo " - aws_credentials" >> ${P_DIR}/top.sls
@@ -627,10 +634,13 @@ else
# States
# FIXME: https://dev.arvados.org/issues/17352
grep -q "postgres.client" ${S_DIR}/top.sls || echo " - postgres.client" >> ${S_DIR}/top.sls
- grep -q "nginx.passenger" ${S_DIR}/top.sls || echo " - nginx.passenger" >> ${S_DIR}/top.sls
+ if grep -q " - nginx.*$" ${S_DIR}/top.sls; then
+ sed -i s/"^ - nginx.*$"/" - nginx.passenger"/g ${S_DIR}/top.sls
+ else
+ echo " - nginx.passenger" >> ${S_DIR}/top.sls
+ fi
### If we don't install and run LE before arvados-api-server, it fails and breaks everything
### after it. So we add this here as we are, after all, sharing the host for api and controller
- # Currently, only available on config_examples/multi_host/aws
if [ "${SSL_MODE}" = "lets-encrypt" ]; then
if [ "${USE_LETSENCRYPT_ROUTE53}" = "yes" ]; then
grep -q "aws_credentials" ${S_DIR}/top.sls || echo " - aws_credentials" >> ${S_DIR}/top.sls
@@ -649,11 +659,23 @@ else
grep -q "postgresql" ${P_DIR}/top.sls || echo " - postgresql" >> ${P_DIR}/top.sls
grep -q "nginx_passenger" ${P_DIR}/top.sls || echo " - nginx_passenger" >> ${P_DIR}/top.sls
grep -q "nginx_${R}_configuration" ${P_DIR}/top.sls || echo " - nginx_${R}_configuration" >> ${P_DIR}/top.sls
+
+ # We need to tweak the Nginx's pillar depending whether we want plain nginx or nginx+passenger
+ NGINX_INSTALL_SOURCE="install_from_phusionpassenger"
+ sed -i "s/__NGINX_INSTALL_SOURCE__/${NGINX_INSTALL_SOURCE}/g" ${P_DIR}/nginx_passenger.sls
;;
"controller" | "websocket" | "workbench" | "workbench2" | "webshell" | "keepweb" | "keepproxy")
# States
- grep -q "nginx.passenger" ${S_DIR}/top.sls || echo " - nginx.passenger" >> ${S_DIR}/top.sls
- # Currently, only available on config_examples/multi_host/aws
+ if [ "${R}" = "workbench" ]; then
+ NGINX_INSTALL_SOURCE="install_from_phusionpassenger"
+ if grep -q " - nginx$" ${S_DIR}/top.sls; then
+ sed -i s/"^ - nginx.*$"/" - nginx.passenger"/g ${S_DIR}/top.sls
+ else
+ echo " - nginx.passenger" >> ${S_DIR}/top.sls
+ fi
+ else
+ grep -q "nginx" ${S_DIR}/top.sls || echo " - nginx" >> ${S_DIR}/top.sls
+ fi
if [ "${SSL_MODE}" = "lets-encrypt" ]; then
if [ "x${USE_LETSENCRYPT_ROUTE53}" = "xyes" ]; then
grep -q "aws_credentials" ${S_DIR}/top.sls || echo " - aws_credentials" >> ${S_DIR}/top.sls
@@ -685,7 +707,6 @@ else
grep -q "nginx_collections_configuration" ${P_DIR}/top.sls || echo " - nginx_collections_configuration" >> ${P_DIR}/top.sls
fi
- # Currently, only available on config_examples/multi_host/aws
if [ "${SSL_MODE}" = "lets-encrypt" ]; then
if [ "${USE_LETSENCRYPT_ROUTE53}" = "yes" ]; then
grep -q "aws_credentials" ${P_DIR}/top.sls || echo " - aws_credentials" >> ${P_DIR}/top.sls
@@ -727,6 +748,8 @@ else
grep -q ${R} ${P_DIR}/extra_custom_certs.sls || echo " - ${R}" >> ${P_DIR}/extra_custom_certs.sls
fi
fi
+ # We need to tweak the Nginx's pillar depending whether we want plain nginx or nginx+passenger
+ sed -i "s/__NGINX_INSTALL_SOURCE__/${NGINX_INSTALL_SOURCE}/g" ${P_DIR}/nginx_passenger.sls
;;
"shell")
# States
commit 2553cc846fb71805d203dfb25ead85ccbae9d0e2
Author: Javier Bértoli <jbertoli at curii.com>
Date: Mon Mar 14 15:00:28 2022 -0300
Enforce a consistent postgresql version across examples
no issue #
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>
diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/postgresql.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/postgresql.sls
index a0da9a1c0..e06ddd041 100644
--- a/tools/salt-install/config_examples/multi_host/aws/pillars/postgresql.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/pillars/postgresql.sls
@@ -6,7 +6,7 @@
### POSTGRESQL
postgres:
use_upstream_repo: true
- version: '11'
+ version: '12'
postgresconf: |-
listen_addresses = '*' # listen on all interfaces
acls:
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list