From 746713eb9f23fdcd445d85ca2061ff54977a835f Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Mon, 23 Mar 2020 10:10:57 +0100
Subject: [PATCH] Work with ${LAYERS_DIR} bit more predictably

---
 lxc-apps/ckan/install.sh          | 3 ++-
 lxc-apps/crisiscleanup/install.sh | 3 ++-
 lxc-apps/cts/install.sh           | 3 ++-
 lxc-apps/decidim/install.sh       | 3 ++-
 lxc-apps/openmapkit/install.sh    | 3 ++-
 lxc-apps/sahana-demo/install.sh   | 5 +++--
 lxc-apps/sahana/install.sh        | 3 ++-
 lxc-apps/sambro/install.sh        | 5 +++--
 8 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/lxc-apps/ckan/install.sh b/lxc-apps/ckan/install.sh
index 2b28400..a4dbc1e 100755
--- a/lxc-apps/ckan/install.sh
+++ b/lxc-apps/ckan/install.sh
@@ -6,6 +6,7 @@ POSTGRES_DATA="${VOLUMES_DIR}/ckan/postgres_data"
 REDIS_CONF="${VOLUMES_DIR}/ckan/redis_conf"
 REDIS_DATA="${VOLUMES_DIR}/ckan/redis_data"
 SOLR_DATA="${VOLUMES_DIR}/ckan/solr_data"
+SOLR_LAYER="${LAYERS_DIR}/solr6_6.5.1-200313"
 DATAPUSHER_CONF="${VOLUMES_DIR}/ckan/datapusher_conf"
 DATAPUSHER_DATA="${VOLUMES_DIR}/ckan/datapusher_data"
 CKAN_CONF="${VOLUMES_DIR}/ckan/ckan_conf"
@@ -33,7 +34,7 @@ spoc-container start ckan-redis
 
 # Configure Solr
 install -o 108983 -g 108983 -m 750 -d ${SOLR_DATA}
-install -o 108983 -g 108983 -m 640 ${LAYERS_DIR}/solr6_6.5.1-200313/opt/solr/server/solr/solr.xml ${SOLR_DATA}/solr.xml
+cp -p ${SOLR_LAYER}/opt/solr/server/solr/solr.xml ${SOLR_DATA}/solr.xml
 spoc-container start ckan-solr
 
 # Configure CKAN Solr core
diff --git a/lxc-apps/crisiscleanup/install.sh b/lxc-apps/crisiscleanup/install.sh
index 54902d2..8b08a2c 100755
--- a/lxc-apps/crisiscleanup/install.sh
+++ b/lxc-apps/crisiscleanup/install.sh
@@ -4,6 +4,7 @@ set -ev
 # Volumes
 POSTGRES_DATA="${VOLUMES_DIR}/crisiscleanup/postgres_data"
 CC_CONF="${VOLUMES_DIR}/crisiscleanup/cc_conf"
+CC_LAYER="${LAYERS_DIR}/crisiscleanup_2.2.0-200313"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
@@ -19,7 +20,7 @@ spoc-container start crisiscleanup-postgres
 envsubst <createdb.sql | spoc-container exec crisiscleanup-postgres -- psql
 
 # Copy existing config files into persistent storage
-cp -rp ${LAYERS_DIR}/crisiscleanup_2.2.0-200313/srv/crisiscleanup/config ${CC_CONF}
+cp -rp ${CC_LAYER}/srv/crisiscleanup/config ${CC_CONF}
 
 # Configure CrisisCleanup
 export CRISISCLEANUP_ADMIN_USER="Admin"
diff --git a/lxc-apps/cts/install.sh b/lxc-apps/cts/install.sh
index 0a8723b..3778d57 100755
--- a/lxc-apps/cts/install.sh
+++ b/lxc-apps/cts/install.sh
@@ -4,6 +4,7 @@ set -ev
 # Volumes
 POSTGRES_DATA="${VOLUMES_DIR}/cts/postgres_data"
 CTS_CONF="${VOLUMES_DIR}/cts/cts_conf"
