projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nearly live
[feisty_meow.git]
/
scripts
/
site_avenger
/
standup.sh
diff --git
a/scripts/site_avenger/standup.sh
b/scripts/site_avenger/standup.sh
index 56684b9cefd8d3bbdc06bb433f6345cb05be7d71..c31a33d8390e0e11487dec439146a08e780d3cdb 100644
(file)
--- a/
scripts/site_avenger/standup.sh
+++ b/
scripts/site_avenger/standup.sh
@@
-47,40
+47,47
@@
elif [ -z "$app_dirname" ]; then
print_instructions
fi
print_instructions
fi
-if [[ $EUID != 0 ]]; then
- echo "This script must be run as root or sudo."
- exit 1
-fi
+# force the sudo at the start of the script, rather than waiting halfway
+# through to ask for access.
+sudo bash -c 'echo sudo permissions acquired.'
source "$WORKDIR/shared_site_mgr.sh"
sep
source "$WORKDIR/shared_site_mgr.sh"
sep
-check_application_dir "$
APPLICATION_DIR
"
+check_application_dir "$
BASE_APPLICATION_PATH
"
# find proper webroot where the site will be initialized.
if [ -z "$app_dirname" ]; then
# no dir was passed, so guess it.
# find proper webroot where the site will be initialized.
if [ -z "$app_dirname" ]; then
# no dir was passed, so guess it.
- find_app_folder "$
APPLICATION_DIR
"
+ find_app_folder "$
BASE_APPLICATION_PATH
"
else
else
- test_app_folder "$
APPLICATION_DIR
" "$app_dirname"
+ test_app_folder "$
BASE_APPLICATION_PATH
" "$app_dirname"
fi
fi
-add_domain "$DOMAIN_NAME"
+#echo "!! domain being added is: $DOMAIN_NAME"
+
+sudo bash "$FEISTY_MEOW_SCRIPTS/system/add_domain.sh" "$DOMAIN_NAME"
test_or_die "Setting up domain: $DOMAIN_NAME"
sep
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
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"
+
powerup "$APPLICATION_NAME" "$REPO_NAME" "$THEME_NAME"
powerup "$APPLICATION_NAME" "$REPO_NAME" "$THEME_NAME"
+# pass the real user name who should own the files.
+# "$(logname)"
sep
echo "
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
+"