From ed997ab4176b992c1a9c7997bdeb9a5988be1a06 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Tue, 10 Dec 2019 11:22:46 +0100
Subject: [PATCH] Fix Motech install

---
 lxc-apps/motech/install.sh                    |  7 +++---
 .../motech/install/activemq_conf/activemq.xml | 25 +++++++++++++++++++
 lxc-apps/motech/meta                          |  4 +--
 3 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 lxc-apps/motech/install/activemq_conf/activemq.xml

diff --git a/lxc-apps/motech/install.sh b/lxc-apps/motech/install.sh
index 16d49a9..a55e2f5 100755
--- a/lxc-apps/motech/install.sh
+++ b/lxc-apps/motech/install.sh
@@ -12,8 +12,9 @@ cp postgres_data/postgresql.conf /srv/motech/postgres_data/postgresql.conf
 cp postgres_data/pg_hba.conf /srv/motech/postgres_data/pg_hba.conf
 
 # Configure ActiveMQ
-mkdir -p /srv/motech/activemq_data
-chown -R 161616:161616 /srv/motech/activemq_data
+mkdir -p /srv/motech/activemq_conf /srv/motech/activemq_data
+cp activemq_conf/activemq.xml /srv/motech/activemq_conf/activemq.xml
+chown -R 161616:161616 /srv/motech/activemq_conf /srv/motech/activemq_data
 
 # Create database
 export MOTECH_PWD=$(head -c 18 /dev/urandom | base64 | tr -d '+/=')
@@ -49,5 +50,3 @@ service lxc-motech-postgres stop
 
 # Register application
 vmmgr register-app motech motech "${MOTECH_ADMIN_USER}" "${MOTECH_ADMIN_PWD}"
-
-TODO: move the activemq conf here
diff --git a/lxc-apps/motech/install/activemq_conf/activemq.xml b/lxc-apps/motech/install/activemq_conf/activemq.xml
new file mode 100644
index 0000000..7af3de0
--- /dev/null
+++ b/lxc-apps/motech/install/activemq_conf/activemq.xml
@@ -0,0 +1,25 @@
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
+
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+    
+    <broker xmlns="http://activemq.apache.org/schema/core"
+            schedulerSupport="true"
+            useJmx="true"
+            brokerName="localhost"
+            dataDirectory="${activemq.data}">
+
+        <persistenceAdapter>
+            <kahaDB directory="${activemq.data}/kahadb"/>
+        </persistenceAdapter>
+
+        <transportConnectors>
+            <transportConnector name="openwire" uri="tcp://0.0.0.0:61616"/>
+        </transportConnectors>
+
+    </broker>
+
+</beans>
diff --git a/lxc-apps/motech/meta b/lxc-apps/motech/meta
index 2eb5311..07ae709 100644
--- a/lxc-apps/motech/meta
+++ b/lxc-apps/motech/meta
@@ -14,13 +14,13 @@
                 "motech-postgres"
             ],
             "mounts": [
-                ["DIR", "/srv/motech/motech_data", "/srv/motech/data/files"],
-                ["FILE", "/srv/motech/motech_conf/config.php", "/srv/motech/config.php"]
+                ["DIR", "/srv/motech/motech_conf", "/srv/tomcat/.motech"]
             ]
         },
         "motech-activemq": {
             "image": "activemq_5.15.9-190620",
             "mounts": [
+                ["FILE", "/srv/motech/activemq_conf/activemq.xml", "/srv/activemq/conf/activemq.xml"],
                 ["DIR", "/srv/motech/activemq_data", "/srv/activemq/data"]
             ]
         },