introduced new deployment variable for storage and interservice communication

etc/daq-web-service.conf.template

@@ -22,8 +22,8 @@ nProcessingThreads=3
 fileProcessor1=dm.common.plugins.rsyncFileTransferPlugin.RsyncFileTransferPlugin(dest='/tmp/data')
 
 [DsRestApiFactory]
-username=dm
-passwordFile=DM_INSTALL_DIR/etc/DM_DB_NAME.ds.passwd
+username=DM_SYSTEM_USER
+passwordFile=DM_INSTALL_DIR/etc/DM_SYSTEM_USER.system.passwd
 host=DM_DS_WEB_SERVICE_HOST
 port=DM_DS_WEB_SERVICE_PORT
 protocol=DM_DS_WEB_SERVICE_PROTOCOL

etc/dm.deploy.conf

@@ -4,11 +4,13 @@ DM_DB_HOST=127.0.0.1
 DM_DB_PORT=11136
 DM_DB_ADMIN_USER=postgres
 DM_DB_ADMIN_HOSTS="127.0.0.1"
-DM_DB_CHARACTER_SET=utf8
 DM_DB_SCRIPTS_DIR=
+DM_SYSTEM_USER=dm
+DM_STORAGE_DIR=DM_DATA_DIR
 DM_CONTEXT_ROOT=dm
+DM_DS_WEB_SERVICE_HOST=DM_HOSTNAME
 DM_DS_WEB_SERVICE_PORT=22236
+DM_DS_WEB_SERVICE_PROTOCOL=https
 DM_DAQ_WEB_SERVICE_PORT=33336
 DM_SOFTWARE_VERSION="0.1 (DM_DATE)"
 
-

etc/dm_dev.deploy.conf

@@ -3,11 +3,14 @@ DM_DB_USER=dm_dev
 DM_DB_HOST=127.0.0.1
 DM_DB_PORT=11136
 DM_DB_ADMIN_USER=postgres
-DM_DB_ADMIN_HOSTS="127.0.0.1 bluegill1.aps.anl.gov gaeaimac.aps.anl.gov visa%.aps.anl.gov"
-DM_DB_CHARACTER_SET=utf8
+DM_DB_ADMIN_HOSTS="127.0.0.1"
 DM_DB_SCRIPTS_DIR=
+DM_SYSTEM_USER=dm
+DM_STORAGE_DIR=DM_DATA_DIR
 DM_CONTEXT_ROOT=dm_dev
+DM_DS_WEB_SERVICE_HOST=DM_HOSTNAME
 DM_DS_WEB_SERVICE_PORT=22237
+DM_DS_WEB_SERVICE_PROTOCOL=https
 DM_DAQ_WEB_SERVICE_PORT=33337
 DM_SOFTWARE_VERSION="Development Snapshot (DM_DATE)"