X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Fstandup.sh;h=ae64d2b877b60d9daf7d86c1aa904f5678e24f3e;hb=21f18eb5cf7bf7a4c645efa968bb391713639402;hp=ff04faba037756d6b95b8d970883cc2671684599;hpb=7e95b376817097cab9297cf0b0a9672564d86477;p=feisty_meow.git diff --git a/scripts/site_avenger/standup.sh b/scripts/site_avenger/standup.sh index ff04faba..ae64d2b8 100644 --- a/scripts/site_avenger/standup.sh +++ b/scripts/site_avenger/standup.sh @@ -47,10 +47,11 @@ elif [ -z "$app_dirname" ]; then print_instructions fi -if [[ $EUID != 0 ]]; then - echo "This script must be run as root or sudo." - exit 1 -fi +#we will require sudo later. +#if [[ $EUID != 0 ]]; then +# echo "This script must be run as root or sudo." +# exit 1 +#fi source "$WORKDIR/shared_site_mgr.sh" @@ -66,36 +67,29 @@ else test_app_folder "$APPLICATION_DIR" "$app_dirname" fi -echo "!! domain being added is: $DOMAIN_NAME" +#echo "!! domain being added is: $DOMAIN_NAME" -add_domain "$DOMAIN_NAME" +sudo bash "$FEISTY_MEOW_SCRIPTS/system/add_domain.sh" "$DOMAIN_NAME" test_or_die "Setting up domain: $DOMAIN_NAME" sep -add_apache_site "$APPLICATION_NAME" "$DOMAIN_NAME" +sudo bash "$FEISTY_MEOW_SCRIPTS/system/add_apache_site.sh" "$APPLICATION_NAME" "$DOMAIN_NAME" test_or_die "Setting up apache site for: $APPLICATION_NAME" sep -echo about to do powerup with: app="$APPLICATION_NAME" repo="$REPO_NAME" theme="$THEME_NAME" -echo default repo is "$DEFAULT_REPOSITORY_ROOT" - -#hmmm: maybe can get rid of user name parm if this works? - -echo before redo login permissions -sudo su -i -u $(logname) -echo after redo login permissions -whoami -echo user=$USER - +#echo about to do powerup with: app="$APPLICATION_NAME" repo="$REPO_NAME" theme="$THEME_NAME" +#echo default repo is "$DEFAULT_REPOSITORY_ROOT" +powerup "$APPLICATION_NAME" "$REPO_NAME" "$THEME_NAME" # pass the real user name who should own the files. -powerup "$APPLICATION_NAME" "$REPO_NAME" "$THEME_NAME" "$(logname)" +# "$(logname)" sep echo " -Finished standing up the full domain and site in: -${app_dirname}" +Finished standing up the full domain and site for: ${app_dirname} +The domain name is: $DOMAIN_NAME +"