X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsystem%2Fadd_apache_site.sh;h=d3d4595d454bd82869da551a3593098c0936a3c4;hb=87e48192f16d2d8f36c9a44d436b29f76dfa7bc3;hp=897664e41a9b395f5f193efb1846ac36da48a7d4;hpb=6befcbe30e7be2bdf1d938f7cac1dba1ea9d84cb;p=feisty_meow.git

diff --git a/scripts/system/add_apache_site.sh b/scripts/system/add_apache_site.sh
index 897664e4..d3d4595d 100644
--- a/scripts/system/add_apache_site.sh
+++ b/scripts/system/add_apache_site.sh
@@ -2,136 +2,49 @@
 
 # creates a new apache website for a specified domain.
 
-# some convenient defaults for our current usage.
-
-BASEPATH="/var/www"
-SHADOWPATH="/srv/users/serverpilot/apps"
-STORAGESUFFIX="/public"
-
-# this function writes out the new configuration file for the site.
-function write_apache_config()
-{
-  local appname="$1"; shift
-  local sitename="$1"; shift
-  local site_config="/etc/apache2/sites-available/${sitename}.conf"
-
-  # check if config file already exists and bail if so.
-  if [ -f "$site_config" ]; then
-    echo "The apache configuration file already exists at:"
-    echo "  $site_config"
-    echo "Please remove this file before proceeding, if it is junk.  For example:"
-    echo "  sudo rm $site_config"
-    exit 1
-  fi
-
-  echo "Creating a new apache2 site for $sitename with config file:"
-  echo "  $site_config"
-
-  local fullpath="${BASEPATH}/${appname}${STORAGESUFFIX}"
-
-  # make the storage directory if it's not already present.
-  if [ ! -d "$fullpath" ]; then
-    mkdir -p "$fullpath"
-    if [ $? -ne 0 ]; then
-      echo "Failed to create the storage directory for $appname in"
-      echo "the folder: $fullpath"
-      exit 1
-    fi
-  fi
+# auto-find the scripts, since we might want to run this as sudo.
+export THISDIR="$( \cd "$(\dirname "$0")" && /bin/pwd )"  # obtain the script's working directory.
+export FEISTY_MEOW_APEX="$( \cd "$THISDIR/../.." && \pwd )"
 
-echo "
-<VirtualHost *:80>
-    ServerName ${sitename}
-#    ServerAlias ${sitename} *.${sitename}
-    DocumentRoot ${fullpath}
-    ErrorLog \${APACHE_LOG_DIR}/${sitename}-error.log
-    CustomLog \${APACHE_LOG_DIR}/${sitename}-access.log combined
-    Include /etc/apache2/conf-library/basic-options.conf
-    Include /etc/apache2/conf-library/rewrite-enabling.conf
-</VirtualHost>
-" >"$site_config" 
-}
+source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"
+source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.sh"
 
-# turns on the config file we create above for apache.
-function enable_site()
-{
-  local sitename="$1"; shift
-  local site_config="/etc/apache2/sites-available/${sitename}.conf"
-
-  outfile="$TMP/apacheout.$RANDOM"
-  a2ensite "$(basename $site_config)" &>$outfile
-  if [ $? -ne 0 ]; then
-    # an error happened, so we show the command's output at least.
-    cat $outfile
-    echo
-    echo "There was a problem enabling the apache config file in:"
-    echo "  $site_config"
-    echo "Please consult the apache error logs for more details."
-    exit 1
-  fi
-  rm "$outfile"
-}
-
-# restarts the apache2 service.
-function restart_apache()
-{
-  service apache2 restart
-  if [ $? -ne 0 ]; then
-    echo "There was a problem restarting the apache2 service."
-    echo "Please consult the apache error logs for more details."
-    exit 1
-  fi
-}
-
-# sets up a link to represent the serverpilot storage location, while
-# still storing the files under /var/www.
-function create_shadow_path()
-{
-  # make sure there is a symbolic link from the shadow path (that mimics the serverpilot
-  # storage set up) to the real storage directory.
-  if [ ! -L "$SHADOWPATH" ]; then
-    # create the path up to but not including the last component.
-    if [ ! -d $(dirname $SHADOWPATH) ]; then
-      mkdir -p $(dirname $SHADOWPATH)
-      if [ $? -ne 0 ]; then
-        echo "The parent of the shadow path could not be created."
-        echo "Path in question is: $(dirname $SHADOWPATH)"
-        exit 1
-      fi
-    fi
+# some convenient defaults for our current usage.
 
-    ln -s "$BASEPATH" "$SHADOWPATH"
-#hmmm: should we be okay with it if it's a real dir, and assume people are happy?
-#      this wouldn't work too well if we go plunk down the new thing in /var/www,
-#      if they are expecting this tool to totally meld with serverpilot.
-    if [ $? -ne 0 ]; then
-      echo "The shadow path for mimicking serverpilot could not be created."
-      echo "Is there a real directory present for this already?"
-      echo "Path in question is: $SHADOWPATH"
-      exit 1
-    fi
-  fi
-}
+if [ -z "$BASE_APPLICATION_PATH" ]; then
+  BASE_APPLICATION_PATH="$HOME/apps"
+fi
+if [ -z "$STORAGE_SUFFIX" ]; then
+  STORAGE_SUFFIX="/public"
+fi
 
 # main body of script.
 
-if (( $EUID != 0 )); then
+if [[ $EUID != 0 ]]; then
   echo "This script must be run as root or sudo."
   exit 1
 fi
 
 appname="$1"; shift
 site="$1"; shift
+site_path="$1"; shift
 
 if [ -z "$appname" -o -z "$site" ]; then
-  echo "This script needs to know (1) the appname (application name) for the new"
-  echo "site and (2) the DNS name for the apache virtual host."
-  echo "The appname should work as a file-system compatible folder name."
+#hmmm: move to a print_instructions function.
+  echo "
+$(basename $0): {app name} {dns name} [site path]
+
+This script needs to know (1) the application name for the new site and
+(2) the DNS name for the apache virtual host.  The appname should be an
+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"
   exit 1
 fi
 
-create_shadow_path
-write_apache_config "$appname" "$site"
+maybe_create_site_storage "$appname"
+write_apache_config "$appname" "$site" "$site_path"
 enable_site "$site"
 restart_apache