X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsystem%2Fadd_apache_site.sh;h=e99f371a1dec349de0c82cb79635c132d2044c42;hb=f9aa9387e92eaebc7f65421c5063b334165e7ffb;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..e99f371a 100644
--- a/scripts/system/add_apache_site.sh
+++ b/scripts/system/add_apache_site.sh
@@ -2,17 +2,22 @@
 
 # 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.
+source "$WORKDIR/../core/launch_feisty_meow.sh"
+
 # some convenient defaults for our current usage.
 
-BASEPATH="/var/www"
-SHADOWPATH="/srv/users/serverpilot/apps"
-STORAGESUFFIX="/public"
+BASE_PATH="$HOME/apps"
+STORAGE_SUFFIX="/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_path="$1"; shift
+
   local site_config="/etc/apache2/sites-available/${sitename}.conf"
 
   # check if config file already exists and bail if so.
@@ -27,23 +32,32 @@ function write_apache_config()
   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
+  # if no path, then we default to our standard app storage location.  otherwise, we
+  # put the site where they told us to.
+  if [ -z "$site_path" ]; then
+    # path where site gets checked out, in some arcane manner, and which happens to be
+    # above the path where we put webroot (in the storage suffix, if defined).
+    local path_above="${BASE_PATH}/${appname}"
+    # no slash between appname and suffix, in case suffix is empty.
+    local full_path="${path_above}${STORAGE_SUFFIX}"
+#echo really full path is $full_path
+  else
+    # we'll go with their specification for the site storage.
+    local full_path="$site_path"
   fi
 
-echo "
+  echo "
+# set up the user's web folder as an apache user web directory.
+
+# set permissions on the actual app folder.
+<Directory \"$full_path\">
+  Options +ExecCGI +Indexes +FollowSymLinks +Includes +MultiViews 
+  Require all granted
+</Directory>
+
 <VirtualHost *:80>
     ServerName ${sitename}
-#    ServerAlias ${sitename} *.${sitename}
-    DocumentRoot ${fullpath}
+    DocumentRoot ${full_path}
     ErrorLog \${APACHE_LOG_DIR}/${sitename}-error.log
     CustomLog \${APACHE_LOG_DIR}/${sitename}-access.log combined
     Include /etc/apache2/conf-library/basic-options.conf
@@ -69,7 +83,7 @@ function enable_site()
     echo "Please consult the apache error logs for more details."
     exit 1
   fi
-  rm "$outfile"
+  \rm "$outfile"
 }
 
 # restarts the apache2 service.
@@ -83,34 +97,32 @@ function restart_apache()
   fi
 }
 
-# sets up a link to represent the serverpilot storage location, while
-# still storing the files under /var/www.
-function create_shadow_path()
+# sets up the serverpilot storage location for a user hosted web site.
+function maybe_create_site_storage()
 {
-  # 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
-
-    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
+  local our_app="$1"; shift
+  # make sure the base path for storage of all the apps for this user exists.
+  local full_path="$BASE_PATH/$our_app"
+  if [ ! -d "$full_path" ]; then
+    mkdir -p $full_path
+    test_or_die "The app storage path could not be created.\n  Path in question is: $full_path"
   fi
+
+  # now give the web server some access to the folder.  this is crucial since the folders
+  # can be hosted in any user folder, and the group permissions will not necessarily be correct already.
+  local chow_path="$full_path"
+  # only the first chmod is recursive; the rest just apply to the specific folder of interest.
+  chmod -R g+rx "$chow_path"
+  # walk backwards up the path and fix perms.
+  while [[ $chow_path != $HOME ]]; do
+echo chow path is now $chow_path
+    chmod g+rx "$chow_path"
+    test_or_die "Failed to add group permissions on the path: $chow_path"
+    # reassert the user's ownership of any directories we might have just created.
+    chown $(logname) "$chow_path"
+    test_or_die "changing ownership to user failed on the path: $chow_path"
+    chow_path="$(dirname "$chow_path")"
+  done
 }
 
 # main body of script.
@@ -122,16 +134,24 @@ 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_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