From 719b4e04b659db284c19961abd88a98896407287 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Wed, 18 Mar 2020 22:25:27 +0100
Subject: [PATCH] Make MifosX SPOC-compatible, cont'd

---
 lxc-apps/kanboard/uninstall.sh | 2 +-
 lxc-apps/mifosx/image          | 2 +-
 lxc-apps/mifosx/install.sh     | 4 ++--
 lxc-apps/mifosx/uninstall.sh   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lxc-apps/kanboard/uninstall.sh b/lxc-apps/kanboard/uninstall.sh
index cb628c0..686ea3b 100755
--- a/lxc-apps/kanboard/uninstall.sh
+++ b/lxc-apps/kanboard/uninstall.sh
@@ -2,7 +2,7 @@
 set -ev
 
 # Remove persistent data
-rm -rf "${VOLUME_DIR}/kanboard"
+rm -rf "${VOLUMES_DIR}/kanboard"
 
 # Unregister application
 vmmgr unregister-app kanboard
diff --git a/lxc-apps/mifosx/image b/lxc-apps/mifosx/image
index 8792c93..37dd591 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 http://central.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://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
 
     # Cleanup
     apk --no-cache del wget
diff --git a/lxc-apps/mifosx/install.sh b/lxc-apps/mifosx/install.sh
index 7e54422..fdc3baa 100755
--- a/lxc-apps/mifosx/install.sh
+++ b/lxc-apps/mifosx/install.sh
@@ -10,7 +10,7 @@ MIFOSX_CONF="${VOLUMES_DIR}/mifosx/mifosx_conf"
 install -o 100000 -g 100000 -m 755 -d ${MARIADB_CONF}
 install -o 103306 -g 103306 -m 750 -d ${MARIADB_DATA}
 install -o 100000 -g 100000 -m 644 mariadb_conf/my.cnf ${MARIADB_CONF}/my.cnf
-spoc-container exec mifosx-mariadb -- mysql_install_db --user=mysql --datadir=/var/lib/mysql --auth-root-authentication-method=socket --auth-root-socket-user=mysql --skip-test-db
+spoc-container exec -u 0 -g 0 mifosx-mariadb -- mysql_install_db --user=mysql --datadir=/var/lib/mysql --auth-root-authentication-method=socket --skip-test-db
 
 # Create databases
 export MIFOSX_PWD=$(head -c 18 /dev/urandom | base64 | tr -d '+/=')
@@ -28,7 +28,7 @@ envsubst <schemapwd.sql | spoc-container exec mifosx-mariadb -- mysql -u mysql m
 
 # Populate database
 spoc-container start mifosx
-until grep -q 'org.apache.catalina.startup.Catalina.start Server startup' /var/log/lxc/mifosx.log; do
+until grep -q 'org.apache.catalina.startup.Catalina.start Server startup' /var/log/spoc/mifosx.log; do
     sleep 1
 done
 spoc-container stop mifosx
diff --git a/lxc-apps/mifosx/uninstall.sh b/lxc-apps/mifosx/uninstall.sh
index 3b5bb9d..a9409ab 100755
--- a/lxc-apps/mifosx/uninstall.sh
+++ b/lxc-apps/mifosx/uninstall.sh
@@ -2,7 +2,7 @@
 set -ev
 
 # Remove persistent data
-rm -rf "${VOLUME_DIR}/mifosx"
+rm -rf "${VOLUMES_DIR}/mifosx"
 
 # Unregister application
 vmmgr unregister-app mifosx