X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsystem%2Fadd_apache_site.sh;h=6b0956347d17406dc8ddc28e19354e89f1d6cea1;hb=d8b495333de90eab06c1b3f272fefd4bad4fcc9d;hp=558b418df8457f1a270b56d0b42c674e3d5919da;hpb=478fbf42ef8abd953a7f6687d5fee4c28fd9862f;p=feisty_meow.git

diff --git a/scripts/system/add_apache_site.sh b/scripts/system/add_apache_site.sh
index 558b418d..6b095634 100644
--- a/scripts/system/add_apache_site.sh
+++ b/scripts/system/add_apache_site.sh
@@ -2,11 +2,14 @@
 
 # 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()
@@ -27,48 +30,54 @@ function write_apache_config()
   echo "Creating a new apache2 site for $sitename with config file:"
   echo "  $site_config"
 
-  local fullpath="${BASEPATH}/${appname}${STORAGESUFFIX}"
+  # 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="${BASE_PATH}/${appname}${STORAGE_SUFFIX}"
+#echo really full path is $full_path
 
-  # 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
+  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>
 
-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
+    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
     Include /etc/apache2/conf-library/rewrite-enabling.conf
 </VirtualHost>
-"
-#fix
-# >"$site_config"
-
+" >"$site_config" 
 }
 
+# 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"
 
-  a2ensite "$(basename $site_config)"
+  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
@@ -79,6 +88,34 @@ function restart_apache()
   fi
 }
 
+# sets up the serverpilot storage location for a user hosted web site.
+function maybe_create_site_storage()
+{
+  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.
 
 if (( $EUID != 0 )); then
@@ -96,21 +133,7 @@ if [ -z "$appname" -o -z "$site" ]; then
   exit 1
 fi
 
-# 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
-  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
-
+maybe_create_site_storage "$appname"
 write_apache_config "$appname" "$site"
 enable_site "$site"
 restart_apache