X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsystem%2Fadd_apache_site.sh;h=778b22d57d69733837dd271125e25a1d6c87bf96;hb=2c725838e22747dd922163daf376ea2b81395c5e;hp=e99f371a1dec349de0c82cb79635c132d2044c42;hpb=afa692de4ad15489f09323a37396fccfa5991a9c;p=feisty_meow.git diff --git a/scripts/system/add_apache_site.sh b/scripts/system/add_apache_site.sh index e99f371a..778b22d5 100644 --- a/scripts/system/add_apache_site.sh +++ b/scripts/system/add_apache_site.sh @@ -4,130 +4,23 @@ # 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" +export FEISTY_MEOW_APEX="$( \cd "$WORKDIR/../.." && \pwd )" -# some convenient defaults for our current usage. - -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. - 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" - - # 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. +source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh" +source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.sh" -# set permissions on the actual app folder. - - Options +ExecCGI +Indexes +FollowSymLinks +Includes +MultiViews - Require all granted - - - - ServerName ${sitename} - 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 - -" >"$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" - - 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 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 +# some convenient defaults for our current usage. - # 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 -} +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 @@ -146,7 +39,7 @@ This script needs to know (1) the application name for the new site and 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" + $BASE_APPLICATION_PATH/{app name}$STORAGE_SUFFIX" exit 1 fi