X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fsystem%2Fadd_apache_site.sh;h=c8c53a491c9d79eaed6a9e260cb6e0907c244577;hb=4204451f41c3b8c6b8e2abc0cbd8748bb02216ca;hp=a9a379fd748ad3a5901e8176471ed1d108685181;hpb=543af9c87fdcac20e6d1d928170d947d3a6a8378;p=feisty_meow.git diff --git a/scripts/system/add_apache_site.sh b/scripts/system/add_apache_site.sh index a9a379fd..c8c53a49 100644 --- a/scripts/system/add_apache_site.sh +++ b/scripts/system/add_apache_site.sh @@ -3,8 +3,8 @@ # creates a new apache website for a specified domain. # auto-find the scripts, since we might want to run this as sudo. -export WORKDIR="$( \cd "$(\dirname "$0")" && /bin/pwd )" # obtain the script's working directory. -export FEISTY_MEOW_APEX="$( \cd "$WORKDIR/../.." && \pwd )" +export THISDIR="$( \cd "$(\dirname "$0")" && /bin/pwd )" # obtain the script's working directory. +export FEISTY_MEOW_APEX="$( \cd "$THISDIR/../.." && \pwd )" source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh" source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.sh" @@ -12,7 +12,8 @@ source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.sh" # some convenient defaults for our current usage. if [ -z "$BASE_APPLICATION_PATH" ]; then - BASE_APPLICATION_PATH="$HOME/apps" + BASE_APPLICATION_PATH="$FEISTY_MEOW_REPOS_SCAN" +#hmmm: take just first item from the repos list! fi if [ -z "$STORAGE_SUFFIX" ]; then STORAGE_SUFFIX="/public" @@ -39,7 +40,7 @@ This script needs to know (1) the application name for the new site and appropriate name for a file-system compatible folder name. There is an optional third parameter (3) the path for site storage. If the site path is not provided, we'll use this path: - $BASE_APPLICATION_PATH/{app name}/$STORAGE_SUFFIX" + $BASE_APPLICATION_PATH/{app name}$STORAGE_SUFFIX" exit 1 fi