From 61022cc76912666cfe5583dd8e4316a3137ac77f Mon Sep 17 00:00:00 2001 From: Sinisa Veseli <sveseli@aps.anl.gov> Date: Tue, 23 Jun 2015 19:36:48 +0000 Subject: [PATCH] modified ds service deploymentto include sudu setup and system account addition to db --- sbin/dm_deploy_ds_web_service.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sbin/dm_deploy_ds_web_service.sh b/sbin/dm_deploy_ds_web_service.sh index e8c87984..47d09e92 100755 --- a/sbin/dm_deploy_ds_web_service.sh +++ b/sbin/dm_deploy_ds_web_service.sh @@ -129,6 +129,11 @@ if [ ! -f "$DM_SYSTEM_PASSWORD_FILE" ]; then stty $sttyOrig echo $DM_SYSTEM_PASSWORD > $DM_SYSTEM_PASSWORD_FILE chmod 600 $DM_SYSTEM_PASSWORD_FILE + + # Add dm system user to the DB + echo "Adding $DM_SYSTEM_USER system user to the database" + dm-add-user --username=$DM_SYSTEM_USER --first-name=System --last-name=Account --password-file=$DM_SYSTEM_PASSWORD_FILE || exit 1 + dm-add-user-system-role --username=$DM_SYSTEM_USER --role-name=Administrator || exit 1 fi # Modify version @@ -151,6 +156,22 @@ cmd="cat $DM_ROOT_DIR/etc/setup.sh.template \ > $DM_USER_SETUP_FILE" eval $cmd || exit 1 +# Prepare sudo rules +configureSudo="N" +read -p "Would you like to configure sudo rules (requires root password) in order to allow the $DM_SYSTEM_USER user to manage user groups and file system permissions? [y|N]" configureSudo +if [ "$configureSudo" = "y" -o "$configureSudo" = "Y" ]; then + sudoersFile=/etc/sudoers.d/$DM_DB_NAME + echo "Preparing DM sudo rules file $sudoersFile" + cmd="su -c \"cat $DM_ROOT_DIR/etc/${DM_DB_NAME}.sudo-rules.template \ + | sed 's?DM_DATA_DIR?$DM_DATA_DIR?g' \ + | sed 's?DM_SYSTEM_USER?$DM_SYSTEM_USER?g' \ + | sed 's?DM_HOSTNAME?$DM_HOSTNAME?g' \ + > $sudoersFile\"" + eval $cmd || exit 1 +else + echo "Will not configure sudo access for $DM_SYSTEM_USER." +fi + echo "Starting web service for $DM_DB_NAME" $DM_WEB_SERVICE_INIT_CMD start $DM_DB_NAME -- GitLab