# 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()
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
+ # 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
+
+ echo "
+# set up the user's web folder as an apache user web directory.
+#UserDir apps
+#above didn't help either.
+
+#
+#all of below might be borked. trying different approach above.
+# set permissions on the root folders.
+###<Directory \"/\">
+### Options -ExecCGI +Indexes +FollowSymLinks +Includes
+### Order allow,deny
+### Allow from all
+###</Directory>
+#### set permissions on the root of the home folders.
+###<Directory \"/home\">
+### Options -ExecCGI +Indexes +FollowSymLinks +Includes
+### Order allow,deny
+### Allow from all
+###</Directory>
+#### set permissions on the user's home folder.
+###<Directory \"$HOME\">
+### Options -ExecCGI +Indexes +FollowSymLinks +Includes
+### Order allow,deny
+### Allow from all
+###</Directory>
+#### set permissions on the user's storage folder for all apps.
+###<Directory \"$BASE_PATH\">
+### Options +ExecCGI +Indexes +FollowSymLinks +Includes +MultiViews
+### Order allow,deny
+### Allow from all
+###</Directory>
+#### set permissions on the actual app folder.
+###<Directory \"$path_above\">
+### Options +ExecCGI +Indexes +FollowSymLinks +Includes +MultiViews
+### Order allow,deny
+### Allow from all
+###</Directory>
+
+# set permissions on the actual app folder.
+<Directory \"$full_path\">
+ Options +ExecCGI +Indexes +FollowSymLinks +Includes +MultiViews
+# Order allow,deny
+# Allow from all
+ Require all granted
+</Directory>
-echo "
<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
echo "Please consult the apache error logs for more details."
exit 1
fi
- rm "$outfile"
+ \rm "$outfile"
}
# restarts the apache2 service.
fi
}
-# sets up a link to represent the serverpilot storage location, while
-# still storing the files under /var/www.
-function create_shadow_path()
+# 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()
{
- # 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
+ check_result "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 $(logname):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.
+ local chow_path="$full_path"
+ 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"
+ # reassert the user's ownership of any directories we might have just created.
+ chown $(logname) "$chow_path"
+ check_result "changing ownership to user failed on the path: $chow_path"
+ chow_path="$(dirname "$chow_path")"
+ done
}
# main body of script.
exit 1
fi
-create_shadow_path
+maybe_create_site_storage "$appname"
write_apache_config "$appname" "$site"
enable_site "$site"
restart_apache
projects / feisty_meow.git / blobdiff