From d93c739d3896523439422c0eaa4c1d0451d07a75 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Tue, 24 Mar 2020 21:51:25 +0100
Subject: [PATCH] Fix Sigmah mounts

---
 lxc-apps/cts/install.sh                               | 2 +-
 lxc-apps/mifosx/image                                 | 2 +-
 lxc-apps/sigmah/app                                   | 5 +++--
 lxc-apps/sigmah/install/sigmah_conf/sigmah.properties | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lxc-apps/cts/install.sh b/lxc-apps/cts/install.sh
index 3778d57..8525a91 100755
--- a/lxc-apps/cts/install.sh
+++ b/lxc-apps/cts/install.sh
@@ -34,7 +34,7 @@ spoc-container exec cts -- manage.py migrate
 export CTS_ADMIN_EMAIL=admin@example.com
 export CTS_ADMIN_PWD=$(head -c 12 /dev/urandom | base64 | tr -d '+/=')
 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)
+export CTS_ADMIN_SECRET=$(head -c 12 /dev/urandom | sha256sum | cut -c0-12)
 envsubst <adminpwd.sql | spoc-container exec cts-postgres -- psql cts
 
 # Stop services required for setup
diff --git a/lxc-apps/mifosx/image b/lxc-apps/mifosx/image
index 37dd591..9ccd7fc 100644
--- a/lxc-apps/mifosx/image
+++ b/lxc-apps/mifosx/image
@@ -14,7 +14,7 @@ RUN EOF
     mv /tmp/fineractplatform-18.03.01.RELEASE/database/mifospltaform-tenants-first-time-install.sql /tmp/mifospltaform-tenants-first-time-install.sql
 
     # Download Java library dependencies
-    wget https://repo1.maven.org/maven2/org/drizzle/jdbc/drizzle-jdbc/1.4/drizzle-jdbc-1.4.jar -O /srv/tomcat/lib/drizzle-jdbc-1.4.jar
+    wget https://repo.maven.apache.org/maven2/org/drizzle/jdbc/drizzle-jdbc/1.4/drizzle-jdbc-1.4.jar -O /srv/tomcat/lib/drizzle-jdbc-1.4.jar
 
     # Cleanup
     apk --no-cache del wget
diff --git a/lxc-apps/sigmah/app b/lxc-apps/sigmah/app
index 5a169aa..40b20f5 100644
--- a/lxc-apps/sigmah/app
+++ b/lxc-apps/sigmah/app
@@ -13,8 +13,9 @@
                 "sigmah-postgres"
             ],
             "mounts": {
-                "sigmah/sigmah_conf": "srv/sigmah/conf",
-                "sigmah/sigmah_data": "srv/sigmah/data"
+                "sigmah/sigmah_conf/persistence.xml": "srv/tomcat/webapps/sigmah/WEB-INF/classes/META-INF/persistence.xml:file",
+                "sigmah/sigmah_conf/sigmah.properties": "srv/tomcat/webapps/sigmah/WEB-INF/classes/sigmah.properties:file",
+                "sigmah/sigmah_data": "srv/sigmah"
             }
         },
         "sigmah-postgres": {
diff --git a/lxc-apps/sigmah/install/sigmah_conf/sigmah.properties b/lxc-apps/sigmah/install/sigmah_conf/sigmah.properties
index 14ea4ce..86c5124 100644
--- a/lxc-apps/sigmah/install/sigmah_conf/sigmah.properties
+++ b/lxc-apps/sigmah/install/sigmah_conf/sigmah.properties
@@ -10,10 +10,10 @@
 # --
 
 # Root directory name where files are stored.
-files.repository.name=/srv/sigmah/data/files
+files.repository.name=/srv/sigmah/files
 
 # Root directory name where backup archives are stored.
-archives.repository.name=/srv/sigmah/data/archives/
+archives.repository.name=/srv/sigmah/archives
 
 #Maximum size of the uploaded files (bytes)
 files.upload.maxSize=20971520