From 042a82c4632d0b445bc88833b4477f8ec1b014b0 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Mon, 16 Mar 2020 20:53:27 +0100 Subject: [PATCH] Fix CrisisCleanup data population --- lxc-apps/crisiscleanup/image | 2 +- lxc-apps/crisiscleanup/install.sh | 2 ++ lxc-apps/crisiscleanup/install/adminpwd.rb | 5 ++++- lxc-apps/crisiscleanup/install/cc_conf/secrets.yml | 2 ++ 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 lxc-apps/crisiscleanup/install/cc_conf/secrets.yml diff --git a/lxc-apps/crisiscleanup/image b/lxc-apps/crisiscleanup/image index cca0d84..4d375df 100644 --- a/lxc-apps/crisiscleanup/image +++ b/lxc-apps/crisiscleanup/image @@ -24,7 +24,7 @@ RUN EOF npm install yarn - # Create CrisisCleanup secret + # Create dummy CrisisCleanup secret echo -e "production:\n secret_key_base: $(rake secret)" >/srv/crisiscleanup/config/secrets.yml # Generate static resources diff --git a/lxc-apps/crisiscleanup/install.sh b/lxc-apps/crisiscleanup/install.sh index 7a856a4..dedf9ee 100755 --- a/lxc-apps/crisiscleanup/install.sh +++ b/lxc-apps/crisiscleanup/install.sh @@ -25,7 +25,9 @@ cp -rp ${LAYERS_DIR}/crisiscleanup_2.2.0-200313/srv/crisiscleanup/config ${CC_CO export CRISISCLEANUP_ADMIN_USER="Admin" export CRISISCLEANUP_ADMIN_EMAIL="admin@example.com" export CRISISCLEANUP_ADMIN_PWD=$(head -c 12 /dev/urandom | base64 | tr -d '+/=') +export CRISISCLEANUP_SECRET=$(spoc-container exec crisiscleanup -- rake secret) envsubst