From 723a6a494fb12f9e0a7b895b9925a9211d3da85b Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Sat, 6 Feb 2021 13:49:55 +0100
Subject: [PATCH] Mount only currently customized Decidim configs, resolves
 #501 for new installations

---
 lxc-apps/decidim/app        | 3 ++-
 lxc-apps/decidim/install.sh | 6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lxc-apps/decidim/app b/lxc-apps/decidim/app
index 7ebcb8e..d8a13f1 100644
--- a/lxc-apps/decidim/app
+++ b/lxc-apps/decidim/app
@@ -13,7 +13,8 @@
                 "decidim-postgres"
             ],
             "mounts": {
-                "decidim/decidim_conf": "srv/decidim-app/config",
+                "decidim/decidim_conf/application.yml": "srv/decidim-app/config/application.yml:file",
+                "decidim/decidim_conf/initializers/decidim.yml": "srv/decidim-app/config/initializers/decidim.yml:file",
                 "decidim/decidim_data/migrate": "srv/decidim-app/db/migrate",
                 "decidim/decidim_data/storage": "srv/decidim-app/storage",
                 "decidim/decidim_data/uploads": "srv/decidim-app/public/uploads"
diff --git a/lxc-apps/decidim/install.sh b/lxc-apps/decidim/install.sh
index 7f5f456..cb112e7 100755
--- a/lxc-apps/decidim/install.sh
+++ b/lxc-apps/decidim/install.sh
@@ -5,7 +5,6 @@ set -ev
 POSTGRES_DATA="${VOLUMES_DIR}/decidim/postgres_data"
 DECIDIM_CONF="${VOLUMES_DIR}/decidim/decidim_conf"
 DECIDIM_DATA="${VOLUMES_DIR}/decidim/decidim_data"
-DECIDIM_LAYER="${LAYERS_DIR}/decidim_0.23.1-210130"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
@@ -20,10 +19,9 @@ export DECIDIM_PWD=$(head -c 18 /dev/urandom | base64 | tr -d '+/=')
 spoc-container start decidim-postgres
 envsubst <createdb.sql | spoc-container exec decidim-postgres -- psql
 
-# Copy existing config files into persistent storage
-cp -rp ${DECIDIM_LAYER}/srv/decidim-app/config ${DECIDIM_CONF}
-
 # Configure Decidim
+install -o 108080 -g 108080 -m 700 -d ${DECIDIM_CONF}
+install -o 108080 -g 108080 -m 700 -d ${DECIDIM_CONF}/initializers
 install -o 108080 -g 108080 -m 700 -d ${DECIDIM_DATA}/migrate
 install -o 108080 -g 108080 -m 700 -d ${DECIDIM_DATA}/storage
 install -o 108080 -g 108080 -m 700 -d ${DECIDIM_DATA}/uploads