From 512895a6f2343098be4b031ab4046963ac22ff4c Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Mon, 16 Mar 2020 21:35:33 +0100
Subject: [PATCH] Make CTS SPOC-compatible

---
 lxc-apps/cts/app                | 26 ++++++++++++++++++++++++
 lxc-apps/cts/{lxcfile => image} |  6 +++---
 lxc-apps/cts/install.sh         | 35 ++++++++++++++++-----------------
 lxc-apps/cts/meta               | 26 ------------------------
 lxc-apps/cts/uninstall.sh       |  2 +-
 5 files changed, 47 insertions(+), 48 deletions(-)
 create mode 100644 lxc-apps/cts/app
 rename lxc-apps/cts/{lxcfile => image} (91%)
 delete mode 100644 lxc-apps/cts/meta

diff --git a/lxc-apps/cts/app b/lxc-apps/cts/app
new file mode 100644
index 0000000..b7207b0
--- /dev/null
+++ b/lxc-apps/cts/app
@@ -0,0 +1,26 @@
+{
+    "version": "0.8.0-200313",
+    "meta": {
+        "title": "CTS",
+        "desc-cs": "Sledovací systém komodit",
+        "desc-en": "Commodity tracking system",
+        "license": "GPL"
+    },
+    "containers": {
+        "cts": {
+            "image": "cts_0.8.0-200313",
+            "depends": [
+                "cts-postgres"
+            ],
+            "mounts": {
+                "cts/cts_conf": "srv/cts/cts/settings"
+            }
+        },
+        "cts-postgres": {
+            "image": "postgis_3.0.0-200313",
+            "mounts": {
+                "cts/postgres_data": "var/lib/postgresql"
+            }
+        }
+    }
+}
diff --git a/lxc-apps/cts/lxcfile b/lxc-apps/cts/image
similarity index 91%
rename from lxc-apps/cts/lxcfile
rename to lxc-apps/cts/image
index 80f9ea0..e49faa0 100644
--- a/lxc-apps/cts/lxcfile
+++ b/lxc-apps/cts/image
@@ -1,9 +1,9 @@
-IMAGE cts_0.8.0-190620
-FROM alpine3.9-python2.7_2.7.16-190620
+IMAGE cts_0.8.0-200313
+FROM alpine3.11-python2.7_2.7.16-200313
 
 RUN EOF
     # Install runtime dependencies
-    apk --no-cache add geos@vm libpq nginx zlib
+    apk --no-cache add geos libpq nginx zlib
 
     # Install build dependencies
     apk --no-cache add --virtual .deps build-base git postgresql-dev python2-dev py2-pip zlib-dev
diff --git a/lxc-apps/cts/install.sh b/lxc-apps/cts/install.sh
index 07e9ec9..0a8723b 100755
--- a/lxc-apps/cts/install.sh
+++ b/lxc-apps/cts/install.sh
@@ -1,44 +1,43 @@
 #!/bin/sh
 set -ev
 
+# Volumes
+POSTGRES_DATA="${VOLUMES_DIR}/cts/postgres_data"
+CTS_CONF="${VOLUMES_DIR}/cts/cts_conf"
+
 # Create Postgres instance
-mkdir -p /srv/cts/postgres_data
-chown -R 105432:105432 /srv/cts/postgres_data
-chmod 700 /srv/cts/postgres_data
-lxc-execute -n cts-postgres -- initdb -D /var/lib/postgresql
+install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
+spoc-container exec cts-postgres -- initdb -D /var/lib/postgresql
 
 # Configure Postgres
-cp postgres_data/postgresql.conf /srv/cts/postgres_data/postgresql.conf
-cp postgres_data/pg_hba.conf /srv/cts/postgres_data/pg_hba.conf
+install -o 105432 -g 105432 -m 600 postgres_data/postgresql.conf ${POSTGRES_DATA}/postgresql.conf
+install -o 105432 -g 105432 -m 600 postgres_data/pg_hba.conf ${POSTGRES_DATA}/pg_hba.conf
 
 # Create database
 export CTS_PWD=$(head -c 18 /dev/urandom | base64 | tr -d '+/=')
-service lxc-cts-postgres start
-envsubst <createdb.sql | lxc-attach -u 5432 -g 5432 cts-postgres -- psql
+spoc-container start cts-postgres
+envsubst <createdb.sql | spoc-container exec cts-postgres -- psql
 
 # Copy existing config files into persistent storage
-lxchelper extract cts /srv/cts/cts/settings /srv/cts/cts_conf
+cp -rp ${LAYERS_DIR}/cts_0.8.0-200313/srv/cts/cts/settings ${CTS_CONF}
 
 # Configure CTS
 export CTS_SECRET=$(head -c 26 /dev/urandom | base64 | tr -d '+/=')
-envsubst <cts_conf/spotter.py >/srv/cts/cts_conf/spotter.py
-touch /srv/cts/cts_conf/__init__.py
+envsubst <cts_conf/spotter.py | install -o 100000 -g 108080 -m 640 /dev/stdin ${CTS_CONF}/spotter.py
+install -o 100000 -g 108080 -m 640 /dev/null ${CTS_CONF}/__init__.py
 
 # Populate database
-lxc-execute cts -- manage.py migrate
+spoc-container exec cts -- manage.py migrate
 
 # Create admin account
 export CTS_ADMIN_EMAIL=admin@example.com
 export CTS_ADMIN_PWD=$(head -c 12 /dev/urandom | base64 | tr -d '+/=')
-export CTS_ADMIN_HASH=$(lxc-execute cts -- python -c "from django.contrib.auth.hashers import make_password; print make_password('${CTS_ADMIN_PWD}')")
+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 -c1-13)
-envsubst <adminpwd.sql | lxc-attach -u 5432 -g 5432 cts-postgres -- psql cts
-
-# Install config update script
-cp update-conf.sh /srv/cts/update-conf.sh
+envsubst <adminpwd.sql | spoc-container exec cts-postgres -- psql cts
 
 # Stop services required for setup
-service lxc-cts-postgres stop
+spoc-container stop cts-postgres
 
 # Register application
 vmmgr register-app cts cts "${CTS_ADMIN_EMAIL}" "${CTS_ADMIN_PWD}"
diff --git a/lxc-apps/cts/meta b/lxc-apps/cts/meta
deleted file mode 100644
index eb4d9f2..0000000
--- a/lxc-apps/cts/meta
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "version": "0.8.0-190620",
-    "meta": {
-        "title": "CTS",
-        "desc-cs": "Sledovací systém komodit",
-        "desc-en": "Commodity tracking system",
-        "license": "GPL"
-    },
-    "containers": {
-        "cts": {
-            "image": "cts_0.8.0-190620",
-            "depends": [
-                "cts-postgres"
-            ],
-            "mounts": [
-                ["DIR", "/srv/cts/cts_conf", "/srv/cts/cts/settings"]
-            ]
-        },
-        "cts-postgres": {
-            "image": "postgis_2.5.1-190620",
-            "mounts": [
-                ["DIR", "/srv/cts/postgres_data", "/var/lib/postgresql"]
-            ]
-        }
-    }
-}
diff --git a/lxc-apps/cts/uninstall.sh b/lxc-apps/cts/uninstall.sh
index 3e51a6a..cc6e34a 100755
--- a/lxc-apps/cts/uninstall.sh
+++ b/lxc-apps/cts/uninstall.sh
@@ -2,7 +2,7 @@
 set -ev
 
 # Remove persistent data
-rm -rf /srv/cts
+rm -rf "${VOLUMES_DIR}/cts"
 
 # Unregister application
 vmmgr unregister-app cts