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 diff --git a/src/python/dm/__init__.py b/src/python/dm/__init__.py index 68b3c89b95ddad4a98f17804af4d831d695f6aa1..ea832c24e88df4286c1538127258d2c2ff4a4a4f 100644 --- a/src/python/dm/__init__.py +++ b/src/python/dm/__init__.py @@ -1 +1 @@ -__version__ = "0.8 (2016.01.26)" +__version__ = "0.8 (2016.02.05)"