Skip to content

Commit 92f5194

Browse files
author
Kristan Kenney
committed
Merge branch 'mail-file-fixes' into mail-ssl
2 parents abbdf4f + 68f3161 commit 92f5194

File tree

104 files changed

+448
-351
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+448
-351
lines changed

‎bin/v-add-letsencrypt-domain‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ for auth in $authz; do
163163
check_result $? "DNS _acme-challenge record wasn't created"
164164
else
165165
if [ "$WEB_SYSTEM" = 'nginx' ] || [ ! -z "$PROXY_SYSTEM" ]; then
166-
conf="$HOMEDIR/$user/conf/web/$domain/nginx.conf_letsencrypt"
167-
sconf="$HOMEDIR/$user/conf/web/$domain/nginx.ssl.conf_letsencrypt"
166+
conf="$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.conf_letsencrypt"
167+
sconf="$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.conf_letsencrypt"
168168
if [ ! -e "$conf" ]; then
169169
echo 'location ~ "^/\.well-known/acme-challenge/(.*)$" {' \
170170
> $conf

‎bin/v-add-web-domain-httpauth‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ source $HESTIA/func/domain.sh
2222
source $HESTIA/conf/hestia.conf
2323

2424
# Defining htpasswd file
25-
htaccess="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.conf_htaccess"
26-
htpasswd="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.htpasswd"
27-
shtaccess="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.$domain.conf_htaccess"
28-
shtpasswd="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.$domain.htpasswd"
25+
htaccess="$HOMEDIR/$user/conf/web/$domain/htaccess"
26+
htpasswd="$HOMEDIR/$user/conf/web/$domain/htpasswd"
27+
shtaccess="$htaccess"
28+
shtpasswd="$htpasswd"
2929
docroot="$HOMEDIR/$user/web/$domain/public_html"
3030

3131

‎bin/v-add-web-domain-ssl‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,17 @@ if [ -e "$ssl_dir/$domain.ca" ]; then
7777
fi
7878
chmod 660 $USER_DATA/ssl/$domain.*
7979

80+
# Ensure SSL directory exists
81+
if [ ! -d $HOMEDIR/$user/conf/web/$domain/ssl ]; then
82+
mkdir -p $HOMEDIR/$user/conf/web/$domain/ssl/
83+
fi
84+
8085
# Adding certificate to user dir
81-
cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/web/ssl.$domain.crt
82-
cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/web/ssl.$domain.key
83-
cp -f $USER_DATA/ssl/$domain.pem $HOMEDIR/$user/conf/web/ssl.$domain.pem
86+
cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/web/$domain/ssl/$domain.crt
87+
cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/web/$domain/ssl/$domain.key
88+
cp -f $USER_DATA/ssl/$domain.pem $HOMEDIR/$user/conf/web/$domain/ssl/$domain.pem
8489
if [ -e "$USER_DATA/ssl/$domain.ca" ]; then
85-
cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/ssl.$domain.ca
90+
cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/$domain/ssl/$domain.ca
8691
fi
8792

8893
# Parsing domain values

‎bin/v-add-web-domain-ssl-force‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ if [ ! -z "$PROXY_SYSTEM" ] || [ ! -z "$PROXY" ]; then
4747
if ! grep --quiet "forcessl" $HESTIA/data/templates/web/nginx/default.tpl; then
4848
$BIN/v-update-web-templates
4949
fi
50-
forcessl="/home/$user/conf/web/forcessl.nginx.$domain.conf"
50+
forcessl="/home/$user/conf/web/$domain/$PROXY_SYSTEM.force-ssl.conf"
5151
else
5252
if ! grep --quiet "forcessl" $HESTIA/data/templates/web/nginx/default.tpl; then
5353
$BIN/v-update-web-templates
5454
fi
55-
forcessl="/home/$user/conf/web/forcessl.apache2.$domain.conf"
55+
forcessl="/home/$user/conf/web/$domain/$WEB_SYSTEM.force-ssl.conf"
5656
fi
5757

5858
# Insert redirect commands

‎bin/v-add-web-domain-stats‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ cat $WEBTPL/$type/$type.tpl |\
6767
-e "s|%home%|$HOMEDIR|g" \
6868
-e "s|%alias%|${aliases//,/ }|g" \
6969
-e "s|%alias_idn%|${aliases_idn//,/ }|g" \
70-
> $HOMEDIR/$user/conf/web/$type.$domain.conf
70+
> $HOMEDIR/$user/conf/web/$domain/$type.conf
7171

7272
if [ "$type" == 'awstats' ]; then
7373
rm -f /etc/awstats/$type.$domain_idn.conf
74-
ln -s $HOMEDIR/$user/conf/web/$type.$domain.conf \
74+
ln -s $HOMEDIR/$user/conf/web/$domain/$type.conf \
7575
/etc/awstats/$type.$domain_idn.conf
7676
fi
7777

