From 6af3888fdaed29ceb74fc87b9e85ebbde9d29070 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Tue, 26 Feb 2019 21:12:41 +0100
Subject: [PATCH] Fix register-app calls

---
 ckan/install.sh              | 2 +-
 crisiscleanup/install.sh     | 2 +-
 cts/install.sh               | 2 +-
 ecogis/install.sh            | 2 +-
 frontlinesms/install.sh      | 2 +-
 gnuhealth/install.sh         | 2 +-
 kanboard/install.sh          | 2 +-
 mifosx/install.sh            | 2 +-
 motech/install.sh            | 2 +-
 odoo/install.sh              | 2 +-
 opendatakit-build/install.sh | 2 +-
 opendatakit/install.sh       | 6 +++---
 openmapkit/install.sh        | 2 +-
 pandora/install.sh           | 2 +-
 sahana-demo/install.sh       | 2 +-
 sahana/install.sh            | 2 +-
 sambro/install.sh            | 2 +-
 seeddms/install.sh           | 2 +-
 sigmah/install.sh            | 2 +-
 ushahidi/install.sh          | 2 +-
 20 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/ckan/install.sh b/ckan/install.sh
index 1bef8ab..18640fa 100755
--- a/ckan/install.sh
+++ b/ckan/install.sh
@@ -63,4 +63,4 @@ cp srv/ckan/update-conf.sh /srv/ckan/update-conf.sh
 [ ! -z ${STOP_SOLR} ] && service solr stop
 
 # Register application
-vmmgr register-app ckan "${CKAN_ADMIN_USER}" "${CKAN_ADMIN_PWD}"
+vmmgr register-app ckan ckan "${CKAN_ADMIN_USER}" "${CKAN_ADMIN_PWD}"
diff --git a/crisiscleanup/install.sh b/crisiscleanup/install.sh
index 5026030..c25112e 100755
--- a/crisiscleanup/install.sh
+++ b/crisiscleanup/install.sh
@@ -40,4 +40,4 @@ cp srv/crisiscleanup/update-conf.sh /srv/crisiscleanup/update-conf.sh
 [ ! -z ${STOP_POSTGRES} ] && service postgres stop
 
 # Register application
-vmmgr register-app crisiscleanup "${CRISISCLEANUP_ADMIN_EMAIL}" "${CRISISCLEANUP_ADMIN_PWD}"
+vmmgr register-app crisiscleanup cc "${CRISISCLEANUP_ADMIN_EMAIL}" "${CRISISCLEANUP_ADMIN_PWD}"
diff --git a/cts/install.sh b/cts/install.sh
index a517dbe..a7132df 100755
--- a/cts/install.sh
+++ b/cts/install.sh
@@ -45,4 +45,4 @@ cp srv/cts/update-conf.sh /srv/cts/update-conf.sh
 [ ! -z ${STOP_POSTGRES} ] && service postgres stop
 
 # Register application
-vmmgr register-app cts "${CTS_ADMIN_EMAIL}" "${CTS_ADMIN_PWD}"
+vmmgr register-app cts cts "${CTS_ADMIN_EMAIL}" "${CTS_ADMIN_PWD}"
diff --git a/ecogis/install.sh b/ecogis/install.sh
index 45b3d2d..02b0506 100755
--- a/ecogis/install.sh
+++ b/ecogis/install.sh
@@ -23,4 +23,4 @@ rc-update -u
 [ ! -z ${STOP_POSTGRES} ] && service postgres stop
 
 # Register application
-vmmgr register-app ecogis
+vmmgr register-app ecogis ecogis
diff --git a/frontlinesms/install.sh b/frontlinesms/install.sh
index 7f4ca42..a92c69d 100755
--- a/frontlinesms/install.sh
+++ b/frontlinesms/install.sh
@@ -17,4 +17,4 @@ cp etc/init.d/frontlinesms /etc/init.d/frontlinesms
 rc-update -u
 
 # Register application
-vmmgr register-app frontlinesms "${FRONTLINESMS_ADMIN_USER}" "${FRONTLINESMS_ADMIN_PWD}"
+vmmgr register-app frontlinesms sms "${FRONTLINESMS_ADMIN_USER}" "${FRONTLINESMS_ADMIN_PWD}"
diff --git a/gnuhealth/install.sh b/gnuhealth/install.sh
index 1dbd27f..83c6b82 100755
--- a/gnuhealth/install.sh
+++ b/gnuhealth/install.sh
@@ -35,4 +35,4 @@ cp srv/gnuhealth/update-conf.sh /srv/gnuhealth/update-conf.sh
 [ ! -z ${STOP_POSTGRES} ] && service postgres stop
 
 # Register application
