diff --git a/etc/daq-web-service.conf.template b/etc/daq-web-service.conf.template index 7bf3c3abf7daa3c0a2e62baed317d178fd2640a6..7743168791b0ce2c1ad3851e29b0d15cd44df951 100644 --- a/etc/daq-web-service.conf.template +++ b/etc/daq-web-service.conf.template @@ -40,6 +40,12 @@ host=DM_DS_WEB_SERVICE_HOST port=DM_DS_WEB_SERVICE_PORT protocol=DM_WEB_SERVICE_PROTOCOL +[MongoDbManager] +mongoDbName=dm +mongoDbUri=mongodb://localhost:27017 +mongoDbUser=dm +mongoDbPasswordFile=/home/dm/etc/dm.db.passwd + # Available logger levels: debug, info, warn, error, critical [ConsoleLogging] handler=ConsoleLoggingHandler(sys.stdout,) diff --git a/etc/ds-web-service.conf.template b/etc/ds-web-service.conf.template index 5b8978723e5984bfb840b3437002533a7a1ba30e..a96c3e1495762b3696f62b0ab14dd924ffb26570 100644 --- a/etc/ds-web-service.conf.template +++ b/etc/ds-web-service.conf.template @@ -18,6 +18,9 @@ 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) +[LdapLinuxPlatformUtility] +refreshAuthFilesCommand= + [DbManager] dbSchema=DM_DB_NAME dbUser=DM_DB_NAME diff --git a/sbin/dm_deploy_cat_web_service.sh b/sbin/dm_deploy_cat_web_service.sh index 77145a3747b19a33f518863c3303cd9ade5815d3..e2ea3ce3f9088f4282f69ab1277cdf729fd4f335 100755 --- a/sbin/dm_deploy_cat_web_service.sh +++ b/sbin/dm_deploy_cat_web_service.sh @@ -100,7 +100,7 @@ echo "Checking service certificates" if [ ! -f $DM_WEB_SERVICE_CERT_FILE -o ! -f $DM_WEB_SERVICE_KEY_FILE ]; then if [ ! -f $DM_CA_DIR/certs/$DM_WEB_SERVICE_HOST.crt ]; then echo "Attempting to create DM $DM_WEB_SERVICE_DAEMON certificate" - ssh $DM_DS_WEB_SERVICE_HOST "$DM_DS_INSTALL_DIR/dm/sbin/dm_create_server_cert.sh $DM_WEB_SERVICE_HOST $DM_WEB_SERVICE_HOST dm@aps.anl.gov" + ssh $DM_DS_WEB_SERVICE_HOST "$DM_DS_INSTALL_DIR/current/sbin/dm_create_server_cert.sh $DM_WEB_SERVICE_HOST $DM_WEB_SERVICE_HOST dm@aps.anl.gov" fi echo "Copying DM $DM_WEB_SERVICE_DAEMON certificate" rsync -ar $DM_DS_WEB_SERVICE_HOST:$DM_DS_INSTALL_DIR/etc/CA/certs/$DM_WEB_SERVICE_HOST.crt $DM_WEB_SERVICE_CERT_FILE || exit 1 diff --git a/sbin/dm_deploy_daq_web_service.sh b/sbin/dm_deploy_daq_web_service.sh index 52b83023c397b5d5cfa2e4cf2b3a4639a614ae2b..4cb9267f1cda9ba8b8b50f1211b925a6e591ed5a 100755 --- a/sbin/dm_deploy_daq_web_service.sh +++ b/sbin/dm_deploy_daq_web_service.sh @@ -100,7 +100,7 @@ echo "Checking service certificates" if [ ! -f $DM_WEB_SERVICE_CERT_FILE -o ! -f $DM_WEB_SERVICE_KEY_FILE ]; then if [ ! -f $DM_CA_DIR/certs/$DM_WEB_SERVICE_HOST.crt ]; then echo "Attempting to create DM $DM_WEB_SERVICE_DAEMON certificate" - ssh $DM_DS_WEB_SERVICE_HOST "$DM_DS_INSTALL_DIR/dm/sbin/dm_create_server_cert.sh $DM_WEB_SERVICE_HOST $DM_WEB_SERVICE_HOST dm@aps.anl.gov" + ssh $DM_DS_WEB_SERVICE_HOST "$DM_DS_INSTALL_DIR/current/sbin/dm_create_server_cert.sh $DM_WEB_SERVICE_HOST $DM_WEB_SERVICE_HOST dm@aps.anl.gov" fi echo "Copying DM $DM_WEB_SERVICE_DAEMON certificate" rsync -ar $DM_DS_WEB_SERVICE_HOST:$DM_DS_INSTALL_DIR/etc/CA/certs/$DM_WEB_SERVICE_HOST.crt $DM_WEB_SERVICE_CERT_FILE || exit 1 diff --git a/sbin/dm_install_support.sh b/sbin/dm_install_support.sh index 1a6730116a2b45c770aafa1cecb7ee2b5c3fe11b..76e3317906b38aa705efb892cc6c4367545e6558 100755 --- a/sbin/dm_install_support.sh +++ b/sbin/dm_install_support.sh @@ -35,7 +35,7 @@ if [ ! -d $DM_SUPPORT_DIR ]; then fi cd $DM_SUPPORT_DIR execute svn update -execute $DM_SUPPORT_DIR/bin/clean_support_all.sh +#execute $DM_SUPPORT_DIR/bin/clean_support_all.sh execute $DM_SUPPORT_DIR/bin/install_support_${supportType}.sh