Skip to content

Commit 83cebba

Browse files
committed
Fix public_(s)html ownership
Fixes hestiacp#866, Fixes hestiacp#792 Thanks @drsdre
1 parent f6df8d3 commit 83cebba

File tree

3 files changed

+16
-0
lines changed

3 files changed

+16
-0
lines changed

bin/v-add-web-domain

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ chmod 640 /var/log/$WEB_SYSTEM/domains/$domain.*
9595
chmod 751 $HOMEDIR/$user/web/$domain $HOMEDIR/$user/web/$domain/*
9696
chmod 551 $HOMEDIR/$user/web/$domain/stats $HOMEDIR/$user/web/$domain/logs
9797
chmod 644 $HOMEDIR/$user/web/$domain/public_*html/*
98+
chown $user:www-data $HOMEDIR/$user/web/$domain/public_*html
9899

99100
# Addding PHP-FPM backend
100101
if [ ! -z "$WEB_BACKEND" ]; then

func/rebuild.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,9 @@ rebuild_web_domain_conf() {
393393
$HOMEDIR/$user/web/$domain/public_shtml \
394394
$HOMEDIR/$user/web/$domain/document_errors
395395
chmod 640 /var/log/$WEB_SYSTEM/domains/$domain.*
396+
397+
chown $user:www-data $HOMEDIR/$user/web/$domain/public_html \
398+
$HOMEDIR/$user/web/$domain/public_shtml
396399
}
397400

398401
# DNS domain rebuild

install/upgrade/versions/latest.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,15 @@ if [ -f "/etc/nginx/nginx.conf" ]; then
106106
sed -i '/^pid/ a include /etc/nginx/modules-enabled/*.conf;' /etc/nginx/nginx.conf
107107
fi
108108
fi
109+
110+
# Fix public_(s)html group ownership
111+
echo "(*) Updating public_(s)html ownership..."
112+
for user in $($HESTIA/bin/v-list-sys-users plain); do
113+
# skip users with missing home folder
114+
[[ -d /home/${user}/ ]] || continue
115+
116+
# skip users without web domains
117+
[[ ls /home/${user}/web/*/public_*html >/dev/null 2>&1 ]] || continue
118+
119+
chown --silent --no-dereference :www-data /home/$user/web/*/public_*html
120+
done

0 commit comments

Comments
 (0)