Skip to content

Commit ca40d98

Browse files
authored
Allow for optional domain directory write permissions (hestiacp#4109)
* evonet-domaindir-writable: rebuild.sh * evonet-domaindir-writable: v-add-web-domain * evonet-domaindir-writable: syshealth.sh * evonet-domaindir-writable: v-add-web-domain: update comment * evonet-domaindir-writable: rebuild.sh: update comment
1 parent 8951bde commit ca40d98

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

bin/v-add-web-domain

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,12 @@ chmod 640 /var/log/$WEB_SYSTEM/domains/$domain.*
126126
user_exec chmod 751 $HOMEDIR/$user/web/$domain/*
127127
user_exec chmod 551 $HOMEDIR/$user/web/$domain/stats $HOMEDIR/$user/web/$domain/logs
128128
user_exec chmod 644 $HOMEDIR/$user/web/$domain/public_*html/*
129-
user_exec chmod 551 $HOMEDIR/$user/web/$domain
129+
130+
# domain folder permissions: DOMAINDIR_WRITABLE: default-val:no source:hestia.conf
131+
DOMAINDIR_MODE=551
132+
if [ "$DOMAINDIR_WRITABLE" = 'yes' ]; then DOMAINDIR_MODE=751; fi
133+
134+
user_exec chmod $DOMAINDIR_MODE $HOMEDIR/$user/web/$domain
130135
chown --no-dereference $user:www-data $HOMEDIR/$user/web/$domain/public_*html
131136

132137
# Adding PHP-FPM backend

func/rebuild.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,9 +459,13 @@ rebuild_web_domain_conf() {
459459
chgrp $user $htpasswd $htaccess
460460
done
461461

462+
# domain folder permissions: DOMAINDIR_WRITABLE: default-val:no source:hestia.conf
463+
DOMAINDIR_MODE=551
464+
if [ "$DOMAINDIR_WRITABLE" = 'yes' ]; then DOMAINDIR_MODE=751; fi
465+
462466
# Set folder permissions
463-
no_symlink_chmod 551 $HOMEDIR/$user/web/$domain \
464-
$HOMEDIR/$user/web/$domain/stats \
467+
no_symlink_chmod $DOMAINDIR_MODE $HOMEDIR/$user/web/$domain
468+
no_symlink_chmod 551 $HOMEDIR/$user/web/$domain/stats \
465469
$HOMEDIR/$user/web/$domain/logs
466470
no_symlink_chmod 751 $HOMEDIR/$user/web/$domain/private \
467471
$HOMEDIR/$user/web/$domain/cgi-bin \

func/syshealth.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,10 @@ function syshealth_repair_system_config() {
538538
echo "[ ! ] Adding missing variable to hestia.conf: ROOT_USER ('admin')"
539539
$BIN/v-change-sys-config-value "ROOT_USER" "admin"
540540
fi
541+
if [[ -z $(check_key_exists 'DOMAINDIR_WRITABLE') ]]; then
542+
echo "[ ! ] Adding missing variable to hestia.conf: DOMAINDIR_WRITABLE ('no')"
543+
$BIN/v-change-sys-config-value "DOMAINDIR_WRITABLE" "no"
544+
fi
541545

542546
touch $HESTIA/conf/hestia.conf.new
543547
while IFS='= ' read -r lhs rhs; do

0 commit comments

Comments
 (0)