+CTS_LAYER="${LAYERS_DIR}/cts_0.8.0-200313"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
@@ -19,7 +20,7 @@ spoc-container start cts-postgres
 envsubst <createdb.sql | spoc-container exec cts-postgres -- psql
 
 # Copy existing config files into persistent storage
-cp -rp ${LAYERS_DIR}/cts_0.8.0-200313/srv/cts/cts/settings ${CTS_CONF}
+cp -rp ${CTS_LAYER}/srv/cts/cts/settings ${CTS_CONF}
 
 # Configure CTS
 export CTS_SECRET=$(head -c 26 /dev/urandom | base64 | tr -d '+/=')
diff --git a/lxc-apps/decidim/install.sh b/lxc-apps/decidim/install.sh
index f232a85..3eec914 100755
--- a/lxc-apps/decidim/install.sh
+++ b/lxc-apps/decidim/install.sh
@@ -5,6 +5,7 @@ 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.20.0-200313"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
@@ -20,7 +21,7 @@ spoc-container start decidim-postgres
 envsubst <createdb.sql | spoc-container exec decidim-postgres -- psql
 
 # Copy existing config files into persistent storage
-cp -rp ${LAYERS_DIR}/decidim_0.20.0-200313/srv/decidim-app/config ${DECIDIM_CONF}
+cp -rp ${DECIDIM_LAYER}/srv/decidim-app/config ${DECIDIM_CONF}
 
 # Configure Decidim
 install -o 108080 -g 108080 -m 700 -d ${DECIDIM_DATA}/storage
diff --git a/lxc-apps/openmapkit/install.sh b/lxc-apps/openmapkit/install.sh
index f2fb98d..67a807a 100755
--- a/lxc-apps/openmapkit/install.sh
+++ b/lxc-apps/openmapkit/install.sh
@@ -4,6 +4,7 @@ set -ev
 # Volumes
 OMK_CONF="${VOLUMES_DIR}/openmapkit/omk_conf"
 OMK_DATA="${VOLUMES_DIR}/openmapkit/omk_data"
+OMK_LAYER="${LAYERS_DIR}/openmapkit_0.12.0-200313"
 
 # Configure OpenMapKit
 export OPENMAPKIT_ADMIN_USER="admin"
@@ -12,7 +13,7 @@ install -o 108080 -g 108080 -m 750 -d ${OMK_CONF}
 envsubst <omk_conf/settings.js | install -o 108080 -g 108080 -m 640 /dev/stdin ${OMK_CONF}/settings.js
 
 # Copy existing files into persistent storage
-cp -rp ${LAYERS_DIR}/openmapkit_0.12.0-200313/srv/openmapkit/data ${OMK_DATA}
+cp -rp ${OMK_LAYER}/srv/openmapkit/data ${OMK_DATA}
 
 # Register application
 vmmgr register-app openmapkit omk "${OPENMAPKIT_ADMIN_USER}" "${OPENMAPKIT_ADMIN_PWD}"
diff --git a/lxc-apps/sahana-demo/install.sh b/lxc-apps/sahana-demo/install.sh
index 2ae8191..0b4ab42 100755
--- a/lxc-apps/sahana-demo/install.sh
+++ b/lxc-apps/sahana-demo/install.sh
@@ -5,6 +5,7 @@ set -ev
 POSTGRES_DATA="${VOLUMES_DIR}/sahana-demo/postgres_data"
 SAHANA_DATA="${VOLUMES_DIR}/sahana-demo/sahana_data"
 SAHANA_CONF="${VOLUMES_DIR}/sahana-demo/sahana_conf"
+SAHANA_LAYER="${LAYERS_DIR}/sahana_0.0.1-200313"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
@@ -21,8 +22,8 @@ envsubst <createdb.sql | spoc-container exec sahana-demo-postgres -- psql
 # Prepare persistent directory structure
 install -o 108080 -g 108080 -m 750 -d ${SAHANA_DATA}/databases
 install -o 108080 -g 108080 -m 750 -d ${SAHANA_DATA}/uploads
