From be4042d7e440cfa2ca211d5b6928ec6271daa540 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Tue, 17 Mar 2020 09:44:39 +0100
Subject: [PATCH] Make Decidim SPOC-compatible, cont'd.

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

diff --git a/lxc-apps/decidim/app b/lxc-apps/decidim/app
index 41d7ed6..82d56cf 100644
--- a/lxc-apps/decidim/app
+++ b/lxc-apps/decidim/app
@@ -1,5 +1,5 @@
 {
-    "version": "0.20.0-191113",
+    "version": "0.20.0-200313",
     "meta": {
         "title": "Decidim",
         "desc-cs": "Platforma pro účast občanů",
@@ -8,21 +8,21 @@
     },
     "containers": {
         "decidim": {
-            "image": "decidim_0.20.0-191113",
+            "image": "decidim_0.20.0-200313",
             "depends": [
                 "decidim-postgres"
             ],
-            "mounts": [
-                ["DIR", "/srv/decidim/decidim_conf", "/srv/decidim-app/config"],
-                ["DIR", "/srv/decidim/decidim_data/storage", "/srv/decidim-app/storage"],
-                ["DIR", "/srv/decidim/decidim_data/uploads", "/srv/decidim-app/public/uploads"]
-            ]
+            "mounts": {
+                "decidim/decidim_conf": "srv/decidim-app/config",
+                "decidim/decidim_data/storage": "srv/decidim-app/storage",
+                "decidim/decidim_data/uploads": "srv/decidim-app/public/uploads"
+            }
         },
         "decidim-postgres": {
-            "image": "postgres_11.3.0-190620",
-            "mounts": [
-                ["DIR", "/srv/decidim/postgres_data", "/var/lib/postgresql"]
-            ]
+            "image": "postgres_12.2.0-200313",
+            "mounts": {
+                "decidim/postgres_data": "var/lib/postgresql"
+            }
         }
     }
 }
diff --git a/lxc-apps/decidim/install.sh b/lxc-apps/decidim/install.sh
index 143967a..f232a85 100755
--- a/lxc-apps/decidim/install.sh
+++ b/lxc-apps/decidim/install.sh
@@ -23,8 +23,8 @@ envsubst <createdb.sql | spoc-container exec decidim-postgres -- psql
 cp -rp ${LAYERS_DIR}/decidim_0.20.0-200313/srv/decidim-app/config ${DECIDIM_CONF}
 
 # Configure Decidim
-install -o 108080 -g 108080 -m 700 ${DECIDIM_DATA}/storage
-install -o 108080 -g 108080 -m 700 ${DECIDIM_DATA}/uploads
+install -o 108080 -g 108080 -m 700 -d ${DECIDIM_DATA}/storage
+install -o 108080 -g 108080 -m 700 -d ${DECIDIM_DATA}/uploads
 export DECIDIM_SECRET=$(spoc-container exec -u 8080 -g 8080 decidim -- sh -c 'cd /srv/decidim-app; rake secret')
 install -o 108080 -g 108080 -m 640 decidim_conf/environments/production.rb ${DECIDIM_CONF}/environments/production.rb
 install -o 108080 -g 108080 -m 640 decidim_conf/initializers/decidim.rb ${DECIDIM_CONF}/initializers/decidim.rb
@@ -39,7 +39,7 @@ export DECIDIM_ADMIN_PWD=$(head -c 12 /dev/urandom | base64 | tr -d '+/=')
 envsubst <adminpwd.rb | spoc-container exec -u 8080 -g 8080 decidim -- sh -c 'cd /srv/decidim-app; bin/rails console -e production'
 
 # Stop services required for setup
-spoc-constainer stop decidim-postgres
+spoc-container stop decidim-postgres
 
 # Register application
 vmmgr register-app decidim decidim "${DECIDIM_ADMIN_EMAIL}" "${DECIDIM_ADMIN_PWD}"