[arvados] updated: 2.4.2-16-gae74e850a
git repository hosting
git at public.arvados.org
Mon Sep 12 14:56:49 UTC 2022
Summary of changes:
.../multi_host/aws/pillars/logrotate_api.sls | 4 +++-
.../multi_host/aws/pillars/logrotate_wb1.sls | 4 +++-
.../multiple_hostnames/pillars/logrotate_api.sls | 4 +++-
.../multiple_hostnames/pillars/logrotate_wb1.sls | 4 +++-
.../single_hostname/pillars/logrotate_api.sls | 4 +++-
.../single_hostname/pillars/logrotate_wb1.sls | 4 +++-
tools/salt-install/provision.sh | 18 ++++++++++++------
7 files changed, 30 insertions(+), 12 deletions(-)
via ae74e850a00152c54d1115fbe8fb321055cb3e0b (commit)
via 2dfbbf589c8570d1f8af7e06d5b4dd54c52a682a (commit)
from 720f7747b9efa7852e6a88431215208435a3949b (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 ae74e850a00152c54d1115fbe8fb321055cb3e0b
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Mon Sep 12 11:52:57 2022 -0300
19472: Adds logrotate-formula's README reference for admins to tweak its config
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/logrotate_api.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/logrotate_api.sls
index 864e78250..8377c0b23 100644
--- a/tools/salt-install/config_examples/multi_host/aws/pillars/logrotate_api.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/pillars/logrotate_api.sls
@@ -3,7 +3,9 @@
#
# SPDX-License-Identifier: AGPL-3.0
-### LOGROTATE
+# Refer to logrotate-formula's documentation for information about customization
+# https://github.com/salt-formulas/salt-formula-logrotate/blob/master/README.rst
+
logrotate:
jobs:
arvados-api:
diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/logrotate_wb1.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/logrotate_wb1.sls
index 36736a590..3cbfd422a 100644
--- a/tools/salt-install/config_examples/multi_host/aws/pillars/logrotate_wb1.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/pillars/logrotate_wb1.sls
@@ -3,7 +3,9 @@
#
# SPDX-License-Identifier: AGPL-3.0
-### LOGROTATE
+# Refer to logrotate-formula's documentation for information about customization
+# https://github.com/salt-formulas/salt-formula-logrotate/blob/master/README.rst
+
logrotate:
jobs:
arvados-workbench:
diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/logrotate_api.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/logrotate_api.sls
index 864e78250..8377c0b23 100644
--- a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/logrotate_api.sls
+++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/logrotate_api.sls
@@ -3,7 +3,9 @@
#
# SPDX-License-Identifier: AGPL-3.0
-### LOGROTATE
+# Refer to logrotate-formula's documentation for information about customization
+# https://github.com/salt-formulas/salt-formula-logrotate/blob/master/README.rst
+
logrotate:
jobs:
arvados-api:
diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/logrotate_wb1.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/logrotate_wb1.sls
index 36736a590..3cbfd422a 100644
--- a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/logrotate_wb1.sls
+++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/logrotate_wb1.sls
@@ -3,7 +3,9 @@
#
# SPDX-License-Identifier: AGPL-3.0
-### LOGROTATE
+# Refer to logrotate-formula's documentation for information about customization
+# https://github.com/salt-formulas/salt-formula-logrotate/blob/master/README.rst
+
logrotate:
jobs:
arvados-workbench:
diff --git a/tools/salt-install/config_examples/single_host/single_hostname/pillars/logrotate_api.sls b/tools/salt-install/config_examples/single_host/single_hostname/pillars/logrotate_api.sls
index 864e78250..8377c0b23 100644
--- a/tools/salt-install/config_examples/single_host/single_hostname/pillars/logrotate_api.sls
+++ b/tools/salt-install/config_examples/single_host/single_hostname/pillars/logrotate_api.sls
@@ -3,7 +3,9 @@
#
# SPDX-License-Identifier: AGPL-3.0
-### LOGROTATE
+# Refer to logrotate-formula's documentation for information about customization
+# https://github.com/salt-formulas/salt-formula-logrotate/blob/master/README.rst
+
logrotate:
jobs:
arvados-api:
diff --git a/tools/salt-install/config_examples/single_host/single_hostname/pillars/logrotate_wb1.sls b/tools/salt-install/config_examples/single_host/single_hostname/pillars/logrotate_wb1.sls
index 36736a590..3cbfd422a 100644
--- a/tools/salt-install/config_examples/single_host/single_hostname/pillars/logrotate_wb1.sls
+++ b/tools/salt-install/config_examples/single_host/single_hostname/pillars/logrotate_wb1.sls
@@ -3,7 +3,9 @@
#
# SPDX-License-Identifier: AGPL-3.0
-### LOGROTATE
+# Refer to logrotate-formula's documentation for information about customization
+# https://github.com/salt-formulas/salt-formula-logrotate/blob/master/README.rst
+
logrotate:
jobs:
arvados-workbench:
commit 2dfbbf589c8570d1f8af7e06d5b4dd54c52a682a
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Mon Sep 12 11:29:57 2022 -0300
19472: Allows changing salt formula's versions being used.
If a formula repository already was cloned, fetch the latest changes so
a checkout to a different (newer) tag could be possible.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index e4a12a91e..512a4932a 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -336,27 +336,33 @@ mkdir -p ${S_DIR} ${F_DIR} ${P_DIR} ${T_DIR}
# Get the formula and dependencies
cd ${F_DIR} || exit 1
echo "Cloning formulas"
-test -d docker || git clone --quiet https://github.com/saltstack-formulas/docker-formula.git ${F_DIR}/docker
+test -d docker && ( cd docker && git fetch ) \
+ || git clone --quiet https://github.com/saltstack-formulas/docker-formula.git ${F_DIR}/docker
( cd docker && git checkout --quiet tags/"${DOCKER_TAG}" )
echo "...locale"
-test -d locale || git clone --quiet https://github.com/saltstack-formulas/locale-formula.git ${F_DIR}/locale
+test -d locale && ( cd locale && git fetch ) \
+ || git clone --quiet https://github.com/saltstack-formulas/locale-formula.git ${F_DIR}/locale
( cd locale && git checkout --quiet tags/"${LOCALE_TAG}" )
echo "...nginx"
-test -d nginx || git clone --quiet https://github.com/saltstack-formulas/nginx-formula.git ${F_DIR}/nginx
+test -d nginx && ( cd nginx && git fetch ) \
+ || git clone --quiet https://github.com/saltstack-formulas/nginx-formula.git ${F_DIR}/nginx
( cd nginx && git checkout --quiet tags/"${NGINX_TAG}" )
echo "...postgres"
-test -d postgres || git clone --quiet https://github.com/saltstack-formulas/postgres-formula.git ${F_DIR}/postgres
+test -d postgres && ( cd postgres && git fetch ) \
+ || git clone --quiet https://github.com/saltstack-formulas/postgres-formula.git ${F_DIR}/postgres
( cd postgres && git checkout --quiet tags/"${POSTGRES_TAG}" )
echo "...letsencrypt"
-test -d letsencrypt || git clone --quiet https://github.com/saltstack-formulas/letsencrypt-formula.git ${F_DIR}/letsencrypt
+test -d letsencrypt && ( cd letsencrypt && git fetch ) \
+ || git clone --quiet https://github.com/saltstack-formulas/letsencrypt-formula.git ${F_DIR}/letsencrypt
( cd letsencrypt && git checkout --quiet tags/"${LETSENCRYPT_TAG}" )
echo "...logrotate"
-test -d logrotate || git clone --quiet https://github.com/saltstack-formulas/logrotate-formula.git ${F_DIR}/logrotate
+test -d logrotate && ( cd logrotate && git fetch ) \
+ || git clone --quiet https://github.com/saltstack-formulas/logrotate-formula.git ${F_DIR}/logrotate
( cd logrotate && git checkout --quiet tags/"${LOGROTATE_TAG}" )
echo "...arvados"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list