updated deployment scripts

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

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

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

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

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