-vmmgr register-app gnuhealth "${GNUHEALTH_ADMIN_USER}" "${GNUHEALTH_ADMIN_PWD}"
+vmmgr register-app gnuhealth gh "${GNUHEALTH_ADMIN_USER}" "${GNUHEALTH_ADMIN_PWD}"
diff --git a/kanboard/install.sh b/kanboard/install.sh
index c02dcf0..9a51485 100755
--- a/kanboard/install.sh
+++ b/kanboard/install.sh
@@ -34,4 +34,4 @@ cp srv/kanboard/update-conf.sh /srv/kanboard/update-conf.sh
 [ ! -z ${STOP_POSTGRES} ] && service postgres stop
 
 # Register application
-vmmgr register-app kanboard "${KANBOARD_ADMIN_USER}" "${KANBOARD_ADMIN_PWD}"
+vmmgr register-app kanboard kb "${KANBOARD_ADMIN_USER}" "${KANBOARD_ADMIN_PWD}"
diff --git a/mifosx/install.sh b/mifosx/install.sh
index 73daf99..54e902c 100755
--- a/mifosx/install.sh
+++ b/mifosx/install.sh
@@ -48,4 +48,4 @@ cp srv/mifosx/update-conf.sh /srv/mifosx/update-conf.sh
 [ ! -z ${STOP_MARIADB} ] && service mariadb stop
 
 # Register application
-vmmgr register-app mifosx "${MIFOSX_ADMIN_USER}" "${MIFOSX_ADMIN_PWD}"
+vmmgr register-app mifosx mifosx "${MIFOSX_ADMIN_USER}" "${MIFOSX_ADMIN_PWD}"
diff --git a/motech/install.sh b/motech/install.sh
index 4fe7bc2..119f45b 100755
--- a/motech/install.sh
+++ b/motech/install.sh
@@ -42,4 +42,4 @@ cp srv/motech/update-conf.sh /srv/motech/update-conf.sh
 [ ! -z ${STOP_POSTGRES} ] && service postgres stop
 
 # Register application
-vmmgr register-app motech "${MOTECH_ADMIN_USER}" "${MOTECH_ADMIN_PWD}"
+vmmgr register-app motech motech "${MOTECH_ADMIN_USER}" "${MOTECH_ADMIN_PWD}"
diff --git a/odoo/install.sh b/odoo/install.sh
index 72abda6..0031afa 100755
--- a/odoo/install.sh
+++ b/odoo/install.sh
@@ -36,4 +36,4 @@ rc-update -u
 [ ! -z ${STOP_POSTGRES} ] && service postgres stop
 
 # Register application
-vmmgr register-app odoo "${ODOO_ADMIN_USER}" "${ODOO_ADMIN_PWD}"
+vmmgr register-app odoo odoo "${ODOO_ADMIN_USER}" "${ODOO_ADMIN_PWD}"
diff --git a/opendatakit-build/install.sh b/opendatakit-build/install.sh
index b0052e5..677174d 100755
--- a/opendatakit-build/install.sh
+++ b/opendatakit-build/install.sh
@@ -24,4 +24,4 @@ rc-update -u
 [ ! -z ${STOP_POSTGRES} ] && service postgres stop
 
 # Register application
-vmmgr register-app opendatakit-build
+vmmgr register-app opendatakit-build odkbuild
diff --git a/opendatakit/install.sh b/opendatakit/install.sh
index 5e36f20..3c85059 100755
--- a/opendatakit/install.sh
+++ b/opendatakit/install.sh
@@ -24,11 +24,11 @@ cp etc/init.d/opendatakit /etc/init.d/opendatakit
 rc-update -u
 
 # Populate database
-service opendatakit start
+lxc-start opendatakit
 until grep -q 'org.apache.catalina.startup.Catalina.start Server startup' /var/log/lxc/opendatakit.log; do
     sleep 1
 done
-service opendatakit stop
+lxc-stop opendatakit
 
 # Update admin account
 export OPENDATAKIT_ADMIN_PWD=$(head -c 12 /dev/urandom | base64)
@@ -44,4 +44,4 @@ cp srv/opendatakit/update-conf.sh /srv/opendatakit/update-conf.sh
 [ ! -z ${STOP_POSTGRES} ] && service postgres stop
 
 # Register application
-vmmgr register-app opendatakit "${OPENDATAKIT_ADMIN_USER}" "${OPENDATAKIT_ADMIN_PWD}"
+vmmgr register-app opendatakit odk "${OPENDATAKIT_ADMIN_USER}" "${OPENDATAKIT_ADMIN_PWD}"
diff --git a/openmapkit/install.sh b/openmapkit/install.sh
index a3db06f..e9ee54f 100755
--- a/openmapkit/install.sh
+++ b/openmapkit/install.sh
@@ -16,4 +16,4 @@ cp etc/init.d/openmapkit /etc/init.d/openmapkit
 rc-update -u
 
 # Register application