‎bin/v-backup-user‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
145145
else
146146
# old style configs
147147
tpl_file="$WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/$TPL.tpl"
148-
conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
148+
conf="$HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.conf"
149149
get_web_config_lines $tpl_file $conf
150150
sed -n "$top_line,$bottom_line p" $conf > conf/$WEB_SYSTEM.conf
151151
fi
@@ -157,7 +157,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
157157
cp $conf conf/$WEB_SYSTEM.ssl.conf
158158
else
159159
tpl_file="$WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/$TPL.stpl"
160-
conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
160+
conf="$HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.ssl.conf"
161161
get_web_config_lines $tpl_file $conf
162162
sed -n "$top_line,$bottom_line p" $conf > \
163163
conf/s$WEB_SYSTEM.conf
@@ -171,7 +171,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
171171
cp $conf conf/$PROXY_SYSTEM.conf
172172
else
173173
tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
174-
conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
174+
conf="$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.conf"
175175
get_web_config_lines $tpl_file $conf
176176
sed -n "$top_line,$bottom_line p" $conf > \
177177
conf/$PROXY_SYSTEM.conf
@@ -185,7 +185,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
185185
cp $conf conf/$PROXY_SYSTEM.ssl.conf
186186
else
187187
tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
188-
conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
188+
conf="$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.ssl.conf"
189189
get_web_config_lines $tpl_file $conf
190190
sed -n "$top_line,$bottom_line p" $conf >\
191191
conf/s$PROXY_SYSTEM.conf
@@ -199,7 +199,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
199199

200200
# Backup ssl certificates
201201
if [ "$SSL" = 'yes' ] ; then
202-
cp $HOMEDIR/$user/conf/web/ssl.$domain.* conf/
202+
cp $HOMEDIR/$user/conf/web/$domain/ssl/$domain.* conf/
203203
cp $USER_DATA/ssl/$domain.* hestia/
204204
fi
205205

‎bin/v-change-web-domain-dirlist‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,18 @@ get_domain_values 'web'
4646

4747
if [ "$mode" = "on" ]; then
4848
# Enable directory listing
49-
sed -i "s/-Index/+Index/g" $HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.conf
49+
sed -i "s/-Index/+Index/g" $HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.conf
5050
if [ -e "$ssl_dir/$domain.ca" ]; then
5151
# Enable directory listing for SSL-enforced domains
52-
sed -i "s/-Index/+Index/g" $HOMEDIR/$user/conf/web/s$WEB_SYSTEM.$domain.conf
52+
sed -i "s/-Index/+Index/g" $HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.ssl.conf
5353
fi
5454
echo "INFO: Enabled directory browsing for $domain."
5555
else
5656
# Disable directory listing
57-
sed -i "s/+Index/-Index/g" $HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.conf
57+
sed -i "s/+Index/-Index/g" $HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.conf
5858
if [ -e "$ssl_dir/$domain.ca" ]; then
5959
# Enable directory listing for SSL-enforced domains
60-
sed -i "s/+Index/-Index/g" $HOMEDIR/$user/conf/web/s$WEB_SYSTEM.$domain.conf
60+
sed -i "s/+Index/-Index/g" $HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.ssl.conf
6161
fi
6262
echo "INFO: Disabled directory browsing for $domain."
6363
fi

‎bin/v-change-web-domain-httpauth‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ source $HESTIA/func/domain.sh
2121
source $HESTIA/conf/hestia.conf
2222

2323
# Defining htpasswd file
24-
htpasswd="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.htpasswd"
24+
htpasswd="$HOMEDIR/$user/conf/web/$domain/htpasswd"
2525

2626

2727
#----------------------------------------------------------#

‎bin/v-change-web-domain-name‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ if [ -e "$USER_DATA/ssl/$domain.crt" ]; then
8080
mv $domain.ca $new_domain.ca
8181
mv $domain.pem $new_domain.pem
8282
mv $domain.key $new_domain.key
83-
rm -f $HOMEDIR/$user/conf/web/ssl.$domain.*
83+
rm -f $HOMEDIR/$user/conf/web/$domain/ssl/$domain.*
8484
fi
8585

8686

‎bin/v-change-web-domain-sslcert‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ is_web_domain_cert_valid
4949

5050
# Deleting old certificate
5151
tmpdir=$(mktemp -p $HOMEDIR/$user/web/$domain/private -d)
52-
rm -f $HOMEDIR/$user/conf/web/ssl.$domain.*
52+
rm -f $HOMEDIR/$user/conf/web/$domain/ssl/$domain.*
5353
mv $USER_DATA/ssl/$domain.* $tmpdir
5454
chown -R $user:$user $tmpdir
5555

@@ -63,11 +63,11 @@ if [ -e "$ssl_dir/$domain.ca" ]; then
6363
fi
6464

6565
# Adding new certificate to user dir
66-
cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/web/ssl.$domain.crt
67-
cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/web/ssl.$domain.key
68-
cp -f $USER_DATA/ssl/$domain.pem $HOMEDIR/$user/conf/web/ssl.$domain.pem
66+
cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/web/$domain/ssl/$domain.crt
67+
cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/web/$domain/ssl/$domain.key
68+
cp -f $USER_DATA/ssl/$domain.pem $HOMEDIR/$user/conf/web/$domain/ssl/$domain.pem
6969
if [ -e "$USER_DATA/ssl/$domain.ca" ]; then
70-
cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/ssl.$domain.ca
70+
cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/$domain/ssl/$domain.ca
7171
fi
7272

7373

0 commit comments

Comments
 (0)