From d74dfb27d295888dfb571d309da1ea3235b5599b Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Tue, 28 Nov 2017 11:16:28 +0100
Subject: [PATCH] Fix CrisisCleanup user in Portal and add install script to
 00-install.sh

---
 00-install.sh       | 1 +
 70-crisiscleanup.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/00-install.sh b/00-install.sh
index 6d1e2f7..12f5dd2 100755
--- a/00-install.sh
+++ b/00-install.sh
@@ -13,6 +13,7 @@ ${SOURCE_DIR}/20-ushahidi.sh
 ${SOURCE_DIR}/30-ckan.sh
 ${SOURCE_DIR}/50-pandora.sh
 ${SOURCE_DIR}/60-kanboard.sh
+${SOURCE_DIR}/70-crisiscleanup.sh
 
 # Perform cleanup only if DEBUG environment variable is not set
 if [ ${DEBUG:-0} -eq 0 ]; then
diff --git a/70-crisiscleanup.sh b/70-crisiscleanup.sh
index d2ec087..06d1e20 100755
--- a/70-crisiscleanup.sh
+++ b/70-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_USER}" "${CRISISCLEANUP_ADMIN_PWD}"
+${SOURCE_DIR}/basic/portal-app-manager.py 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