[ARVADOS] updated: 1.3.0-3282-gff4fad2ec
Git user
git at public.arvados.org
Fri Oct 9 16:03:22 UTC 2020
Summary of changes:
tools/salt-install/bin/provision.sh | 27 ++++++++++++++--------
tools/salt-install/salt_pillars/locale.sls | 15 ++++++++++++
.../salt_pillars/nginx_api_configuration.sls | 6 ++---
.../nginx_controller_configuration.sls | 11 ++++-----
.../salt_pillars/nginx_keepproxy_configuration.sls | 10 ++++----
.../salt_pillars/nginx_keepweb_configuration.sls | 10 ++++----
.../salt-install/salt_pillars/nginx_passenger.sls | 2 --
.../salt_pillars/nginx_websocket_configuration.sls | 10 ++++----
.../nginx_workbench2_configuration.sls | 10 ++++----
.../salt_pillars/nginx_workbench_configuration.sls | 14 +++++------
10 files changed, 61 insertions(+), 54 deletions(-)
create mode 100644 tools/salt-install/salt_pillars/locale.sls
via ff4fad2ec65ee34162435b12943684057d86b0ba (commit)
from 77bf8cb84c0271fb38dd3622930864d0d29eb2a7 (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 ff4fad2ec65ee34162435b12943684057d86b0ba
Author: Javier Bértoli <jbertoli at curii.com>
Date: Fri Oct 9 13:00:51 2020 -0300
fix(salt): temporal fix for database setup issue
plus some linting
refs #16471 and #16992
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>
diff --git a/tools/salt-install/bin/provision.sh b/tools/salt-install/bin/provision.sh
index 12e5f07e4..5086638d3 100755
--- a/tools/salt-install/bin/provision.sh
+++ b/tools/salt-install/bin/provision.sh
@@ -1,7 +1,8 @@
#!/bin/bash
+
# Copyright (C) The Arvados Authors. All rights reserved.
#
-# SPDX-License-Identifier: AGPL-3.0
+# SPDX-License-Identifier: CC-BY-SA-3.0
# If you want to test arvados in a single host, you can run this script, which
# will install it using salt masterless
@@ -26,7 +27,7 @@ F_DIR="/srv/formulas"
##pillars
P_DIR="/srv/pillars"
# In vagrant, we can use the shared dir
-P_DIR="/vagrant/salt_pillars"
+# P_DIR="/vagrant/salt_pillars"
sudo apt-get update
sudo apt-get install -y curl git
@@ -62,6 +63,7 @@ cat > ${S_DIR}/top.sls << EOFTSLS
base:
'*':
- example_add_snakeoil_certs
+ - locale
- nginx.passenger
- postgres
- docker
@@ -72,7 +74,8 @@ cat > ${P_DIR}/top.sls << EOFPSLS
base:
'*':
- arvados
- - nginx_api_configuration
+ - locale
+ - nginx_api_configuration
- nginx_controller_configuration
- nginx_keepproxy_configuration
- nginx_keepweb_configuration
@@ -86,7 +89,7 @@ EOFPSLS
# Get the formula and dependencies
cd ${F_DIR} || exit 1
-for f in postgres arvados nginx docker; do
+for f in postgres arvados nginx docker locale; do
git clone https://github.com/netmanagers/${f}-formula.git
done
@@ -99,22 +102,28 @@ fi
sed "s/example.net/${DOMAIN}/g; s/name: fixme/name: ${CLUSTER}/g" \
${F_DIR}/arvados-formula/test/salt/pillar/arvados_dev.sls > ${P_DIR}/arvados.sls
-# Replace domain name in the example pillars
+# Replace cluster and domain name in the example pillars
for f in ${F_DIR}/arvados-formula/test/salt/pillar/examples/*; do
- sed "s/example.net/${DOMAIN}/g" ${f} > ${P_DIR}/$(basename ${f})
+ sed "s/example.net/${DOMAIN}/g; s/fixme/${CLUSTER}/g" \
+ ${f} > ${P_DIR}/$(basename ${f})
done
# # Copy arvados' pillar.example file to the pillars dir, so it's used
# sed "s/example.net/${DOMAIN}/g" ${F_DIR}/arvados-formula/pillar.example > ${P_DIR}/arvados.sls
-#
+#
# # Replace domain name in the example pillars
# for f in ${F_DIR}/arvados-formula/test/salt/pillar/examples/*; do
# sed "s/example.net/${DOMAIN}/g" ${f} > ${P_DIR}/$(basename ${f})
# done
-#
+#
# Let's write a /etc/hosts file that points all the hosts to localhost
-echo "127.0.0.2 api keep keep0 collections download ws workbench workbench2 api.${CLUSTER}.${DOMAIN} keep.${CLUSTER}.${DOMAIN} keep0.${CLUSTER}.${DOMAIN} collections.${CLUSTER}.${DOMAIN} download.${CLUSTER}.${DOMAIN} ws.${CLUSTER}.${DOMAIN} workbench.${CLUSTER}.${DOMAIN} workbench2.${CLUSTER}.${DOMAIN}" >> /etc/hosts
+echo "127.0.0.2 api keep keep0 collections download ws workbench workbench2 ${CLUSTER}.${DOMAIN} api.${CLUSTER}.${DOMAIN} keep.${CLUSTER}.${DOMAIN} keep0.${CLUSTER}.${DOMAIN} collections.${CLUSTER}.${DOMAIN} download.${CLUSTER}.${DOMAIN} ws.${CLUSTER}.${DOMAIN} workbench.${CLUSTER}.${DOMAIN} workbench2.${CLUSTER}.${DOMAIN}" >> /etc/hosts
+
+# FIXME! Test to see if arvados-api-server progresses without issues
+cat > /root/.psqlrc << EOF
+\pset pager off
+EOF
# Now run the install
salt-call --local state.apply -l debug
diff --git a/tools/salt-install/salt_pillars/locale.sls b/tools/salt-install/salt_pillars/locale.sls
new file mode 100644
index 000000000..a5da4e9a1
--- /dev/null
+++ b/tools/salt-install/salt_pillars/locale.sls
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: CC-BY-SA-3.0
+locale:
+ present:
+ - "en_US.UTF-8 UTF-8"
+ default:
+ # Note: On debian systems don't write the second 'UTF-8' here or you will
+ # experience salt problems like: LookupError: unknown encoding: utf_8_utf_8
+ # Restart the minion after you corrected this!
+ name: 'en_US.UTF-8'
+ requires: 'en_US.UTF-8 UTF-8'
diff --git a/tools/salt-install/salt_pillars/nginx_api_configuration.sls b/tools/salt-install/salt_pillars/nginx_api_configuration.sls
index f2dca810a..1dd2ebbb3 100644
--- a/tools/salt-install/salt_pillars/nginx_api_configuration.sls
+++ b/tools/salt-install/salt_pillars/nginx_api_configuration.sls
@@ -3,8 +3,6 @@
#
# SPDX-License-Identifier: CC-BY-SA-3.0
-{% set nginx_log = '/var/log/nginx' %}
-
### ARVADOS
arvados:
config:
@@ -24,7 +22,7 @@ nginx:
- server_name: api
- root: /var/www/arvados-api/current/public
- index: index.html index.htm
- - access_log: {{ nginx_log }}/api.arv.local-upstream.access.log combined
- - error_log: {{ nginx_log }}/api.arv.local-upstream.error.log
+ - access_log: /var/log/nginx/api.fixme.arv.local-upstream.access.log combined
+ - error_log: /var/log/nginx/api.fixme.arv.local-upstream.error.log
- passenger_enabled: 'on'
- client_max_body_size: 128m
diff --git a/tools/salt-install/salt_pillars/nginx_controller_configuration.sls b/tools/salt-install/salt_pillars/nginx_controller_configuration.sls
index 6e2aa6af6..735aa7b8f 100644
--- a/tools/salt-install/salt_pillars/nginx_controller_configuration.sls
+++ b/tools/salt-install/salt_pillars/nginx_controller_configuration.sls
@@ -3,14 +3,11 @@
#
# SPDX-License-Identifier: CC-BY-SA-3.0
-{% set nginx_log = '/var/log/nginx' %}
-
### NGINX
nginx:
### SERVER
server:
config:
-
### STREAMS
http:
'geo $external_client':
@@ -28,7 +25,7 @@ nginx:
overwrite: true
config:
- server:
- - server_name: arv.local api.arv.local
+ - server_name: fixme.arv.local
- listen:
- 80 default
- location /.well-known:
@@ -41,7 +38,7 @@ nginx:
overwrite: true
config:
- server:
- - server_name: arv.local
+ - server_name: fixme.arv.local
- listen:
- 443 http2 ssl
- index: index.html index.htm
@@ -57,6 +54,6 @@ nginx:
- proxy_set_header: 'X-External-Client $external_client'
# - include: 'snippets/letsencrypt.conf'
- include: 'snippets/snakeoil.conf'
- - access_log: {{ nginx_log }}/arv.local.access.log combined
- - error_log: {{ nginx_log }}/arv.local.error.log
+ - access_log: /var/log/nginx/fixme.arv.local.access.log combined
+ - error_log: /var/log/nginx/fixme.arv.local.error.log
- client_max_body_size: 128m
diff --git a/tools/salt-install/salt_pillars/nginx_keepproxy_configuration.sls b/tools/salt-install/salt_pillars/nginx_keepproxy_configuration.sls
index 6a39cc473..72858152f 100644
--- a/tools/salt-install/salt_pillars/nginx_keepproxy_configuration.sls
+++ b/tools/salt-install/salt_pillars/nginx_keepproxy_configuration.sls
@@ -3,8 +3,6 @@
#
# SPDX-License-Identifier: CC-BY-SA-3.0
-{% set nginx_log = '/var/log/nginx' %}
-
### NGINX
nginx:
### SERVER
@@ -23,7 +21,7 @@ nginx:
overwrite: true
config:
- server:
- - server_name: keep.arv.local
+ - server_name: keep.fixme.arv.local
- listen:
- 80
- location /.well-known:
@@ -36,7 +34,7 @@ nginx:
overwrite: true
config:
- server:
- - server_name: keep.arv.local
+ - server_name: keep.fixme.arv.local
- listen:
- 443 http2 ssl
- index: index.html index.htm
@@ -56,5 +54,5 @@ nginx:
- proxy_request_buffering: 'off'
# - include: 'snippets/letsencrypt.conf'
- include: 'snippets/snakeoil.conf'
- - access_log: {{ nginx_log }}/keepproxy.arv.local.access.log combined
- - error_log: {{ nginx_log }}/keepproxy.arv.local.error.log
+ - access_log: /var/log/nginx/keepproxy.fixme.arv.local.access.log combined
+ - error_log: /var/log/nginx/keepproxy.fixme.arv.local.error.log
diff --git a/tools/salt-install/salt_pillars/nginx_keepweb_configuration.sls b/tools/salt-install/salt_pillars/nginx_keepweb_configuration.sls
index b769c0305..32e89e688 100644
--- a/tools/salt-install/salt_pillars/nginx_keepweb_configuration.sls
+++ b/tools/salt-install/salt_pillars/nginx_keepweb_configuration.sls
@@ -3,8 +3,6 @@
#
# SPDX-License-Identifier: CC-BY-SA-3.0
-{% set nginx_log = '/var/log/nginx' %}
-
### NGINX
nginx:
### SERVER
@@ -23,7 +21,7 @@ nginx:
overwrite: true
config:
- server:
- - server_name: collections.arv.local download.arv.local
+ - server_name: collections.fixme.arv.local download.fixme.arv.local
- listen:
- 80
- location /.well-known:
@@ -37,7 +35,7 @@ nginx:
overwrite: true
config:
- server:
- - server_name: collections.arv.local download.arv.local
+ - server_name: collections.fixme.arv.local download.fixme.arv.local
- listen:
- 443 http2 ssl
- index: index.html index.htm
@@ -56,5 +54,5 @@ nginx:
- proxy_request_buffering: 'off'
# - include: 'snippets/letsencrypt.conf'
- include: 'snippets/snakeoil.conf'
- - access_log: {{ nginx_log }}/collections.arv.local.access.log combined
- - error_log: {{ nginx_log }}/collections.arv.local.error.log
+ - access_log: /var/log/nginx/collections.fixme.arv.local.access.log combined
+ - error_log: /var/log/nginx/collections.fixme.arv.local.error.log
diff --git a/tools/salt-install/salt_pillars/nginx_passenger.sls b/tools/salt-install/salt_pillars/nginx_passenger.sls
index 6c9372604..70bab9cfe 100644
--- a/tools/salt-install/salt_pillars/nginx_passenger.sls
+++ b/tools/salt-install/salt_pillars/nginx_passenger.sls
@@ -6,8 +6,6 @@
states:
- nginx.passenger
-{% set nginx_log = '/var/log/nginx' %}
-
### NGINX
nginx:
install_from_phusionpassenger: true
diff --git a/tools/salt-install/salt_pillars/nginx_websocket_configuration.sls b/tools/salt-install/salt_pillars/nginx_websocket_configuration.sls
index 6db306a70..a53a40cb1 100644
--- a/tools/salt-install/salt_pillars/nginx_websocket_configuration.sls
+++ b/tools/salt-install/salt_pillars/nginx_websocket_configuration.sls
@@ -3,8 +3,6 @@
#
# SPDX-License-Identifier: CC-BY-SA-3.0
-{% set nginx_log = '/var/log/nginx' %}
-
### NGINX
nginx:
### SERVER
@@ -23,7 +21,7 @@ nginx:
overwrite: true
config:
- server:
- - server_name: ws.arv.local
+ - server_name: ws.fixme.arv.local
- listen:
- 80
- location /.well-known:
@@ -36,7 +34,7 @@ nginx:
overwrite: true
config:
- server:
- - server_name: ws.arv.local
+ - server_name: ws.fixme.arv.local
- listen:
- 443 http2 ssl
- index: index.html index.htm
@@ -57,5 +55,5 @@ nginx:
- proxy_request_buffering: 'off'
# - include: 'snippets/letsencrypt.conf'
- include: 'snippets/snakeoil.conf'
- - access_log: {{ nginx_log }}/ws.arv.local.access.log combined
- - error_log: {{ nginx_log }}/ws.arv.local.error.log
+ - access_log: /var/log/nginx/ws.fixme.arv.local.access.log combined
+ - error_log: /var/log/nginx/ws.fixme.arv.local.error.log
diff --git a/tools/salt-install/salt_pillars/nginx_workbench2_configuration.sls b/tools/salt-install/salt_pillars/nginx_workbench2_configuration.sls
index d0c85347c..708d1f321 100644
--- a/tools/salt-install/salt_pillars/nginx_workbench2_configuration.sls
+++ b/tools/salt-install/salt_pillars/nginx_workbench2_configuration.sls
@@ -3,8 +3,6 @@
#
# SPDX-License-Identifier: CC-BY-SA-3.0
-{% set nginx_log = '/var/log/nginx' %}
-
### ARVADOS
arvados:
config:
@@ -21,7 +19,7 @@ nginx:
overwrite: true
config:
- server:
- - server_name: workbench2.arv.local
+ - server_name: workbench2.fixme.arv.local
- listen:
- 80
- location /.well-known:
@@ -34,7 +32,7 @@ nginx:
overwrite: true
config:
- server:
- - server_name: workbench2.arv.local
+ - server_name: workbench2.fixme.arv.local
- listen:
- 443 http2 ssl
- index: index.html index.htm
@@ -45,5 +43,5 @@ nginx:
- return: 503
# - include: 'snippets/letsencrypt.conf'
- include: 'snippets/snakeoil.conf'
- - access_log: {{ nginx_log }}/workbench2.arv.local.access.log combined
- - error_log: {{ nginx_log }}/workbench2.arv.local.error.log
+ - access_log: /var/log/nginx/workbench2.fixme.arv.local.access.log combined
+ - error_log: /var/log/nginx/workbench2.fixme.arv.local.error.log
diff --git a/tools/salt-install/salt_pillars/nginx_workbench_configuration.sls b/tools/salt-install/salt_pillars/nginx_workbench_configuration.sls
index 58eb15cc7..7525575c2 100644
--- a/tools/salt-install/salt_pillars/nginx_workbench_configuration.sls
+++ b/tools/salt-install/salt_pillars/nginx_workbench_configuration.sls
@@ -3,8 +3,6 @@
#
# SPDX-License-Identifier: CC-BY-SA-3.0
-{% set nginx_log = '/var/log/nginx' %}
-
### ARVADOS
arvados:
config:
@@ -30,7 +28,7 @@ nginx:
overwrite: true
config:
- server:
- - server_name: workbench.arv.local
+ - server_name: workbench.fixme.arv.local
- listen:
- 80
- location /.well-known:
@@ -43,7 +41,7 @@ nginx:
overwrite: true
config:
- server:
- - server_name: workbench.arv.local
+ - server_name: workbench.fixme.arv.local
- listen:
- 443 http2 ssl
- index: index.html index.htm
@@ -58,8 +56,8 @@ nginx:
- proxy_set_header: 'X-Forwarded-For $proxy_add_x_forwarded_for'
# - include: 'snippets/letsencrypt.conf'
- include: 'snippets/snakeoil.conf'
- - access_log: {{ nginx_log }}/workbench.arv.local.access.log combined
- - error_log: {{ nginx_log }}/workbench.arv.local.error.log
+ - access_log: /var/log/nginx/workbench.fixme.arv.local.access.log combined
+ - error_log: /var/log/nginx/workbench.fixme.arv.local.error.log
arvados_workbench_upstream:
enabled: true
@@ -71,5 +69,5 @@ nginx:
- root: /var/www/arvados-workbench/current/public
- index: index.html index.htm
# yamllint disable-line rule:line-length
- - access_log: {{ nginx_log }}/workbench.arv.local-upstream.access.log combined
- - error_log: {{ nginx_log }}/workbench.arv.local-upstream.error.log
+ - access_log: /var/log/nginx/workbench.fixme.arv.local-upstream.access.log combined
+ - error_log: /var/log/nginx/workbench.fixme.arv.local-upstream.error.log
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list