X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsystem%2Fadd_apache_site.sh;h=909604bbe118b65adc2e590da8c5a1933e52b29e;hb=328a5c53f1329b16ad86f7bcdd8de3d843637419;hp=dadfb8c1889f100fd4036c71a2c4530a95888829;hpb=a96708606afc931c59f09480bd5df122f190e23f;p=feisty_meow.git
diff --git a/scripts/system/add_apache_site.sh b/scripts/system/add_apache_site.sh
index dadfb8c1..909604bb 100644
--- a/scripts/system/add_apache_site.sh
+++ b/scripts/system/add_apache_site.sh
@@ -39,53 +39,15 @@ function write_apache_config()
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.
-###
-### Options -ExecCGI +Indexes +FollowSymLinks +Includes
-### Order allow,deny
-### Allow from all
-###
-#### set permissions on the root of the home folders.
-###
-### Options -ExecCGI +Indexes +FollowSymLinks +Includes
-### Order allow,deny
-### Allow from all
-###
-#### set permissions on the user's home folder.
-###
-### Options -ExecCGI +Indexes +FollowSymLinks +Includes
-### Order allow,deny
-### Allow from all
-###
-#### set permissions on the user's storage folder for all apps.
-###
-### Options +ExecCGI +Indexes +FollowSymLinks +Includes +MultiViews
-### Order allow,deny
-### Allow from all
-###
-#### set permissions on the actual app folder.
-###
-### Options +ExecCGI +Indexes +FollowSymLinks +Includes +MultiViews
-### Order allow,deny
-### Allow from all
-###
# set permissions on the actual app folder.
Options +ExecCGI +Indexes +FollowSymLinks +Includes +MultiViews
-# Order allow,deny
-# Allow from all
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
@@ -126,8 +88,6 @@ 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()
{
@@ -140,16 +100,15 @@ function maybe_create_site_storage()
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.
+ # 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"
+echo chow path is now $chow_path
+ chmod g+rx "$chow_path"
+ check_result "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"
check_result "changing ownership to user failed on the path: $chow_path"