From 52337c799704d9f9f91db75793fd43ca14eef3aa Mon Sep 17 00:00:00 2001 From: Sinisa Veseli <sveseli@aps.anl.gov> Date: Wed, 15 Apr 2015 18:50:32 +0000 Subject: [PATCH] introduced new deployment variable for storage and interservice communication --- etc/daq-web-service.conf.template | 4 ++-- etc/dm.deploy.conf | 6 ++++-- etc/dm_dev.deploy.conf | 7 +++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/etc/daq-web-service.conf.template b/etc/daq-web-service.conf.template index 8b55e25f..67f597e8 100644 --- a/etc/daq-web-service.conf.template +++ b/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 diff --git a/etc/dm.deploy.conf b/etc/dm.deploy.conf index 1bfc7881..73116d46 100644 --- a/etc/dm.deploy.conf +++ b/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)" - diff --git a/etc/dm_dev.deploy.conf b/etc/dm_dev.deploy.conf index 723a5c1f..45dff623 100644 --- a/etc/dm_dev.deploy.conf +++ b/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)" -- GitLab