remove DM_DATA_DIR; consistently use DM_STORAGE_DIR for deployment; use better...

remove DM_DATA_DIR; consistently use DM_STORAGE_DIR for deployment; use better name for remote DM installation directory

sbin/dm_deploy_daq_web_service.sh

@@ -65,14 +65,19 @@ DM_WEB_SERVICE_PORT=$DM_DAQ_WEB_SERVICE_PORT
 if [ -z "$DM_DS_WEB_SERVICE_HOST" -o "$DM_DS_WEB_SERVICE_HOST" = "DM_HOSTNAME" ]; then
     read -p "Enter DM DS Web Service Host: " DM_DS_WEB_SERVICE_HOST
 fi
+if [ -z "$DM_DS_WEB_SERVICE_HOST" ]; then
+    DM_DS_WEB_SERVICE_HOST=$DM_HOSTNAME
+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
+read -p "Enter DM DS Web Service Installation Directory: " DM_DS_INSTALL_DIR
+if [ -z "$DM_DS_INSTALL_DIR" ]; then
+    DM_DS_INSTALL_DIR=$DM_INSTALL_DIR
+fi
 
 echo "DM DAQ web service host: $DM_DAQ_WEB_SERVICE_HOST"
+echo "DM DAQ web service install directory: $DM_INSTALL_DIR"
 echo "DM DS web service host: $DM_DS_WEB_SERVICE_HOST"
-echo "DM install directory: $DM_INSTALL_DIR"
+echo "DM DS web service install directory: $DM_DS_INSTALL_DIR"
 
 mkdir -p $DM_ETC_DIR
 mkdir -p $DM_SSL_DIR
@@ -86,7 +91,7 @@ echo "Checking CA certificate"
 if [ ! -f $DM_CA_CERT_FILE ]; then
     echo "Copying DM CA cert"
     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/
+    rsync  $DM_DS_WEB_SERVICE_HOST:$DM_DS_INSTALL_DIR/etc/ssl/dm-ca-cert.pem $DM_SSL_DIR/
     else
     echo "DM CA certificate exists"
 fi
@@ -95,11 +100,11 @@ 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 "$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"
+        ssh $DM_DS_WEB_SERVICE_HOST "$DM_DS_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_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
+    rsync -ar $DM_DS_WEB_SERVICE_HOST:$DM_DS_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_INSTALL_DIR/etc/CA/certs/$DM_WEB_SERVICE_HOST.key $DM_WEB_SERVICE_KEY_FILE || exit 1
 else
     echo "DM service certificate exists"
 fi
@@ -113,13 +118,11 @@ if [ ! -f $DM_WEB_SERVICE_CONFIG_FILE ]; then
         | sed 's?sslCertFile=.*?sslCertFile=$DM_WEB_SERVICE_CERT_FILE?g' \
         | sed 's?sslKeyFile=.*?sslKeyFile=$DM_WEB_SERVICE_KEY_FILE?g' \
         | sed 's?handler=TimedRotatingFileLoggingHandler.*?handler=TimedRotatingFileLoggingHandler(\"$DM_WEB_SERVICE_LOG_FILE\")?g' \
-        | sed 's?DM_STORAGE_DIR?$DM_STORAGE_DIR?g' \
         | sed 's?DM_INSTALL_DIR?$DM_INSTALL_DIR?g' \
         | sed 's?DM_SYSTEM_USER?$DM_SYSTEM_USER?g' \
         | sed 's?DM_DS_WEB_SERVICE_HOST?$DM_DS_WEB_SERVICE_HOST?g' \
         | sed 's?DM_DS_WEB_SERVICE_PORT?$DM_DS_WEB_SERVICE_PORT?g' \
         | sed 's?DM_WEB_SERVICE_PROTOCOL?$DM_WEB_SERVICE_PROTOCOL?g' \
-        | sed 's?DM_DATA_DIR?$DM_DATA_DIR?g' \
         | sed 's?DM_HOSTNAME?$DM_HOSTNAME?g' \
         | sed 's?DM_DB_NAME?$DM_DB_NAME?g' \
         > $DM_WEB_SERVICE_CONFIG_FILE"
@@ -138,13 +141,13 @@ 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_DS_SERVICE_HOST_INSTALL_DIR/etc/${DM_SYSTEM_USER}.system.passwd $DM_SYSTEM_PASSWORD_FILE || exit 1
+    rsync -ar $DM_DS_WEB_SERVICE_HOST:$DM_DS_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_DS_SERVICE_HOST_INSTALL_DIR/etc/${DM_DB_NAME}.setup.sh $DM_USER_SETUP_FILE || exit 1
+    rsync -ar $DM_DS_WEB_SERVICE_HOST:$DM_DS_INSTALL_DIR/etc/${DM_DB_NAME}.setup.sh $DM_USER_SETUP_FILE || exit 1
 fi
 
 # Prepare setup file