From 15e7600ae4cee6a5ce7cbd1da631fe4c632be0bb Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Thu, 3 Oct 2019 21:41:02 +0200
Subject: [PATCH] Rework ActiveMQ

---
 lxc-apps/ecogis/install.sh                        |  2 +-
 lxc-apps/kanboard/install.sh                      |  2 +-
 lxc-services/activemq/install/etc/init.d/activemq | 11 -----------
 lxc-services/activemq/lxcfile                     |  2 --
 lxc-services/activemq/uninstall.sh                |  6 ------
 5 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100755 lxc-services/activemq/install/etc/init.d/activemq
 delete mode 100755 lxc-services/activemq/uninstall.sh

diff --git a/lxc-apps/ecogis/install.sh b/lxc-apps/ecogis/install.sh
index b92e6b3..2f1f96f 100755
--- a/lxc-apps/ecogis/install.sh
+++ b/lxc-apps/ecogis/install.sh
@@ -23,7 +23,7 @@ mkdir -p /srv/ecogis/ecogis_conf /srv/ecogis/ecogis_data
 envsubst <ecogis_conf/config.php >/srv/ecogis/conf/config.php
 chown -R 108020:108020 /srv/ecogis/ecogis_conf /srv/ecogis/ecogis_data
 
-# Stop services required for build
+# Stop services required for setup
 service ecogis-postgres stop
 
 # Register application
diff --git a/lxc-apps/kanboard/install.sh b/lxc-apps/kanboard/install.sh
index 33cfe2e..d82f11d 100755
--- a/lxc-apps/kanboard/install.sh
+++ b/lxc-apps/kanboard/install.sh
@@ -31,7 +31,7 @@ envsubst <adminpwd.sql | lxc-attach -u 5432 -g 5432 kanboard-postgres -- psql ka
 # Install config update script
 cp update-conf.sh /srv/kanboard/update-conf.sh
 
-# Stop services required for build
+# Stop services required for setup
 service kanboard-postgres stop
 
 # Register application
diff --git a/lxc-services/activemq/install/etc/init.d/activemq b/lxc-services/activemq/install/etc/init.d/activemq
deleted file mode 100755
index c742da8..0000000
--- a/lxc-services/activemq/install/etc/init.d/activemq
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-
-description="ActiveMQ container"
-
-start() {
-	lxc-start activemq
-}
-
-stop() {
-	lxc-stop activemq
-}
diff --git a/lxc-services/activemq/lxcfile b/lxc-services/activemq/lxcfile
index ef515b5..4584249 100644
--- a/lxc-services/activemq/lxcfile
+++ b/lxc-services/activemq/lxcfile
@@ -20,7 +20,5 @@ EOF
 
 COPY lxc
 
-MOUNT DIR /srv/activemq/data srv/activemq/data
-
 USER 61616 61616
 CMD /srv/activemq/bin/activemq console
diff --git a/lxc-services/activemq/uninstall.sh b/lxc-services/activemq/uninstall.sh
deleted file mode 100755
index 4f48056..0000000
--- a/lxc-services/activemq/uninstall.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -ev
-
-# Remove service
-rm -f /etc/init.d/activemq
-rc-update -u