From cb2a3d65d873c1a449dd3c08d3570db732f54ade Mon Sep 17 00:00:00 2001 From: Disassembler Date: Sun, 28 Oct 2018 13:29:01 +0100 Subject: [PATCH] Fix Sahana install scripts --- activemq/uninstall.sh | 2 +- ckan-datapusher/uninstall.sh | 2 +- ckan/uninstall.sh | 2 +- crisiscleanup/uninstall.sh | 2 +- cts/uninstall.sh | 2 +- frontlinesms/uninstall.sh | 2 +- gnuhealth/uninstall.sh | 2 +- kanboard/uninstall.sh | 2 +- mariadb/uninstall.sh | 2 +- mifosx/uninstall.sh | 2 +- motech/uninstall.sh | 2 +- opendatakit-build/uninstall.sh | 2 +- opendatakit/uninstall.sh | 2 +- openmapkit/uninstall.sh | 2 +- pandora/uninstall.sh | 2 +- postgres/uninstall.sh | 2 +- rabbitmq/uninstall.sh | 2 +- redis/uninstall.sh | 2 +- sahana-demo/install.sh | 11 ++++++----- sahana-demo/uninstall.sh | 2 +- sahana/install.sh | 2 +- sahana/uninstall.sh | 2 +- sambro/install.sh | 11 ++++++----- sambro/uninstall.sh | 2 +- seeddms/uninstall.sh | 2 +- sigmah/uninstall.sh | 2 +- solr/uninstall.sh | 2 +- ushahidi/uninstall.sh | 2 +- 28 files changed, 38 insertions(+), 36 deletions(-) diff --git a/activemq/uninstall.sh b/activemq/uninstall.sh index 56006d1..20d6d9e 100755 --- a/activemq/uninstall.sh +++ b/activemq/uninstall.sh @@ -2,5 +2,5 @@ set -e # Remove service -rm /etc/init.d/activemq +rm -f /etc/init.d/activemq rc-update -u diff --git a/ckan-datapusher/uninstall.sh b/ckan-datapusher/uninstall.sh index 2e93aac..5dbeb15 100755 --- a/ckan-datapusher/uninstall.sh +++ b/ckan-datapusher/uninstall.sh @@ -2,5 +2,5 @@ set -e # Remove service -rm /etc/init.d/ckan-datapusher +rm -f /etc/init.d/ckan-datapusher rc-update -u diff --git a/ckan/uninstall.sh b/ckan/uninstall.sh index 903ecb5..977e3f7 100755 --- a/ckan/uninstall.sh +++ b/ckan/uninstall.sh @@ -6,7 +6,7 @@ rm /etc/periodic/hourly/ckan # Remove service rc-update del ckan || true -rm /etc/init.d/ckan +rm -f /etc/init.d/ckan rc-update -u # Drop database and user diff --git a/crisiscleanup/uninstall.sh b/crisiscleanup/uninstall.sh index 123a0e0..838fea9 100755 --- a/crisiscleanup/uninstall.sh +++ b/crisiscleanup/uninstall.sh @@ -3,7 +3,7 @@ set -e # Remove service rc-update del crisiscleanup || true -rm /etc/init.d/crisiscleanup +rm -f /etc/init.d/crisiscleanup rc-update -u # Drop database and user diff --git a/cts/uninstall.sh b/cts/uninstall.sh index 07f5954..1aff17d 100755 --- a/cts/uninstall.sh +++ b/cts/uninstall.sh @@ -3,7 +3,7 @@ set -e # Remove service rc-update del cts || true -rm /etc/init.d/cts +rm -f /etc/init.d/cts rc-update -u # Drop database and user diff --git a/frontlinesms/uninstall.sh b/frontlinesms/uninstall.sh index 3c565bb..812874b 100755 --- a/frontlinesms/uninstall.sh +++ b/frontlinesms/uninstall.sh @@ -3,5 +3,5 @@ set -e # Remove service rc-update del frontlinesms || true -rm /etc/init.d/frontlinesms +rm -f /etc/init.d/frontlinesms rc-update -u diff --git a/gnuhealth/uninstall.sh b/gnuhealth/uninstall.sh index 4532ede..dda1679 100755 --- a/gnuhealth/uninstall.sh +++ b/gnuhealth/uninstall.sh @@ -3,7 +3,7 @@ set -e # Remove service rc-update del gnuhealth || true -rm /etc/init.d/gnuhealth +rm -f /etc/init.d/gnuhealth rc-update -u # Drop database and user diff --git a/kanboard/uninstall.sh b/kanboard/uninstall.sh index e68764a..5ca1ad9 100755 --- a/kanboard/uninstall.sh +++ b/kanboard/uninstall.sh @@ -6,7 +6,7 @@ rm /etc/periodic/daily/kanboard # Remove service rc-update del kanboard || true -rm /etc/init.d/kanboard +rm -f /etc/init.d/kanboard rc-update -u # Drop database and user diff --git a/mariadb/uninstall.sh b/mariadb/uninstall.sh index 075a1c8..53abe5b 100755 --- a/mariadb/uninstall.sh +++ b/mariadb/uninstall.sh @@ -2,5 +2,5 @@ set -e # Remove service -rm /etc/init.d/mariadb +rm -f /etc/init.d/mariadb rc-update -u diff --git a/mifosx/uninstall.sh b/mifosx/uninstall.sh index 5eff897..ba757a9 100755 --- a/mifosx/uninstall.sh +++ b/mifosx/uninstall.sh @@ -3,7 +3,7 @@ set -e # Remove service rc-update del mifosx || true -rm /etc/init.d/mifosx +rm -f /etc/init.d/mifosx rc-update -u # Drop database and user diff --git a/motech/uninstall.sh b/motech/uninstall.sh index 75cf53c..95ef932 100755 --- a/motech/uninstall.sh +++ b/motech/uninstall.sh @@ -3,7 +3,7 @@ set -e # Remove service rc-update del motech || true -rm /etc/init.d/motech +rm -f /etc/init.d/motech rc-update -u # Drop database and user diff --git a/opendatakit-build/uninstall.sh b/opendatakit-build/uninstall.sh index ae95be9..e469e5c 100755 --- a/opendatakit-build/uninstall.sh +++ b/opendatakit-build/uninstall.sh @@ -3,7 +3,7 @@ set -e # Remove service rc-update del opendatakit-build || true -rm /etc/init.d/opendatakit-build +rm -f /etc/init.d/opendatakit-build rc-update -u # Drop database and user diff --git a/opendatakit/uninstall.sh b/opendatakit/uninstall.sh index 83f1ebb..b733e45 100755 --- a/opendatakit/uninstall.sh +++ b/opendatakit/uninstall.sh @@ -3,7 +3,7 @@ set -e # Remove service rc-update del opendatakit || true -rm /etc/init.d/opendatakit +rm -f /etc/init.d/opendatakit rc-update -u # Drop database and user diff --git a/openmapkit/uninstall.sh b/openmapkit/uninstall.sh index 660d214..03afcbe 100755 --- a/openmapkit/uninstall.sh +++ b/openmapkit/uninstall.sh @@ -3,7 +3,7 @@ set -e # Remove service rc-update del openmapkit || true -rm /etc/init.d/openmapkit +rm -f /etc/init.d/openmapkit rc-update -u # Drop database and user diff --git a/pandora/uninstall.sh b/pandora/uninstall.sh index 0547db1..4bbc6fb 100755 --- a/pandora/uninstall.sh +++ b/pandora/uninstall.sh @@ -3,7 +3,7 @@ set -e # Remove service rc-update del pandora || true -rm /etc/init.d/pandora +rm -f /etc/init.d/pandora rc-update -u # Drop database and user diff --git a/postgres/uninstall.sh b/postgres/uninstall.sh index 1c33fa8..9f89cc1 100755 --- a/postgres/uninstall.sh +++ b/postgres/uninstall.sh @@ -2,5 +2,5 @@ set -e # Remove service -rm /etc/init.d/postgres +rm -f /etc/init.d/postgres rc-update -u diff --git a/rabbitmq/uninstall.sh b/rabbitmq/uninstall.sh index d745352..26cfcf4 100755 --- a/rabbitmq/uninstall.sh +++ b/rabbitmq/uninstall.sh @@ -2,5 +2,5 @@ set -e # Remove service -rm /etc/init.d/rabbitmq +rm -f /etc/init.d/rabbitmq rc-update -u diff --git a/redis/uninstall.sh b/redis/uninstall.sh index b195463..6ce3871 100755 --- a/redis/uninstall.sh +++ b/redis/uninstall.sh @@ -2,5 +2,5 @@ set -e # Remove service -rm /etc/init.d/redis +rm -f /etc/init.d/redis rc-update -u diff --git a/sahana-demo/install.sh b/sahana-demo/install.sh index 9b8559c..ab57f4c 100755 --- a/sahana-demo/install.sh +++ b/sahana-demo/install.sh @@ -14,23 +14,24 @@ envsubst /srv/sahana-demo/conf/000_config.py -envsubst /var/lib/lxc/sahana/sahana/tmp/masterUsers.csv +mkdir -p /var/lib/lxc/sahana-demo/sahana-demo/srv/web2py/applications/eden/modules/templates/default/users +chown -R 8001:8001 /var/lib/lxc/sahana-demo/sahana-demo/srv/web2py +envsubst /var/lib/lxc/sahana-demo/sahana-demo/srv/web2py/applications/eden/modules/templates/default/users/masterUsers.csv vmmgr update-login sahana-demo "${SAHANADEMO_ADMIN_USER}" "${SAHANADEMO_ADMIN_PWD}" # Replace template in LXC container mount definition sed -i "s/default/${TEMPLATE}/g" /var/lib/lxc/sahana-demo/config # Populate database -lxc-execute -u 8001 -g 8001 sahana-demo -- sh -c 'cd /srv/web2py; cp /tmp/masterUsers.csv applications/eden/modules/templates/default/users/masterUsers.csv; ./web2py.py -S eden -M -R applications/eden/static/scripts/tools/noop.py' -rm /var/lib/lxc/sahana/sahana/tmp/masterUsers.csv +lxc-execute -u 8001 -g 8001 sahana-demo -- sh -c 'cd /srv/web2py; ./web2py.py -S eden -M -R applications/eden/static/scripts/tools/noop.py' # Install service envsubst /etc/init.d/sahana-demo diff --git a/sahana-demo/uninstall.sh b/sahana-demo/uninstall.sh index 831fa8f..4246dd0 100755 --- a/sahana-demo/uninstall.sh +++ b/sahana-demo/uninstall.sh @@ -3,7 +3,7 @@ set -e # Remove service rc-update del sahana-demo || true -rm /etc/init.d/sahana-demo +rm -f /etc/init.d/sahana-demo rc-update -u # Drop database and user diff --git a/sahana/install.sh b/sahana/install.sh index 98c0246..4aea277 100755 --- a/sahana/install.sh +++ b/sahana/install.sh @@ -13,7 +13,7 @@ envsubst /srv/sambro/conf/000_config.py -envsubst /var/lib/lxc/sahana/sahana/tmp/masterUsers.csv +mkdir -p /var/lib/lxc/sambro/sambro/srv/web2py/applications/eden/modules/templates/default/users +chown -R 8001:8001 /var/lib/lxc/sambro/sambro/srv/web2py +envsubst /var/lib/lxc/sambro/sambro/srv/web2py/applications/eden/modules/templates/default/users/masterUsers.csv cp srv/sambro/conf/00_settings.py /srv/sambro/conf/00_settings.py cp srv/sambro/data/SAMBRO/config.py /srv/sambro/data/SAMBRO/config.py vmmgr update-login sambro "${SAMBRO_ADMIN_USER}" "${SAMBRO_ADMIN_PWD}" # Populate database -lxc-execute -u 8001 -g 8001 sambro -- sh -c 'cd /srv/web2py; cp /tmp/masterUsers.csv applications/eden/modules/templates/default/users/masterUsers.csv; ./web2py.py -S eden -M -R applications/eden/static/scripts/tools/noop.py' -rm /var/lib/lxc/sahana/sahana/tmp/masterUsers.csv +lxc-execute -u 8001 -g 8001 sambro -- sh -c 'cd /srv/web2py; ./web2py.py -S eden -M -R applications/eden/static/scripts/tools/noop.py' # Set "production values" (increases performance) only if the DEBUG environment variable is not set if [ ${DEBUG:-0} -eq 0 ]; then diff --git a/sambro/uninstall.sh b/sambro/uninstall.sh index 7f38b10..9dd17e7 100755 --- a/sambro/uninstall.sh +++ b/sambro/uninstall.sh @@ -3,7 +3,7 @@ set -e # Remove service rc-update del sambro || true -rm /etc/init.d/sambro +rm -f /etc/init.d/sambro rc-update -u # Drop database and user diff --git a/seeddms/uninstall.sh b/seeddms/uninstall.sh index 2f95e2a..b55432d 100755 --- a/seeddms/uninstall.sh +++ b/seeddms/uninstall.sh @@ -6,7 +6,7 @@ set -e # Remove service rc-update del seeddms || true -rm /etc/init.d/seeddms +rm -f /etc/init.d/seeddms rc-update -u # Drop database and user diff --git a/sigmah/uninstall.sh b/sigmah/uninstall.sh index a38a9d7..be629a7 100755 --- a/sigmah/uninstall.sh +++ b/sigmah/uninstall.sh @@ -3,7 +3,7 @@ set -e # Remove service rc-update del sigmah || true -rm /etc/init.d/sigmah +rm -f /etc/init.d/sigmah rc-update -u # Drop database and user diff --git a/solr/uninstall.sh b/solr/uninstall.sh index 84a4a3f..4014fc0 100755 --- a/solr/uninstall.sh +++ b/solr/uninstall.sh @@ -2,5 +2,5 @@ set -e # Remove service -rm /etc/init.d/solr +rm -f /etc/init.d/solr rc-update -u diff --git a/ushahidi/uninstall.sh b/ushahidi/uninstall.sh index 8c37e70..4b2ae51 100755 --- a/ushahidi/uninstall.sh +++ b/ushahidi/uninstall.sh @@ -6,7 +6,7 @@ rm /etc/periodic/15min/ushahidi # Remove service rc-update del ushahidi || true -rm /etc/init.d/ushahidi +rm -f /etc/init.d/ushahidi rc-update -u # Drop database and user