-cp -rp ${LAYERS_DIR}/sahana_0.0.1-200313/srv/web2py/applications/eden/models ${SAHANA_CONF}
-cp -rp ${LAYERS_DIR}/sahana_0.0.1-200313/srv/web2py/applications/eden/modules/templates/default ${SAHANA_DATA}/default
+cp -rp ${SAHANA_LAYER}/srv/web2py/applications/eden/models ${SAHANA_CONF}
+cp -rp ${SAHANA_LAYER}/srv/web2py/applications/eden/modules/templates/default ${SAHANA_DATA}/default
 
 # Configure Sahana
 export SAHANADEMO_HMAC=$(head -c 18 /dev/urandom | base64 | tr -d '+/=')
diff --git a/lxc-apps/sahana/install.sh b/lxc-apps/sahana/install.sh
index ada31c0..c8880b4 100755
--- a/lxc-apps/sahana/install.sh
+++ b/lxc-apps/sahana/install.sh
@@ -5,6 +5,7 @@ set -ev
 POSTGRES_DATA="${VOLUMES_DIR}/sahana/postgres_data"
 SAHANA_DATA="${VOLUMES_DIR}/sahana/sahana_data"
 SAHANA_CONF="${VOLUMES_DIR}/sahana/sahana_conf"
+SAHANA_LAYER="${LAYERS_DIR}/sahana_0.0.1-200313"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
@@ -22,7 +23,7 @@ envsubst <createdb.sql | spoc-container exec sahana-postgres -- psql
 # Prepare persistent directory structure
 install -o 108080 -g 108080 -m 750 -d ${SAHANA_DATA}/databases
 install -o 108080 -g 108080 -m 750 -d ${SAHANA_DATA}/uploads
-cp -rp ${LAYERS_DIR}/sahana_0.0.1-200313/srv/web2py/applications/eden/models ${SAHANA_CONF}
+cp -rp ${SAHANA_LAYER}/srv/web2py/applications/eden/models ${SAHANA_CONF}
 
 # Copy Spotter template
 cp -r sahana_data/Spotter ${SAHANA_DATA}/Spotter
diff --git a/lxc-apps/sambro/install.sh b/lxc-apps/sambro/install.sh
index 7ead691..c2c17c0 100755
--- a/lxc-apps/sambro/install.sh
+++ b/lxc-apps/sambro/install.sh
@@ -5,6 +5,7 @@ set -ev
 POSTGRES_DATA="${VOLUMES_DIR}/sambro/postgres_data"
 SAHANA_DATA="${VOLUMES_DIR}/sambro/sahana_data"
 SAHANA_CONF="${VOLUMES_DIR}/sambro/sahana_conf"
+SAHANA_LAYER="${LAYERS_DIR}/sahana_0.0.1-200313"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
@@ -22,8 +23,8 @@ envsubst <createdb.sql | spoc-container exec sambro-postgres -- psql
 # Prepare persistent directory structure
 install -o 108080 -g 108080 -m 750 -d ${SAHANA_DATA}/databases
 install -o 108080 -g 108080 -m 750 -d ${SAHANA_DATA}/uploads
-cp -rp ${LAYERS_DIR}/sahana_0.0.1-200313/srv/web2py/applications/eden/models ${SAHANA_CONF}
-cp -rp ${LAYERS_DIR}/sahana_0.0.1-200313/srv/web2py/applications/eden/modules/templates/SAMBRO ${SAHANA_DATA}/SAMBRO
+cp -rp ${SAHANA_LAYER}/srv/web2py/applications/eden/models ${SAHANA_CONF}
+cp -rp ${SAHANA_LAYER}/srv/web2py/applications/eden/modules/templates/SAMBRO ${SAHANA_DATA}/SAMBRO
 
 # Configure SAMBRO
 export SAMBRO_HMAC=$(head -c 18 /dev/urandom | base64 | tr -d '+/=')