moved where we do sudo now

[feisty_meow.git] / scripts / site_avenger / standup.sh

diff --git a/scripts/site_avenger/standup.sh b/scripts/site_avenger/standup.sh
index ff04faba037756d6b95b8d970883cc2671684599..96ec4cf3943434aad02388533f8d8a7b1a8dee9c 100644 (file)
--- 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"
 
@@ -68,12 +69,12 @@ fi
 
 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
@@ -81,17 +82,9 @@ 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
-
-
+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