From 649c6df0f2558749690c7377cf20859d502160bc Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Tue, 7 Jul 2015 18:38:39 +0000
Subject: [PATCH] fixing various issues with cat service deployment
---
etc/setup.sh.template | 2 ++
sbin/dm_deploy_cat_web_service.sh | 8 ++++++--
sbin/dm_deploy_daq_web_service.sh | 4 ++--
sbin/dm_deploy_ds_web_service.sh | 6 ++++--
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/etc/setup.sh.template b/etc/setup.sh.template
index 8da0421d..9856c8ca 100644
--- a/etc/setup.sh.template
+++ b/etc/setup.sh.template
@@ -6,6 +6,8 @@ export DM_DS_WEB_SERVICE_HOST=
export DM_DS_WEB_SERVICE_PORT=
export DM_DAQ_WEB_SERVICE_HOST=
export DM_DAQ_WEB_SERVICE_PORT=
+export DM_CAT_WEB_SERVICE_HOST=
+export DM_CAT_WEB_SERVICE_PORT=
setupFile=$DM_ROOT_DIR/setup.sh
if [ ! -f $setupFile ]; then
diff --git a/sbin/dm_deploy_cat_web_service.sh b/sbin/dm_deploy_cat_web_service.sh
index 9cc3037f..755573ca 100755
--- a/sbin/dm_deploy_cat_web_service.sh
+++ b/sbin/dm_deploy_cat_web_service.sh
@@ -58,6 +58,7 @@ 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_USER_SETUP_FILE=${DM_ETC_DIR}/${DM_DB_NAME}.setup.sh
+DM_MONGODB_SERVICE_INIT_CMD=${DM_ROOT_DIR}/etc/init.d/dm-mongodb
cmd="echo $DM_CAT_WEB_SERVICE_HOST | sed 's?DM_HOSTNAME?$DM_HOSTNAME?'"
DM_WEB_SERVICE_HOST=`eval $cmd`
@@ -89,7 +90,7 @@ fi
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_SERVICE_HOST.crt ]; 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
@@ -153,7 +154,10 @@ cmd="cat $DM_USER_SETUP_FILE \
> $DM_USER_SETUP_FILE.2 && mv $DM_USER_SETUP_FILE.2 $DM_USER_SETUP_FILE"
eval $cmd || exit 1
-echo "Starting web service for $DM_DB_NAME"
+echo "Starting mongodb service"
+$DM_MONGODB_SERVICE_INIT_CMD restart
+
+echo "Starting cat web service for $DM_DB_NAME"
$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_daq_web_service.sh b/sbin/dm_deploy_daq_web_service.sh
index 053c8635..0373f4fc 100755
--- a/sbin/dm_deploy_daq_web_service.sh
+++ b/sbin/dm_deploy_daq_web_service.sh
@@ -89,7 +89,7 @@ fi
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_SERVICE_HOST.crt ]; 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
@@ -153,7 +153,7 @@ cmd="cat $DM_USER_SETUP_FILE \
> $DM_USER_SETUP_FILE.2 && mv $DM_USER_SETUP_FILE.2 $DM_USER_SETUP_FILE"
eval $cmd || exit 1
-echo "Starting web service for $DM_DB_NAME"
+echo "Starting daq web service for $DM_DB_NAME"
$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 fc9f86c5..fb08ef1e 100755
--- a/sbin/dm_deploy_ds_web_service.sh
+++ b/sbin/dm_deploy_ds_web_service.sh
@@ -91,7 +91,7 @@ fi
echo "Checking service certificates"
if [ ! -f $DM_WEB_SERVICE_CERT_FILE -o ! -f $DM_WEB_SERVICE_KEY_FILE ]; then
echo "Creating DM $DM_WEB_SERVICE_DAEMON certificate"
- if [ ! -f $DM_CA_DIR/certs/$DM_SERVICE_HOST.crt ]; then
+ if [ ! -f $DM_CA_DIR/certs/$DM_WEB_SERVICE_HOST.crt ]; then
$MY_DIR/dm_create_server_cert.sh $DM_WEB_SERVICE_HOST $DM_WEB_SERVICE_HOST dm@aps.anl.gov || exit 1
fi
rsync -ar $DM_CA_DIR/certs/$DM_WEB_SERVICE_HOST.crt $DM_WEB_SERVICE_CERT_FILE
@@ -152,6 +152,8 @@ cmd="cat $DM_ROOT_DIR/etc/setup.sh.template \
| sed 's?DM_DS_WEB_SERVICE_PORT=.*?DM_DS_WEB_SERVICE_PORT=$DM_DS_WEB_SERVICE_PORT?g' \
| sed 's?DM_DAQ_WEB_SERVICE_HOST=.*?DM_DAQ_WEB_SERVICE_HOST=$DM_DAQ_WEB_SERVICE_HOST?g' \
| sed 's?DM_DAQ_WEB_SERVICE_PORT=.*?DM_DAQ_WEB_SERVICE_PORT=$DM_DAQ_WEB_SERVICE_PORT?g' \
+ | sed 's?DM_CAT_WEB_SERVICE_HOST=.*?DM_CAT_WEB_SERVICE_HOST=$DM_CAT_WEB_SERVICE_HOST?g' \
+ | sed 's?DM_CAT_WEB_SERVICE_PORT=.*?DM_CAT_WEB_SERVICE_PORT=$DM_CAT_WEB_SERVICE_PORT?g' \
| sed 's?DM_HOSTNAME?$DM_HOSTNAME?g' \
> $DM_USER_SETUP_FILE"
eval $cmd || exit 1
@@ -172,7 +174,7 @@ else
echo "Will not configure sudo access for $DM_SYSTEM_USER."
fi
-echo "Starting web service for $DM_DB_NAME"
+echo "Starting ds web service for $DM_DB_NAME"
$DM_WEB_SERVICE_INIT_CMD start $DM_DB_NAME
echo "Done deploying $DM_WEB_SERVICE_DAEMON for $DM_DB_NAME"
--
GitLab