merge updated templates and db from auth framework branch

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()

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()

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)