remove DM_DATA_DIR; consistently use DM_STORAGE_DIR; apply fix for different...

remove DM_DATA_DIR; consistently use DM_STORAGE_DIR; apply fix for different DS installation directory

sbin/dm_deploy_cat_web_service.sh

@@ -66,10 +66,19 @@ DM_WEB_SERVICE_PORT=$DM_CAT_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 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 CAT web service host: $DM_CAT_WEB_SERVICE_HOST"
+echo "DM CAT 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
@@ -109,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"