-vmmgr register-app openmapkit "${OPENMAPKIT_ADMIN_USER}" "${OPENMAPKIT_ADMIN_PWD}"
+vmmgr register-app openmapkit omk "${OPENMAPKIT_ADMIN_USER}" "${OPENMAPKIT_ADMIN_PWD}"
diff --git a/pandora/install.sh b/pandora/install.sh
index 1a073ac..7090bf3 100755
--- a/pandora/install.sh
+++ b/pandora/install.sh
@@ -60,4 +60,4 @@ cp srv/pandora/update-conf.sh /srv/pandora/update-conf.sh
 [ ! -z ${STOP_RABBITMQ} ] && service rabbitmq stop
 
 # Register application
-vmmgr register-app pandora "${PANDORA_ADMIN_USER}" "${PANDORA_ADMIN_PWD}"
+vmmgr register-app pandora pandora "${PANDORA_ADMIN_USER}" "${PANDORA_ADMIN_PWD}"
diff --git a/sahana-demo/install.sh b/sahana-demo/install.sh
index be1613a..8a28e7c 100755
--- a/sahana-demo/install.sh
+++ b/sahana-demo/install.sh
@@ -47,4 +47,4 @@ cp srv/sahana-demo/update-conf.sh /srv/sahana-demo/update-conf.sh
 [ ! -z ${STOP_POSTGRES} ] && service postgres stop
 
 # Register application
-vmmgr register-app sahana-demo "${SAHANADEMO_ADMIN_USER}" "${SAHANADEMO_ADMIN_PWD}"
+vmmgr register-app sahana-demo sahana-demo "${SAHANADEMO_ADMIN_USER}" "${SAHANADEMO_ADMIN_PWD}"
diff --git a/sahana/install.sh b/sahana/install.sh
index 3850705..a3cc5ac 100755
--- a/sahana/install.sh
+++ b/sahana/install.sh
@@ -48,4 +48,4 @@ cp srv/sahana/update-conf.sh /srv/sahana/update-conf.sh
 [ ! -z ${STOP_POSTGRES} ] && service postgres stop
 
 # Register application
-vmmgr register-app sahana "${SAHANA_ADMIN_USER}" "${SAHANA_ADMIN_PWD}"
+vmmgr register-app sahana sahana "${SAHANA_ADMIN_USER}" "${SAHANA_ADMIN_PWD}"
diff --git a/sambro/install.sh b/sambro/install.sh
index 9f45c8c..4046a07 100755
--- a/sambro/install.sh
+++ b/sambro/install.sh
@@ -48,4 +48,4 @@ cp srv/sambro/update-conf.sh /srv/sambro/update-conf.sh
 [ ! -z ${STOP_POSTGRES} ] && service postgres stop
 
 # Register application
-vmmgr register-app sambro "${SAMBRO_ADMIN_USER}" "${SAMBRO_ADMIN_PWD}"
+vmmgr register-app sambro sambro "${SAMBRO_ADMIN_USER}" "${SAMBRO_ADMIN_PWD}"
diff --git a/seeddms/install.sh b/seeddms/install.sh
index b577961..1ee55b0 100755
--- a/seeddms/install.sh
+++ b/seeddms/install.sh
@@ -40,4 +40,4 @@ cp srv/seeddms/update-conf.sh /srv/seeddms/update-conf.sh
 [ ! -z ${STOP_POSTGRES} ] && service postgres stop
 
 # Register application
-vmmgr register-app seeddms "${SEEDDMS_ADMIN_USER}" "${SEEDDMS_ADMIN_PWD}"
+vmmgr register-app seeddms dms "${SEEDDMS_ADMIN_USER}" "${SEEDDMS_ADMIN_PWD}"
diff --git a/sigmah/install.sh b/sigmah/install.sh
index 42d5c10..4bf374e 100755
--- a/sigmah/install.sh
+++ b/sigmah/install.sh
@@ -47,4 +47,4 @@ cp srv/sigmah/update-conf.sh /srv/sigmah/update-conf.sh
 [ ! -z ${STOP_POSTGRES} ] && service postgres stop
 
 # Register application
-vmmgr register-app sigmah "${SIGMAH_ADMIN_EMAIL}" "${SIGMAH_ADMIN_PWD}"
+vmmgr register-app sigmah sigmah "${SIGMAH_ADMIN_EMAIL}" "${SIGMAH_ADMIN_PWD}"
diff --git a/ushahidi/install.sh b/ushahidi/install.sh
index df8ba89..21a6f9b 100755
--- a/ushahidi/install.sh
+++ b/ushahidi/install.sh
@@ -39,4 +39,4 @@ cp srv/ushahidi/update-conf.sh /srv/ushahidi/update-conf.sh
 [ ! -z ${STOP_MARIADB} ] && service mariadb stop
 
 # Register application
-vmmgr register-app ushahidi "${USHAHIDI_ADMIN_USER}" "${USHAHIDI_ADMIN_PWD}"
+vmmgr register-app ushahidi ush "${USHAHIDI_ADMIN_USER}" "${USHAHIDI_ADMIN_PWD}"