From 7dcefebe45bf8007690f89117abb557a395277cc Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Thu, 17 Sep 2015 02:24:14 +0000
Subject: [PATCH] modified deployment script to create ldap password file for
the dm unix account
---
sbin/dm_deploy_ds_web_service.sh | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/sbin/dm_deploy_ds_web_service.sh b/sbin/dm_deploy_ds_web_service.sh
index 8662eb65..0c084fb1 100755
--- a/sbin/dm_deploy_ds_web_service.sh
+++ b/sbin/dm_deploy_ds_web_service.sh
@@ -40,6 +40,7 @@ fi
DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
DM_DATE=`date +%Y.%m.%d`
DM_HOSTNAME=`hostname -f`
+DM_SYSTEM_UNIX_ACCOUNT=`whoami`
DM_CONTEXT_ROOT=${DM_CONTEXT_ROOT:=dm}
DM_INSTALL_DIR=${DM_INSTALL_DIR:=$DM_ROOT_DIR/..}
@@ -56,12 +57,12 @@ DM_WEB_SERVICE_LOG_FILE=${DM_LOG_DIR}/$DM_DB_NAME.$DM_WEB_SERVICE_DAEMON.log
DM_WEB_SERVICE_INIT_CMD=${DM_ROOT_DIR}/etc/init.d/dm-$DM_WEB_SERVICE_DAEMON
DM_DB_PASSWORD_FILE=${DM_ETC_DIR}/${DM_DB_NAME}.db.passwd
DM_SYSTEM_PASSWORD_FILE=${DM_INSTALL_DIR}/etc/${DM_SYSTEM_USER}.system.passwd
+DM_SYSTEM_UNIX_PASSWORD_FILE=${DM_INSTALL_DIR}/etc/${DM_SYSTEM_UNIX_ACCOUNT}.ldap.passwd
DM_USER_SETUP_FILE=${DM_ETC_DIR}/${DM_DB_NAME}.setup.sh
cmd="echo $DM_DS_WEB_SERVICE_HOST | sed 's?DM_HOSTNAME?$DM_HOSTNAME?'"
DM_WEB_SERVICE_HOST=`eval $cmd`
DM_WEB_SERVICE_PORT=$DM_DS_WEB_SERVICE_PORT
-DM_SYSTEM_UNIX_ACCOUNT=`whoami`
echo "DM web service host: $DM_WEB_SERVICE_HOST"
echo "DM install directory: $DM_INSTALL_DIR"
@@ -125,6 +126,7 @@ if [ ! -f $DM_WEB_SERVICE_CONFIG_FILE ]; then
| sed 's?DM_INSTALL_DIR?$DM_INSTALL_DIR?g' \
| sed 's?DM_HOSTNAME?$DM_HOSTNAME?g' \
| sed 's?DM_DB_NAME?$DM_DB_NAME?g' \
+ | sed 's?DM_SYSTEM_UNIX_ACCOUNT?$DM_SYSTEM_UNIX_ACCOUNT?g' \
> $DM_WEB_SERVICE_CONFIG_FILE"
eval $cmd || exit 1
else
@@ -135,7 +137,7 @@ fi
if [ ! -f "$DM_SYSTEM_PASSWORD_FILE" ]; then
sttyOrig=`stty -g`
stty -echo
- read -p "Enter system password for the $DM_SYSTEM_USER user: " DM_SYSTEM_PASSWORD
+ read -p "Enter system (database) password for the $DM_SYSTEM_USER user: " DM_SYSTEM_PASSWORD
echo
stty $sttyOrig
echo $DM_SYSTEM_PASSWORD > $DM_SYSTEM_PASSWORD_FILE
@@ -147,6 +149,17 @@ if [ ! -f "$DM_SYSTEM_PASSWORD_FILE" ]; then
dm-add-user-system-role --username=$DM_SYSTEM_USER --role-name=Administrator || exit 1
fi
+# Get unix account password
+if [ ! -f "$DM_SYSTEM_UNIX_PASSWORD_FILE" ]; then
+ sttyOrig=`stty -g`
+ stty -echo
+ read -p "Enter UNIX (LDAP) password for the $DM_SYSTEM_UNIX_ACCOUNT user: " DM_SYSTEM_UNIX_PASSWORD
+ echo
+ stty $sttyOrig
+ echo $DM_SYSTEM_UNIX_PASSWORD > $DM_SYSTEM_UNIX_PASSWORD_FILE
+ chmod 600 $DM_SYSTEM_UNIX_PASSWORD_FILE
+fi
+
# Modify version
echo "Modifying python module version"
versionFile=$DM_ROOT_DIR/src/python/dm/__init__.py
--
GitLab