diff --git a/etc/cat-web-service.conf.template b/etc/cat-web-service.conf.template index 5ff1e1f5dd028a3b165491354b18ca6617bb88cd..26e7031bb6ed3c3c7ecf359bd4df802bb57979e0 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 7743168791b0ce2c1ad3851e29b0d15cd44df951..3b5cb3c588ba265924602ba980dd9b99a4306e6f 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 a96c3e1495762b3696f62b0ab14dd924ffb26570..11cb970cef092ecd6b3ebd8625dc2099dda3747d 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)