From 866a758e727b6962d59bcc7e10769205a1091a8e Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Mon, 24 Aug 2015 20:41:45 +0000
Subject: [PATCH] changed dm_deploy_daq_web_service.sh to integrate with
different host than storage service, changed the deploy/undeploy files not to
override DM_DATA_DIR, removed creating data dir from dm_install_support.sh
---
sbin/dm_deploy_cat_web_service.sh | 1 -
sbin/dm_deploy_daq_web_service.sh | 29 ++++++++++++++++++-----------
sbin/dm_deploy_ds_web_service.sh | 1 -
sbin/dm_install_support.sh | 10 +++++-----
sbin/dm_undeploy_cat_web_service.sh | 1 -
sbin/dm_undeploy_daq_web_service.sh | 1 -
sbin/dm_undeploy_ds_web_service.sh | 1 -
7 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/sbin/dm_deploy_cat_web_service.sh b/sbin/dm_deploy_cat_web_service.sh
index 755573ca..58d4d7d5 100755
--- a/sbin/dm_deploy_cat_web_service.sh
+++ b/sbin/dm_deploy_cat_web_service.sh
@@ -42,7 +42,6 @@ DM_DATE=`date +%Y.%m.%d`
DM_HOSTNAME=`hostname -f`
DM_CONTEXT_ROOT=${DM_CONTEXT_ROOT:=dm}
-DM_DATA_DIR=${DM_DATA_DIR:=/dm}
DM_INSTALL_DIR=${DM_INSTALL_DIR:=$DM_ROOT_DIR/..}
DM_ETC_DIR=${DM_INSTALL_DIR}/etc
DM_SSL_DIR=${DM_ETC_DIR}/ssl
diff --git a/sbin/dm_deploy_daq_web_service.sh b/sbin/dm_deploy_daq_web_service.sh
index 0373f4fc..c4421aba 100755
--- a/sbin/dm_deploy_daq_web_service.sh
+++ b/sbin/dm_deploy_daq_web_service.sh
@@ -42,7 +42,6 @@ DM_DATE=`date +%Y.%m.%d`
DM_HOSTNAME=`hostname -f`
DM_CONTEXT_ROOT=${DM_CONTEXT_ROOT:=dm}
-DM_DATA_DIR=${DM_DATA_DIR:=/dm}
DM_INSTALL_DIR=${DM_INSTALL_DIR:=$DM_ROOT_DIR/..}
DM_ETC_DIR=${DM_INSTALL_DIR}/etc
DM_SSL_DIR=${DM_ETC_DIR}/ssl
@@ -55,7 +54,7 @@ DM_WEB_SERVICE_KEY_FILE=${DM_SSL_DIR}/$DM_DB_NAME.$DM_WEB_SERVICE_DAEMON.key
DM_WEB_SERVICE_CONFIG_FILE=${DM_ETC_DIR}/$DM_DB_NAME.$DM_WEB_SERVICE_DAEMON.conf
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_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_USER_SETUP_FILE=${DM_ETC_DIR}/${DM_DB_NAME}.setup.sh
@@ -67,6 +66,10 @@ if [ -z "$DM_DS_WEB_SERVICE_HOST" -o "$DM_DS_WEB_SERVICE_HOST" = "DM_HOSTNAME" ]
read -p "Enter DM DS Web Service Host: " DM_DS_WEB_SERVICE_HOST
fi
+read -p "Enter DM DS Service Host root directory: " host_install
+DM_DS_SERVICE_HOST_INSTALL_DIR=$host_install
+echo $DM_DS_SERVICE_HOST_INSTALL_DIR
+
echo "DM DAQ web service host: $DM_DAQ_WEB_SERVICE_HOST"
echo "DM DS web service host: $DM_DS_WEB_SERVICE_HOST"
echo "DM install directory: $DM_INSTALL_DIR"
@@ -82,20 +85,21 @@ $DM_WEB_SERVICE_INIT_CMD stop $DM_DB_NAME
echo "Checking CA certificate"
if [ ! -f $DM_CA_CERT_FILE ]; then
echo "Copying DM CA cert"
- rsync -ar $DM_DS_WEB_SERVICE_HOST:$DM_CA_CERT_FILE $DM_SSL_DIR
-else
+ echo $DM_SSL_DIR
+ rsync $DM_DS_WEB_SERVICE_HOST:$DM_DS_SERVICE_HOST_INSTALL_DIR/etc/ssl/dm-ca-cert.pem $DM_SSL_DIR/
+ else
echo "DM CA certificate exists"
fi
-
+exit 0
echo "Checking service certificates"
if [ ! -f $DM_WEB_SERVICE_CERT_FILE -o ! -f $DM_WEB_SERVICE_KEY_FILE ]; then
if [ ! -f $DM_CA_DIR/certs/$DM_WEB_SERVICE_HOST.crt ]; then
echo "Attempting to create DM $DM_WEB_SERVICE_DAEMON certificate"
- ssh $DM_DS_WEB_SERVICE_HOST "$MY_DIR/dm_create_server_cert.sh $DM_WEB_SERVICE_HOST $DM_WEB_SERVICE_HOST dm@aps.anl.gov"
- fi
+ ssh $DM_DS_WEB_SERVICE_HOST "$DM_DS_SERVICE_HOST_INSTALL_DIR/dm/sbin/dm_create_server_cert.sh $DM_WEB_SERVICE_HOST $DM_WEB_SERVICE_HOST dm@aps.anl.gov"
+ fi
echo "Copying DM $DM_WEB_SERVICE_DAEMON certificate"
- rsync -ar $DM_DS_WEB_SERVICE_HOST:$DM_CA_DIR/certs/$DM_WEB_SERVICE_HOST.crt $DM_WEB_SERVICE_CERT_FILE || exit 1
- rsync -ar $DM_DS_WEB_SERVICE_HOST:$DM_CA_DIR/certs/$DM_WEB_SERVICE_HOST.key $DM_WEB_SERVICE_KEY_FILE || exit 1
+ rsync -ar $DM_DS_WEB_SERVICE_HOST:$DM_DS_SERVICE_HOST_INSTALL_DIR/etc/CA/certs/$DM_WEB_SERVICE_HOST.crt $DM_WEB_SERVICE_CERT_FILE || exit 1
+ rsync -ar $DM_DS_WEB_SERVICE_HOST:$DM_DS_SERVICE_HOST_INSTALL_DIR/etc/CA/certs/$DM_WEB_SERVICE_HOST.key $DM_WEB_SERVICE_KEY_FILE || exit 1
else
echo "DM service certificate exists"
fi
@@ -134,13 +138,15 @@ eval $cmd
# Check system account password
if [ ! -f $DM_SYSTEM_PASSWORD_FILE ]; then
echo "Copying system account password file $DM_SYSTEM_PASSWORD_FILE"
- rsync -ar $DM_DS_WEB_SERVICE_HOST:$DM_SYSTEM_PASSWORD_FILE $DM_SYSTEM_PASSWORD_FILE || exit 1
+ rsync -ar
+ $DM_DS_WEB_SERVICE_HOST:$DM_DS_SERVICE_HOST_INSTALL_DIR/etc/${DM_SYSTEM_USER}.system.passwd $DM_SYSTEM_PASSWORD_FILE || exit 1
fi
# Prepare setup file
if [ ! -f $DM_USER_SETUP_FILE ]; then
echo "Copying user setup file $DM_USER_SETUP_FILE"
- rsync -ar $DM_DS_WEB_SERVICE_HOST:$DM_USER_SETUP_FILE $DM_USER_SETUP_FILE || exit 1
+ rsync -ar
+ $DM_DS_WEB_SERVICE_HOST:$DM_DS_SERVICE_HOST_INSTALL_DIR/${DM_ETC_DIR}/${DM_DB_NAME}.setup.sh $DM_USER_SETUP_FILE || exit 1
fi
# Prepare setup file
@@ -158,3 +164,4 @@ $DM_WEB_SERVICE_INIT_CMD start $DM_DB_NAME
echo "Done deploying $DM_WEB_SERVICE_DAEMON for $DM_DB_NAME"
+
diff --git a/sbin/dm_deploy_ds_web_service.sh b/sbin/dm_deploy_ds_web_service.sh
index 6c7b4ad2..47c2676f 100755
--- a/sbin/dm_deploy_ds_web_service.sh
+++ b/sbin/dm_deploy_ds_web_service.sh
@@ -42,7 +42,6 @@ DM_DATE=`date +%Y.%m.%d`
DM_HOSTNAME=`hostname -f`
DM_CONTEXT_ROOT=${DM_CONTEXT_ROOT:=dm}
-DM_DATA_DIR=${DM_DATA_DIR:=/dm}
DM_INSTALL_DIR=${DM_INSTALL_DIR:=$DM_ROOT_DIR/..}
DM_ETC_DIR=${DM_INSTALL_DIR}/etc
DM_SSL_DIR=${DM_ETC_DIR}/ssl
diff --git a/sbin/dm_install_support.sh b/sbin/dm_install_support.sh
index b1c81194..c8b72004 100755
--- a/sbin/dm_install_support.sh
+++ b/sbin/dm_install_support.sh
@@ -22,7 +22,7 @@ if [ -z "${DM_ROOT_DIR}" ]; then
DM_ROOT_DIR=$MY_DIR/..
fi
DM_SUPPORT_DIR=$DM_ROOT_DIR/../support
-DM_DATA_DIR=$DM_ROOT_DIR/../data
+#DM_DATA_DIR=$DM_ROOT_DIR/../data
execute() {
echo "Executing: $@"
@@ -39,10 +39,10 @@ execute svn update
execute $DM_SUPPORT_DIR/bin/clean_support_all.sh
execute $DM_SUPPORT_DIR/bin/install_support_${supportType}.sh
-if [ ! -d $DM_DATA_DIR ]; then
- echo "Creating data directory"
- mkdir -p "$DM_DATA_DIR"
-fi
+#if [ ! -d $DM_DATA_DIR ]; then
+# echo "Creating data directory"
+# mkdir -p "$DM_DATA_DIR"
+#fi
diff --git a/sbin/dm_undeploy_cat_web_service.sh b/sbin/dm_undeploy_cat_web_service.sh
index 3a56299d..0f786d14 100755
--- a/sbin/dm_undeploy_cat_web_service.sh
+++ b/sbin/dm_undeploy_cat_web_service.sh
@@ -39,7 +39,6 @@ fi
DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
DM_CONTEXT_ROOT=${DM_CONTEXT_ROOT:=dm}
-DM_DATA_DIR=${DM_DATA_DIR:=/dm}
DM_INSTALL_DIR=${DM_INSTALL_DIR:=$DM_ROOT_DIR/..}
DM_ETC_DIR=${DM_INSTALL_DIR}/etc
DM_SSL_DIR=${DM_ETC_DIR}/ssl
diff --git a/sbin/dm_undeploy_daq_web_service.sh b/sbin/dm_undeploy_daq_web_service.sh
index 0bcdeb3a..bc0fdc49 100755
--- a/sbin/dm_undeploy_daq_web_service.sh
+++ b/sbin/dm_undeploy_daq_web_service.sh
@@ -39,7 +39,6 @@ fi
DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
DM_CONTEXT_ROOT=${DM_CONTEXT_ROOT:=dm}
-DM_DATA_DIR=${DM_DATA_DIR:=/dm}
DM_INSTALL_DIR=${DM_INSTALL_DIR:=$DM_ROOT_DIR/..}
DM_ETC_DIR=${DM_INSTALL_DIR}/etc
DM_SSL_DIR=${DM_ETC_DIR}/ssl
diff --git a/sbin/dm_undeploy_ds_web_service.sh b/sbin/dm_undeploy_ds_web_service.sh
index 1488a045..562b098f 100755
--- a/sbin/dm_undeploy_ds_web_service.sh
+++ b/sbin/dm_undeploy_ds_web_service.sh
@@ -39,7 +39,6 @@ fi
DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
DM_CONTEXT_ROOT=${DM_CONTEXT_ROOT:=dm}
-DM_DATA_DIR=${DM_DATA_DIR:=/dm}
DM_INSTALL_DIR=${DM_INSTALL_DIR:=$DM_ROOT_DIR/..}
DM_ETC_DIR=${DM_INSTALL_DIR}/etc
DM_SSL_DIR=${DM_ETC_DIR}/ssl
--
GitLab