From b55a5dfdbd27e749af1a61fa63e08c6faeb1136d Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Mon, 16 Mar 2020 19:13:43 +0100
Subject: [PATCH] Use install binary to copy / create CKAN files

---
 apk/spoc                 |  2 +-
 lxc-apps/ckan/install.sh | 43 +++++++++++++++++-----------------------
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/apk/spoc b/apk/spoc
index c1e60a4..fc42131 160000
--- a/apk/spoc
+++ b/apk/spoc
@@ -1 +1 @@
-Subproject commit c1e60a4adf6339c0390e66ab07b63a242442d52a
+Subproject commit fc42131bb6acaa9d474930add14f9e7fdf055bf5
diff --git a/lxc-apps/ckan/install.sh b/lxc-apps/ckan/install.sh
index 23f0ae6..6bf30e0 100755
--- a/lxc-apps/ckan/install.sh
+++ b/lxc-apps/ckan/install.sh
@@ -12,14 +12,12 @@ CKAN_CONF="${VOLUMES_DIR}/ckan/ckan_conf"
 CKAN_DATA="${VOLUMES_DIR}/ckan/ckan_data"
 
 # Create Postgres instance
-mkdir -p ${POSTGRES_DATA}
-chown -R 105432:105432 ${POSTGRES_DATA}
-chmod 700 ${POSTGRES_DATA}
+install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
 spoc-container exec ckan-postgres -- initdb -D /var/lib/postgresql
 
 # Configure Postgres
-cp postgres_data/postgresql.conf ${POSTGRES_DATA}/postgresql.conf
-cp postgres_data/pg_hba.conf ${POSTGRES_DATA}/pg_hba.conf
+install postgres_data/postgresql.conf ${POSTGRES_DATA}/postgresql.conf
+install postgres_data/pg_hba.conf ${POSTGRES_DATA}/pg_hba.conf
 
 # Create database
 export CKAN_PWD=$(head -c 18 /dev/urandom | base64 | tr -d '+/=')
@@ -28,41 +26,36 @@ spoc-container start ckan-postgres
 envsubst <createdb.sql | spoc-container exec ckan-postgres -- psql
 
 # Configure Redis
-mkdir -p ${REDIS_CONF} ${REDIS_DATA}
-cp redis_conf/redis.conf ${REDIS_CONF}/redis.conf
-chown -R 100000:100000 ${REDIS_CONF}
-chown -R 106379:106379 ${REDIS_DATA}
+install -o 100000 -g 100000 -d ${REDIS_CONF}
+install -o 106379 -g 106379 -d ${REDIS_DATA}
+install -o 106379 -g 106379 redis_conf/redis.conf ${REDIS_CONF}/redis.conf
 spoc-container start ckan-redis
 
 # Configure Solr
-mkdir -p ${SOLR_DATA}
-cp ${LAYERS_DIR}/solr6_6.5.1-200313/opt/solr/server/solr/solr.xml ${SOLR_DATA}/solr.xml
-chown -R 108983:108983 ${SOLR_DATA}
+install -o 108983 -g 108983 -d ${SOLR_DATA}
+install -o 108983 -g 108983 ${LAYERS_DIR}/solr6_6.5.1-200313/opt/solr/server/solr/solr.xml ${SOLR_DATA}/solr.xml
 spoc-container start ckan-solr
 
 # Configure CKAN Solr core
 spoc-container exec ckan-solr -- solr create -p 8983 -c ckan
 spoc-container stop ckan-solr
-cp solr_data/ckan/conf/schema.xml ${SOLR_DATA}/ckan/conf/schema.xml
-cp solr_data/ckan/conf/solrconfig.xml ${SOLR_DATA}/ckan/conf/solrconfig.xml
-chown -R 108983:108983 ${SOLR_DATA}
+install -o 108983 -g 108983 solr_data/ckan/conf/schema.xml ${SOLR_DATA}/ckan/conf/schema.xml
+install -o 108983 -g 108983 solr_data/ckan/conf/solrconfig.xml ${SOLR_DATA}/ckan/conf/solrconfig.xml
 spoc-container start ckan-solr
 
 # Configure CKAN DataPusher
-mkdir -p ${DATAPUSHER_CONF} ${DATAPUSHER_DATA}
-cp datapusher_conf/datapusher.wsgi ${DATAPUSHER_CONF}/datapusher.wsgi
-cp datapusher_conf/datapusher_settings.py ${DATAPUSHER_CONF}/datapusher_settings.py
-chown -R 100000:100000 ${DATAPUSHER_CONF}
-chown -R 108080:108080 ${DATAPUSHER_DATA}
+install -o 100000 -g 100000 -d ${DATAPUSHER_CONF}
+install -o 108080 -g 108080 -d ${DATAPUSHER_DATA}
+install -o 100000 -g 100000 datapusher_conf/datapusher.wsgi ${DATAPUSHER_CONF}/datapusher.wsgi
+install -o 100000 -g 100000 datapusher_conf/datapusher_settings.py ${DATAPUSHER_CONF}/datapusher_settings.py
 
 # Configure CKAN
-mkdir -p ${CKAN_CONF} ${CKAN_DATA}
+install -o 100000 -g 100000 -d ${CKAN_CONF}
+install -o 108080 -g 108080 -d ${CKAN_DATA}
 export CKAN_SECRET=$(head -c 18 /dev/urandom | base64 | tr -d '+/=')
 export CKAN_UUID=$(cat /proc/sys/kernel/random/uuid)
-envsubst <ckan_conf/ckan.ini >${CKAN_CONF}/ckan.ini
-cp ckan_conf/who.ini ${CKAN_CONF}/who.ini
-chown -R 100000:100000 ${CKAN_CONF}
-chown -R 108080:108080 ${CKAN_DATA}
+envsubst <ckan_conf/ckan.ini | install -o 100000 -g 100000 /dev/stdin ${CKAN_CONF}/ckan.ini
+install -o 100000 -g 100000 ckan_conf/who.ini ${CKAN_CONF}/who.ini
 
 # Populate database
 spoc-container exec ckan -- paster --plugin=ckan db init -c /etc/ckan/ckan.ini