From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 13 Nov 2017 02:48:20 +0000 (-0500)
Subject: moved where we do sudo now
X-Git-Tag: 2.140.98^2~2^2~2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=a40dc89fe35bc6a3622128d30b13cfe5ceb9b00b;p=feisty_meow.git

moved where we do sudo now

only doing it on the two commands that need it.  rest of the script runs as normal user, which is the only way to keep our forwarded ssh credentials.
---

diff --git a/scripts/site_avenger/standup.sh b/scripts/site_avenger/standup.sh
index 77827674..96ec4cf3 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"
 
@@ -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,8 +82,8 @@ sep
 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.
-sudo -u $(logname) bash "$WORKDIR/powerup.sh" "$APPLICATION_NAME" "$REPO_NAME" "$THEME_NAME"
 # "$(logname)"
 
 sep
diff --git a/scripts/system/add_domain.sh b/scripts/system/add_domain.sh
index 48d5495c..e6b97fb6 100644
--- a/scripts/system/add_domain.sh
+++ b/scripts/system/add_domain.sh
@@ -8,6 +8,11 @@
 #
 # Author: Chris Koeritz
 
+export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )"  # obtain the script's working directory.
+export FEISTY_MEOW_APEX="$( \cd "$WORKDIR/../.." && \pwd )"
+
+source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"
+
 # some defaults that are convenient for current purposes.
 
 # hmmm: !!! these would need to be parameterized somehow for this script to become really general.