Skip to content
Snippets Groups Projects
Commit bfc120a8 authored by sveseli's avatar sveseli
Browse files

updated deployment scripts

parent ac3e6b5e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
etc/daq-web-service.conf.template
+ 7
− 7
View file @ bfc120a8
......@@ -13,9 +13,9 @@ principalRetriever=dm.ds_web_service.service.auth.dsAuthPrincipalRetriever.DsAut
principalAuthenticator1=CryptedPasswordPrincipalAuthenticator()
principalAuthenticator2=LdapPasswordPrincipalAuthenticator(serverUrl='ldaps://phoebusldap.aps.anl.gov:636', dnFormat='uid=%s,ou=people,o=aps.anl.gov,dc=aps,dc=anl,dc=gov')
[SingleSignOnManager]
sessionManager=dm.ds_web_service.service.auth.dsSessionManager.DsSessionManager()
sessionTimeoutInSeconds=3600
#[SingleSignOnManager]
#sessionManager=dm.ds_web_service.service.auth.dsSessionManager.DsSessionManager()
#sessionTimeoutInSeconds=3600
[FileSystemObserver]
# Minimum file processing delay since last update
......@@ -25,14 +25,14 @@ fileSystemObserverAgent=dm.daq_web_service.service.impl.watchdogFileSystemObserv
#fileSystemObserverAgent=dm.daq_web_service.service.impl.ftpFileSystemObserverAgent.FtpFileSystemObserverAgent('dmdaq', 2811)
[FileProcessingManager]
numberOfProcessingThreads=3
numberOfProcessingThreads=5
defaultNumberOfRetries=3
defaultRetryWaitPeriodInSeconds=60
fileProcessor1=dm.common.processing.plugins.rsyncFileTransferPlugin.RsyncFileTransferPlugin()
fileProcessor1=dm.common.processing.plugins.rsyncFileTransferPlugin.RsyncFileTransferPlugin(localMd5Sum=True,remoteMd5Sum=False,deleteOriginal=False)
#fileProcessor1=dm.common.processing.plugins.gridftpFileTransferPlugin.GridftpFileTransferPlugin()
#fileProcessor2=dm.common.processing.plugins.rsyncFileTransferPlugin.RsyncFileTransferPlugin(dest=\ffdfdsf')
#fileProcessor2=dm.common.processing.plugins.mongoDbFileCatalogPlugin.MongoDbFileCatalogPlugin()
fileProcessor2=dm.daq_web_service.service.impl.dsProcessFileNotificationPlugin.DsProcessFileNotificationPlugin()
fileProcessor2=dm.common.processing.plugins.mongoDbFileCatalogPlugin.MongoDbFileCatalogPlugin()
fileProcessor3=dm.daq_web_service.service.impl.dsProcessFileNotificationPlugin.DsProcessFileNotificationPlugin()
[DsRestApiFactory]
username=DM_SYSTEM_USER
......
etc/setup.sh.template
+ 3
− 1
View file @ bfc120a8
#!/bin/sh
export DM_ROOT_DIR=
export DM_WEB_SERVICE_PROTOCOL=
export DM_WEB_SERVICE_PROTOCOL=https
export DM_DS_WEB_SERVICE_HOST=
export DM_DS_WEB_SERVICE_PORT=
export DM_DAQ_WEB_SERVICE_HOST=
export DM_DAQ_WEB_SERVICE_PORT=
export DM_CAT_WEB_SERVICE_HOST=
export DM_CAT_WEB_SERVICE_PORT=
export DM_STATION_NAME=
export DM_ALLOWED_EXPERIMENT_TYPES=TEST
setupFile=$DM_ROOT_DIR/setup.sh
if [ ! -f $setupFile ]; then
......
sbin/dm_deploy_cat_web_service.sh
+ 14
− 2
View file @ bfc120a8
......@@ -62,9 +62,11 @@ DM_DB_PASSWORD_FILE=${DM_ETC_DIR}/${DM_DB_NAME}.db.passwd
DM_SYSTEM_PASSWORD_FILE=${DM_INSTALL_DIR}/etc/${DM_SYSTEM_USER}.system.passwd
DM_USER_SETUP_FILE=${DM_ETC_DIR}/${DM_DB_NAME}.setup.sh
DM_MONGODB_SERVICE_INIT_CMD=${DM_ROOT_DIR}/etc/init.d/dm-mongodb
DM_STATION_NAME=${DM_STATION_NAME:=TEST}
cmd="echo $DM_CAT_WEB_SERVICE_HOST | sed 's?DM_HOSTNAME?$DM_HOSTNAME?'"
DM_WEB_SERVICE_HOST=`eval $cmd`
DM_CAT_WEB_SERVICE_HOST=$DM_WEB_SERVICE_HOST
DM_WEB_SERVICE_PORT=$DM_CAT_WEB_SERVICE_PORT
if [ -z "$DM_DS_WEB_SERVICE_HOST" -o "$DM_DS_WEB_SERVICE_HOST" = "DM_HOSTNAME" ]; then
......@@ -79,8 +81,14 @@ if [ -z "$DM_DS_INSTALL_DIR" ]; then
DM_DS_INSTALL_DIR=$DM_INSTALL_DIR
fi
read -p "Enter DM DAQ station name [$DM_STATION_NAME]: " DM_CAT_STATION_NAME
if [ -z "$DM_CAT_STATION_NAME" ]; then
DM_CAT_STATION_NAME=$DM_STATION_NAME
fi
echo "DM CAT web service host: $DM_CAT_WEB_SERVICE_HOST"
echo "DM CAT web service install directory: $DM_INSTALL_DIR"
echo "DM CAT station name: $DM_CAT_STATION_NAME"
echo "DM DS web service host: $DM_DS_WEB_SERVICE_HOST"
echo "DM DS web service install directory: $DM_DS_INSTALL_DIR"
......@@ -129,6 +137,7 @@ if [ ! -f $DM_WEB_SERVICE_CONFIG_FILE ]; then
| sed 's?DM_WEB_SERVICE_PROTOCOL?$DM_WEB_SERVICE_PROTOCOL?g' \
| sed 's?DM_HOSTNAME?$DM_HOSTNAME?g' \
| sed 's?DM_DB_NAME?$DM_DB_NAME?g' \
| sed 's?DM_STATION_NAME?$DM_CAT_STATION_NAME?g' \
> $DM_WEB_SERVICE_CONFIG_FILE"
eval $cmd || exit 1
else
......@@ -150,17 +159,20 @@ fi
# Prepare setup file
if [ ! -f $DM_USER_SETUP_FILE ]; then
echo "Copying user setup file $DM_USER_SETUP_FILE"
rsync -ar $DM_DS_WEB_SERVICE_HOST:$DM_USER_SETUP_FILE $DM_USER_SETUP_FILE || exit 1
echo "Copying template for user setup file $DM_USER_SETUP_FILE"
rsync -ar $DM_ROOT_DIR/etc/setup.sh.template $DM_USER_SETUP_FILE || exit 1
fi
# Prepare setup file
echo "Preparing setup file"
cmd="cat $DM_USER_SETUP_FILE \
| sed 's?DM_ROOT_DIR=.*?DM_ROOT_DIR=$DM_ROOT_DIR?g' \
| sed 's?DM_DS_WEB_SERVICE_HOST=.*?DM_DS_WEB_SERVICE_HOST=$DM_DS_WEB_SERVICE_HOST?g' \
| sed 's?DM_DS_WEB_SERVICE_PORT=.*?DM_DS_WEB_SERVICE_PORT=$DM_DS_WEB_SERVICE_PORT?g' \
| sed 's?DM_CAT_WEB_SERVICE_HOST=.*?DM_CAT_WEB_SERVICE_HOST=$DM_CAT_WEB_SERVICE_HOST?g' \
| sed 's?DM_CAT_WEB_SERVICE_PORT=.*?DM_CAT_WEB_SERVICE_PORT=$DM_CAT_WEB_SERVICE_PORT?g' \
| sed 's?DM_HOSTNAME?$DM_HOSTNAME?g' \
| sed 's?DM_STATION_NAME=.*?DM_STATION_NAME=$DM_CAT_STATION_NAME?g' \
> $DM_USER_SETUP_FILE.2 && mv $DM_USER_SETUP_FILE.2 $DM_USER_SETUP_FILE"
eval $cmd || exit 1
......
sbin/dm_deploy_daq_web_service.sh
+ 15
− 3
View file @ bfc120a8
......@@ -62,9 +62,11 @@ DM_WEB_SERVICE_INIT_CMD=${DM_ROOT_DIR}/etc/init.d/dm-$DM_WEB_SERVICE_DAEMON
DM_DB_PASSWORD_FILE=${DM_ETC_DIR}/${DM_DB_NAME}.db.passwd
DM_SYSTEM_PASSWORD_FILE=${DM_INSTALL_DIR}/etc/${DM_SYSTEM_USER}.system.passwd
DM_USER_SETUP_FILE=${DM_ETC_DIR}/${DM_DB_NAME}.setup.sh
DM_STATION_NAME=${DM_STATION_NAME:=TEST}
cmd="echo $DM_DAQ_WEB_SERVICE_HOST | sed 's?DM_HOSTNAME?$DM_HOSTNAME?'"
DM_WEB_SERVICE_HOST=`eval $cmd`
DM_DAQ_WEB_SERVICE_HOST=$DM_WEB_SERVICE_HOST
DM_WEB_SERVICE_PORT=$DM_DAQ_WEB_SERVICE_PORT
if [ -z "$DM_DS_WEB_SERVICE_HOST" -o "$DM_DS_WEB_SERVICE_HOST" = "DM_HOSTNAME" ]; then
......@@ -79,8 +81,14 @@ if [ -z "$DM_DS_INSTALL_DIR" ]; then
DM_DS_INSTALL_DIR=$DM_INSTALL_DIR
fi
read -p "Enter DM DAQ station name [$DM_STATION_NAME]: " DM_DAQ_STATION_NAME
if [ -z "$DM_DAQ_STATION_NAME" ]; then
DM_DAQ_STATION_NAME=$DM_STATION_NAME
fi
echo "DM DAQ web service host: $DM_DAQ_WEB_SERVICE_HOST"
echo "DM DAQ web service install directory: $DM_INSTALL_DIR"
echo "DM DAQ station name: $DM_DAQ_STATION_NAME"
echo "DM DS web service host: $DM_DS_WEB_SERVICE_HOST"
echo "DM DS web service install directory: $DM_DS_INSTALL_DIR"
......@@ -105,7 +113,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/current/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/production/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
......@@ -130,6 +138,7 @@ if [ ! -f $DM_WEB_SERVICE_CONFIG_FILE ]; then
| sed 's?DM_WEB_SERVICE_PROTOCOL?$DM_WEB_SERVICE_PROTOCOL?g' \
| sed 's?DM_HOSTNAME?$DM_HOSTNAME?g' \
| sed 's?DM_DB_NAME?$DM_DB_NAME?g' \
| sed 's?DM_STATION_NAME?$DM_DAQ_STATION_NAME?g' \
> $DM_WEB_SERVICE_CONFIG_FILE"
eval $cmd || exit 1
else
......@@ -151,17 +160,20 @@ fi
# Prepare setup file
if [ ! -f $DM_USER_SETUP_FILE ]; then
echo "Copying user setup file $DM_USER_SETUP_FILE"
rsync -ar $DM_DS_WEB_SERVICE_HOST:$DM_DS_INSTALL_DIR/etc/${DM_DB_NAME}.setup.sh $DM_USER_SETUP_FILE || exit 1
echo "Copying template for user setup file $DM_USER_SETUP_FILE"
rsync -ar $DM_ROOT_DIR/etc/setup.sh.template $DM_USER_SETUP_FILE || exit 1
fi
# Prepare setup file
echo "Preparing setup file"
cmd="cat $DM_USER_SETUP_FILE \
| sed 's?DM_ROOT_DIR=.*?DM_ROOT_DIR=$DM_ROOT_DIR?g' \
| sed 's?DM_DS_WEB_SERVICE_HOST=.*?DM_DS_WEB_SERVICE_HOST=$DM_DS_WEB_SERVICE_HOST?g' \
| sed 's?DM_DS_WEB_SERVICE_PORT=.*?DM_DS_WEB_SERVICE_PORT=$DM_DS_WEB_SERVICE_PORT?g' \
| sed 's?DM_DAQ_WEB_SERVICE_HOST=.*?DM_DAQ_WEB_SERVICE_HOST=$DM_DAQ_WEB_SERVICE_HOST?g' \
| sed 's?DM_DAQ_WEB_SERVICE_PORT=.*?DM_DAQ_WEB_SERVICE_PORT=$DM_DAQ_WEB_SERVICE_PORT?g' \
| sed 's?DM_HOSTNAME?$DM_HOSTNAME?g' \
| sed 's?DM_STATION_NAME=.*?DM_STATION_NAME=$DM_DAQ_STATION_NAME?g' \
> $DM_USER_SETUP_FILE.2 && mv $DM_USER_SETUP_FILE.2 $DM_USER_SETUP_FILE"
eval $cmd || exit 1
......
src/python/dm/__init__.py
+ 1
− 1
View file @ bfc120a8
__version__ = "1.0 (2017.01.24)"
__version__ = "1.0 (2017.01.26)"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment