From 0028a3ba5b1e20276a56024d1ba3ff60af6059c1 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Fri, 10 Apr 2020 11:21:39 +0200 Subject: [PATCH] Define custom props during application installation --- apk/vmmgr | 2 +- lxc-apps/ckan/install.sh | 2 ++ lxc-apps/crisiscleanup/install.sh | 2 ++ lxc-apps/cts/install.sh | 3 ++- lxc-apps/decidim/install.sh | 2 +- lxc-apps/gnuhealth/install.sh | 1 + lxc-apps/kanboard/install.sh | 3 ++- lxc-apps/mifosx/install.sh | 5 +++-- lxc-apps/odoo/install.sh | 1 + lxc-apps/opendatakit/install.sh | 4 ++-- lxc-apps/pandora/install.sh | 5 +++-- lxc-apps/sahana-demo/install.sh | 4 +++- lxc-apps/sahana/install.sh | 4 +++- lxc-apps/sambro/install.sh | 4 +++- lxc-apps/seeddms/install.sh | 5 +++-- lxc-apps/sigmah/install.sh | 6 ++++-- lxc-apps/ushahidi/install.sh | 4 +++- 17 files changed, 39 insertions(+), 18 deletions(-) diff --git a/apk/vmmgr b/apk/vmmgr index a61009d..2ae06a4 160000 --- a/apk/vmmgr +++ b/apk/vmmgr @@ -1 +1 @@ -Subproject commit a61009d342edd66b2302e3bb47519f308c4117a4 +Subproject commit 2ae06a4e4741b4c443b71dab59eba3abcec4ba2b diff --git a/lxc-apps/ckan/install.sh b/lxc-apps/ckan/install.sh index 5719589..d30b0fe 100755 --- a/lxc-apps/ckan/install.sh +++ b/lxc-apps/ckan/install.sh @@ -80,3 +80,5 @@ spoc-container stop ckan-redis # Register application vmmgr register-app ckan ckan "${CKAN_ADMIN_USER}" "${CKAN_ADMIN_PWD}" +vmmgr register-prop ckan email "${CKAN_ADMIN_EMAIL}" +vmmgr register-prop ckan gmaps-api-key "" diff --git a/lxc-apps/crisiscleanup/install.sh b/lxc-apps/crisiscleanup/install.sh index 1b826fc..bdfad55 100755 --- a/lxc-apps/crisiscleanup/install.sh +++ b/lxc-apps/crisiscleanup/install.sh @@ -42,3 +42,5 @@ spoc-container stop crisiscleanup-postgres # Register application vmmgr register-app crisiscleanup cc "${CRISISCLEANUP_ADMIN_EMAIL}" "${CRISISCLEANUP_ADMIN_PWD}" +vmmgr register-prop crisiscleanup email "${CRISISCLEANUP_ADMIN_EMAIL}" +vmmgr register-prop crisiscleanup gmaps-api-key "" diff --git a/lxc-apps/cts/install.sh b/lxc-apps/cts/install.sh index 91a8549..0a2400d 100755 --- a/lxc-apps/cts/install.sh +++ b/lxc-apps/cts/install.sh @@ -31,7 +31,7 @@ install -o 100000 -g 108080 -m 640 /dev/null ${CTS_CONF}/__init__.py spoc-container exec cts -- manage.py migrate # Create admin account -export CTS_ADMIN_EMAIL=admin@example.com +export CTS_ADMIN_EMAIL="admin@example.com" export CTS_ADMIN_PWD=$(head -c 12 /dev/urandom | base64 | tr -d '+/=') export CTS_ADMIN_HASH=$(spoc-container exec cts -- python -c "from django.contrib.auth.hashers import make_password; print make_password('${CTS_ADMIN_PWD}')") export CTS_ADMIN_SECRET=$(head -c 12 /dev/urandom | sha256sum | cut -c0-12) @@ -42,3 +42,4 @@ spoc-container stop cts-postgres # Register application vmmgr register-app cts cts "${CTS_ADMIN_EMAIL}" "${CTS_ADMIN_PWD}" +vmmgr register-prop cts email "${CTS_ADMIN_EMAIL}" diff --git a/lxc-apps/decidim/install.sh b/lxc-apps/decidim/install.sh index 36e3c48..c9219a3 100755 --- a/lxc-apps/decidim/install.sh +++ b/lxc-apps/decidim/install.sh @@ -35,7 +35,7 @@ envsubst