From b005ff3aec16e23578553bcd0f0c5dfeba95db91 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Mon, 4 Dec 2017 17:38:48 +0100 Subject: [PATCH] Install portal-app-manager locally and reflect its usage --- 01-basic.sh | 1 + .../local/bin/portal-app-manager} | 0 ckan.sh | 2 +- crisiscleanup.sh | 2 +- cts.sh | 2 +- gnuhealth.sh | 4 ++-- kanboard.sh | 4 ++-- pandora.sh | 2 +- sahana.sh | 2 +- sambro.sh | 4 ++-- seeddms.sh | 2 +- ushahidi.sh | 4 ++-- 12 files changed, 15 insertions(+), 14 deletions(-) rename basic/{portal-app-manager.py => usr/local/bin/portal-app-manager} (100%) diff --git a/01-basic.sh b/01-basic.sh index 250ab75..5b7fd76 100755 --- a/01-basic.sh +++ b/01-basic.sh @@ -99,6 +99,7 @@ cp ${SOURCE_DIR}/basic/etc/nginx/sites-available/default /etc/nginx/sites-availa sed -i 's|QUIT/30|QUIT/5|' /usr/share/uwsgi/init/specific_daemon # Copy Portal resources +cp -r ${SOURCE_DIR}/basic/usr/local/bin/portal-app-manager /usr/local/bin/portal-app-manager cp -r ${SOURCE_DIR}/basic/srv/portal /srv/portal chown -R www-data:www-data /srv/portal diff --git a/basic/portal-app-manager.py b/basic/usr/local/bin/portal-app-manager similarity index 100% rename from basic/portal-app-manager.py rename to basic/usr/local/bin/portal-app-manager diff --git a/ckan.sh b/ckan.sh index e8847f0..c8cfe6c 100755 --- a/ckan.sh +++ b/ckan.sh @@ -117,4 +117,4 @@ cp ${SOURCE_DIR}/ckan/srv/ckan/cron-pageviews.sh /srv/ckan/cron-pageviews.sh cp ${SOURCE_DIR}/ckan/etc/cron.d/ckan /etc/cron.d/ckan # Add portal application definition -${SOURCE_DIR}/basic/portal-app-manager.py ckan "https://{host}:8003/" "${CKAN_ADMIN_USER}" "${CKAN_ADMIN_PWD}" +portal-app-manager ckan "https://{host}:8003/" "${CKAN_ADMIN_USER}" "${CKAN_ADMIN_PWD}" diff --git a/crisiscleanup.sh b/crisiscleanup.sh index 959215b..2e439f2 100755 --- a/crisiscleanup.sh +++ b/crisiscleanup.sh @@ -66,7 +66,7 @@ systemctl start crisiscleanup systemctl restart nginx # Add portal application definition -${SOURCE_DIR}/basic/portal-app-manager.py crisis-cleanup "https://{host}:8005/" "${CRISISCLEANUP_ADMIN_EMAIL}" "${CRISISCLEANUP_ADMIN_PWD}" +portal-app-manager crisis-cleanup "https://{host}:8005/" "${CRISISCLEANUP_ADMIN_EMAIL}" "${CRISISCLEANUP_ADMIN_PWD}" # Uninstall CrisisCleanup compilation dependecies apt-get -y purge libpq-dev ruby-dev zlib1g-dev diff --git a/cts.sh b/cts.sh index 9a9867d..908b6d7 100755 --- a/cts.sh +++ b/cts.sh @@ -62,4 +62,4 @@ systemctl restart uwsgi systemctl restart nginx # Add portal application definition -${SOURCE_DIR}/basic/portal-app-manager.py cts "https://{host}:8004/" "${CTS_ADMIN_EMAIL}" "${CTS_ADMIN_PWD}" +portal-app-manager cts "https://{host}:8004/" "${CTS_ADMIN_EMAIL}" "${CTS_ADMIN_PWD}" diff --git a/gnuhealth.sh b/gnuhealth.sh index 3a3e525..2d50d55 100755 --- a/gnuhealth.sh +++ b/gnuhealth.sh @@ -76,5 +76,5 @@ ln -s /etc/nginx/sites-available/gnuhealth /etc/nginx/sites-enabled/gnuhealth systemctl restart nginx # Add portal application definition -${SOURCE_DIR}/basic/portal-app-manager.py gnuhealth "https://{host}:8006/index.html" admin "${GNUHEALTH_ADMIN_PWD}" -${SOURCE_DIR}/basic/portal-app-manager.py gnuhealth-clients -p clienturl "{host}:8006" +portal-app-manager gnuhealth "https://{host}:8006/index.html" admin "${GNUHEALTH_ADMIN_PWD}" +portal-app-manager gnuhealth-clients -p clienturl "{host}:8006" diff --git a/kanboard.sh b/kanboard.sh index ed8e843..024c86d 100755 --- a/kanboard.sh +++ b/kanboard.sh @@ -60,5 +60,5 @@ systemctl restart nginx cp ${SOURCE_DIR}/kanboard/etc/cron.d/kanboard /etc/cron.d/kanboard # Add portal application definition -${SOURCE_DIR}/basic/portal-app-manager.py kanboard "/kanboard/" "${KANBOARD_ADMIN_USER}" "${KANBOARD_ADMIN_PWD}" -${SOURCE_DIR}/basic/portal-app-manager.py kanboard-mobile +portal-app-manager kanboard "/kanboard/" "${KANBOARD_ADMIN_USER}" "${KANBOARD_ADMIN_PWD}" +portal-app-manager kanboard-mobile diff --git a/pandora.sh b/pandora.sh index 3754e85..9d2ed59 100755 --- a/pandora.sh +++ b/pandora.sh @@ -77,4 +77,4 @@ ln -s /etc/nginx/sites-available/pandora /etc/nginx/sites-enabled/pandora systemctl restart nginx # Add portal application definition -${SOURCE_DIR}/basic/portal-app-manager.py pandora "https://{host}:8001/" "${PANDORA_ADMIN_USER}" "${PANDORA_ADMIN_PWD}" +portal-app-manager pandora "https://{host}:8001/" "${PANDORA_ADMIN_USER}" "${PANDORA_ADMIN_PWD}" diff --git a/sahana.sh b/sahana.sh index c587454..fe5f187 100755 --- a/sahana.sh +++ b/sahana.sh @@ -78,7 +78,7 @@ systemctl restart uwsgi systemctl restart nginx # Add portal application definition -${SOURCE_DIR}/basic/portal-app-manager.py sahana-eden "/eden/" "${SAHANA_ADMIN_USER}" "${SAHANA_ADMIN_PWD}" +portal-app-manager sahana-eden "/eden/" "${SAHANA_ADMIN_USER}" "${SAHANA_ADMIN_PWD}" # TODO: Does matplotlib still require MPLCONFIGDIR directory? # If so, /srv/sahana/wsgihandler.py needs to be modified diff --git a/sambro.sh b/sambro.sh index efabc80..5e88d63 100755 --- a/sambro.sh +++ b/sambro.sh @@ -78,8 +78,8 @@ systemctl restart uwsgi systemctl restart nginx # Add portal application definition -${SOURCE_DIR}/basic/portal-app-manager.py sambro "https://{host}:8099/eden/" "${SAMBRO_ADMIN_USER}" "${SAMBRO_ADMIN_PWD}" -${SOURCE_DIR}/basic/portal-app-manager.py sambro-mobile +portal-app-manager sambro "https://{host}:8099/eden/" "${SAMBRO_ADMIN_USER}" "${SAMBRO_ADMIN_PWD}" +portal-app-manager sambro-mobile # TODO: Does matplotlib still require MPLCONFIGDIR directory? # If so, /srv/sambro/wsgihandler.py needs to be modified diff --git a/seeddms.sh b/seeddms.sh index b4b6a10..77efd9c 100755 --- a/seeddms.sh +++ b/seeddms.sh @@ -50,4 +50,4 @@ systemctl restart nginx cp ${SOURCE_DIR}/seeddms/etc/cron.d/seeddms /etc/cron.d/seeddms # Add portal application definition -${SOURCE_DIR}/basic/portal-app-manager.py seeddms "/seeddms/" "${SEEDDMS_ADMIN_USER}" "${SEEDDMS_ADMIN_PWD}" +portal-app-manager seeddms "/seeddms/" "${SEEDDMS_ADMIN_USER}" "${SEEDDMS_ADMIN_PWD}" diff --git a/ushahidi.sh b/ushahidi.sh index 101c6a2..5338db8 100755 --- a/ushahidi.sh +++ b/ushahidi.sh @@ -49,5 +49,5 @@ systemctl restart nginx cp ${SOURCE_DIR}/ushahidi/etc/cron.d/ushahidi /etc/cron.d/ushahidi # Add portal application definition -${SOURCE_DIR}/basic/portal-app-manager.py ushahidi "https://{host}:8002/" "${USHAHIDI_ADMIN_USER}" "${USHAHIDI_ADMIN_PWD}" -${SOURCE_DIR}/basic/portal-app-manager.py ushahidi-mobile +portal-app-manager ushahidi "https://{host}:8002/" "${USHAHIDI_ADMIN_USER}" "${USHAHIDI_ADMIN_PWD}" +portal-app-manager ushahidi-mobile