X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsystem%2Fadd_apache_site.sh;h=e99f371a1dec349de0c82cb79635c132d2044c42;hb=7c691be10be57164d5338635245572801c8068b3;hp=fe77ae7c871e29bdbf71bb4ac24bbd3c04d4b1db;hpb=895fce4bfda94674dbfd44ad6c9fa8ef13cbe465;p=feisty_meow.git
diff --git a/scripts/system/add_apache_site.sh b/scripts/system/add_apache_site.sh
index fe77ae7c..e99f371a 100644
--- a/scripts/system/add_apache_site.sh
+++ b/scripts/system/add_apache_site.sh
@@ -4,7 +4,6 @@
# 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.
-echo WORKDIR is $WORKDIR
source "$WORKDIR/../core/launch_feisty_meow.sh"
# some convenient defaults for our current usage.
@@ -17,6 +16,8 @@ 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.
@@ -31,25 +32,31 @@ function write_apache_config()
echo "Creating a new apache2 site for $sitename with config file:"
echo " $site_config"
- local full_path="${BASE_PATH}/${appname}${STORAGE_SUFFIX}"
-echo really full path is $full_path
-
-#no, bad! the public folder will be a link.
-# will apache be happy if the site folder doesn't exist yet?
-# # make the storage directory if it's not already present.
-# if [ ! -d "$full_path" ]; then
-# mkdir -p "$full_path"
-# if [ $? -ne 0 ]; then
-# echo "Failed to create the storage directory for $appname in"
-# echo "the folder: $full_path"
-# exit 1
-# fi
-# fi
-
-echo "
+ # 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 "
+# set up the user's web folder as an apache user web directory.
+
+# set permissions on the actual app folder.
+
+ Options +ExecCGI +Indexes +FollowSymLinks +Includes +MultiViews
+ Require all granted
+
+
ServerName ${sitename}
-# ServerAlias ${sitename} *.${sitename}
DocumentRoot ${full_path}
ErrorLog \${APACHE_LOG_DIR}/${sitename}-error.log
CustomLog \${APACHE_LOG_DIR}/${sitename}-access.log combined
@@ -76,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.
@@ -90,33 +97,30 @@ function restart_apache()
fi
}
-# chown folder to group www-data. can be done without setting a user, right?
-
# 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"
-echo full path is $full_path
if [ ! -d "$full_path" ]; then
mkdir -p $full_path
- check_result "The app storage path could not be created.\n Path in question is: $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 usually be only for the user.
- chown -R $USER:www-data "$BASE_PATH"
- check_result "Failed to set www-data as the owner on the path: $full_path"
- # note that web serving will also hose up unless the path to the folder is writable. so we walk backwards
- # and make sure group access is available.
+ # 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 -R g+rx "$chow_path"
- check_result "Failed to add group permissions for www-data on the path: $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 $USER "$chow_path"
- check_result "changing ownership to user failed on the path: $chow_path"
+ chown $(logname) "$chow_path"
+ test_or_die "changing ownership to user failed on the path: $chow_path"
chow_path="$(dirname "$chow_path")"
done
}
@@ -130,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
maybe_create_site_storage "$appname"
-write_apache_config "$appname" "$site"
+write_apache_config "$appname" "$site" "$site_path"
enable_site "$site"
restart_apache