From 934d26037ca650c2cf7bf0f8f4ad2e2f99dc26d2 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Thu, 5 Jan 2017 21:42:42 +0000
Subject: [PATCH] merge updated templates and db from auth framework branch
---
etc/cat-web-service.conf.template | 1 +
etc/daq-web-service.conf.template | 1 +
etc/ds-web-service.conf.template | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/etc/cat-web-service.conf.template b/etc/cat-web-service.conf.template
index 5ff1e1f5..26e7031b 100644
--- a/etc/cat-web-service.conf.template
+++ b/etc/cat-web-service.conf.template
@@ -4,6 +4,7 @@ servicePort=44436
sslCertFile=DM_INSTALL_DIR/etc/ssl/cat-web-service.crt
sslKeyFile=DM_INSTALL_DIR/etc/ssl/cat-web-service.key
sslCaCertFile=DM_INSTALL_DIR/etc/ssl/cacert.pem
+stationName=DM_STATION_NAME
[AuthorizationPrincipalManager]
principalRetriever=dm.ds_web_service.service.auth.dsAuthPrincipalRetriever.DsAuthPrincipalRetriever()
diff --git a/etc/daq-web-service.conf.template b/etc/daq-web-service.conf.template
index 77431687..3b5cb3c5 100644
--- a/etc/daq-web-service.conf.template
+++ b/etc/daq-web-service.conf.template
@@ -4,6 +4,7 @@ servicePort=33336
sslCertFile=DM_INSTALL_DIR/etc/ssl/daq-web-service.crt
sslKeyFile=DM_INSTALL_DIR/etc/ssl/daq-web-service.key
sslCaCertFile=DM_INSTALL_DIR/etc/ssl/cacert.pem
+stationName=DM_STATION_NAME
[AuthorizationPrincipalManager]
principalRetriever=dm.ds_web_service.service.auth.dsAuthPrincipalRetriever.DsAuthPrincipalRetriever()
diff --git a/etc/ds-web-service.conf.template b/etc/ds-web-service.conf.template
index a96c3e14..11cb970c 100644
--- a/etc/ds-web-service.conf.template
+++ b/etc/ds-web-service.conf.template
@@ -13,7 +13,7 @@ principalAuthenticator2=LdapPasswordPrincipalAuthenticator(serverUrl='ldaps://dm
[ExperimentManager]
storageDirectory=DM_STORAGE_DIR
-storageId=xstor
+storageId=extrepid
manageStoragePermissions=True
#platformUtility=dm.common.utility.linuxUtility.LinuxUtility()
platformUtility=dm.common.utility.ldapLinuxPlatformUtility.LdapLinuxPlatformUtility('ldaps://dmid-vm.xray.aps.anl.gov:636', 'uid=DM_SYSTEM_UNIX_ACCOUNT,ou=People,o=aps.anl.gov,dc=aps,dc=anl,dc=gov', 'DM_INSTALL_DIR/etc/DM_SYSTEM_UNIX_ACCOUNT.ldap.passwd', groupDnFormat='cn=%s,ou=DM,ou=Group,o=aps.anl.gov,dc=aps,dc=anl,dc=gov', minGidNumber=66000)
--
GitLab