Skip to content

Commit e9f3c39

Browse files
author
Kristan Kenney
committed
Reorganize file system layout
1 parent c06eb31 commit e9f3c39

Some content is hidden

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

88 files changed

+129
-129
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ fi
7878
chmod 660 $USER_DATA/ssl/$domain.*
7979

8080
# 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
81+
cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/web/$domain/ssl/$domain.crt
82+
cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/web/$domain/ssl/$domain.key
83+
cp -f $USER_DATA/ssl/$domain.pem $HOMEDIR/$user/conf/web/$domain/ssl/$domain.pem
8484
if [ -e "$USER_DATA/ssl/$domain.ca" ]; then
85-
cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/ssl.$domain.ca
85+
cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/$domain/ssl/$domain.ca
8686
fi
8787

8888
# Parsing domain values

‎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-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

‎bin/v-delete-web-domain‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ del_web_config "$WEB_SYSTEM" "$TPL.tpl"
6666
if [ "$SSL" = 'yes' ]; then
6767
del_web_config "$WEB_SYSTEM" "$TPL.stpl"
6868
$BIN/v-delete-web-domain-ssl-force $user $domain
69-
rm -f $HOMEDIR/$user/conf/web/ssl.$domain.*
69+
rm -f $HOMEDIR/$user/conf/web/$domain/ssl/$domain.*
7070
rm -f $USER_DATA/ssl/$domain.*
7171
fi
7272

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ fi
5757

5858
# Deleting old certificate
5959
tmpdir=$(mktemp -p $HOMEDIR/$user/web/$domain/private -d)
60-
rm -f $HOMEDIR/$user/conf/web/ssl.$domain.*
60+
rm -f $HOMEDIR/$user/conf/web/$domain/ssl/$domain.*
6161
mv $USER_DATA/ssl/$domain.* $tmpdir
6262
chown -R $user:$user $tmpdir
6363

‎bin/v-rebuild-web-domains‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,23 @@ is_object_unsuspended 'user' 'USER' "$user"
3838

3939
# Deleting old web configs
4040
sed -i "/.*\/$user\/conf\/web\//d" /etc/$WEB_SYSTEM/conf.d/hestia.conf
41-
if [ -e "$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf" ]; then
42-
rm $HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf
41+
if [ -e "$HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.conf" ]; then
42+
rm $HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.conf
4343
fi
44-
if [ -e "$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf" ]; then
45-
rm $HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf
44+
if [ -e "$HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.ssl.conf" ]; then
45+
rm $HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.ssl.conf
4646
fi
4747

4848
# Deleting old proxy configs
4949
if [ ! -z "$PROXY_SYSTEM" ]; then
5050
sed -i "/.*\/$user\/conf\/web\//d" /etc/$PROXY_SYSTEM/conf.d/hestia.conf
5151

52-
if [ -e "$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf" ]; then
53-
rm $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf
52+
if [ -e "$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.conf" ]; then
53+
rm $HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.conf
5454
fi
5555

56-
if [ -e "$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf" ]; then
57-
rm $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf
56+
if [ -e "$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.ssl.conf" ]; then
57+
rm $HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.ssl.conf
5858
fi
5959
fi
6060

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ chmod 660 $USER_DATA/ssl/$domain.*
6565

6666

6767
# Adding certificate to user dir
68-
cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/web/ssl.$domain.crt
69-
cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/web/ssl.$domain.key
70-
cp -f $USER_DATA/ssl/$domain.pem $HOMEDIR/$user/conf/web/ssl.$domain.pem
68+
cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/web/$domain/ssl/$domain.crt
69+
cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/web/$domain/ssl/$domain.key
70+
cp -f $USER_DATA/ssl/$domain.pem $HOMEDIR/$user/conf/web/$domain/ssl/$domain.pem
7171
if [ -e "$USER_DATA/ssl/$domain.ca" ]; then
72-
cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/ssl.$domain.ca
72+
cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/$domain/ssl/$domain.ca
7373
fi
7474

7575

‎func/domain.sh‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,10 @@ prepare_web_domain_values() {
173173
ssl_ca_str=''
174174
prepare_web_aliases $ALIAS
175175

176-
ssl_crt="$HOMEDIR/$user/conf/web/ssl.$domain.crt"
177-
ssl_key="$HOMEDIR/$user/conf/web/ssl.$domain.key"
178-
ssl_pem="$HOMEDIR/$user/conf/web/ssl.$domain.pem"
179-
ssl_ca="$HOMEDIR/$user/conf/web/ssl.$domain.ca"
176+
ssl_crt="$HOMEDIR/$user/conf/web/$domain/ssl/$domain.crt"
177+
ssl_key="$HOMEDIR/$user/conf/web/$domain/ssl/$domain.key"
178+
ssl_pem="$HOMEDIR/$user/conf/web/$domain/ssl/$domain.pem"
179+
ssl_ca="$HOMEDIR/$user/conf/web/$domain/ssl/$domain.ca"
180180
if [ ! -e "$USER_DATA/ssl/$domain.ca" ]; then
181181
ssl_ca_str='#'
182182
fi
@@ -188,9 +188,9 @@ prepare_web_domain_values() {
188188

189189
# Add web config
190190
add_web_config() {
191-
conf="$HOMEDIR/$user/conf/web/$domain.$1.conf"
191+
conf="$HOMEDIR/$user/conf/web/$domain/$1.conf"
192192
if [[ "$2" =~ stpl$ ]]; then
193-
conf="$HOMEDIR/$user/conf/web/$domain.$1.ssl.conf"
193+
conf="$HOMEDIR/$user/conf/web/$domain/$1.ssl.conf"
194194
fi
195195

196196
domain_idn=$domain
@@ -228,12 +228,10 @@ add_web_config() {
228228
chown root:$user $conf
229229
chmod 640 $conf
230230

231-
if [ -z "$(grep "$conf" /etc/$1/conf.d/hestia.conf)" ]; then
232-
if [ "$1" != 'nginx' ]; then
233-
echo "Include $conf" >> /etc/$1/conf.d/hestia.conf
234-
else
235-
echo "include $conf;" >> /etc/$1/conf.d/hestia.conf
236-
fi
231+
if [ "$1" != 'nginx' ]; then
232+
ln -s $HOMEDIR/$user/conf/web/$domain/$1.conf /etc/$1/conf.d/domains/$domain.conf
233+
else
234+
ln -s $HOMEDIR/$user/conf/web/$domain/$1.conf /etc/$1/conf.d/domains/$domain.conf
237235
fi
238236

239237
trigger="${2/.*pl/.sh}"
@@ -272,9 +270,9 @@ get_web_config_lines() {
272270

273271
# Replace web config
274272
replace_web_config() {
275-
conf="$HOMEDIR/$user/conf/web/$domain.$1.conf"
273+
conf="$HOMEDIR/$user/conf/web/$domain/$1.conf"
276274
if [[ "$2" =~ stpl$ ]]; then
277-
conf="$HOMEDIR/$user/conf/web/$domain.$1.ssl.conf"
275+
conf="$HOMEDIR/$user/conf/web/$domain/$1.ssl.conf"
278276
fi
279277

280278
if [ -e "$conf" ]; then
@@ -292,9 +290,9 @@ replace_web_config() {
292290

293291
# Delete web configuration
294292
del_web_config() {
295-
conf="$HOMEDIR/$user/conf/web/$domain.$1.conf"
293+
conf="$HOMEDIR/$user/conf/web/$domain/$1.conf"
296294
if [[ "$2" =~ stpl$ ]]; then
297-
conf="$HOMEDIR/$user/conf/web/$domain.$1.ssl.conf"
295+
conf="$HOMEDIR/$user/conf/web/$domain/$1.ssl.conf"
298296
fi
299297

300298
if [ -e "$conf" ]; then

‎func/rebuild.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -202,31 +202,31 @@ rebuild_web_domain_conf() {
202202
chown root:$user /var/log/$WEB_SYSTEM/domains/$domain.*
203203

204204
# Adding vhost configuration
205-
conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
205+
conf="$HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.conf"
206206
add_web_config "$WEB_SYSTEM" "$TPL.tpl"
207207

208208
# Adding SSL vhost configuration
209209
if [ "$SSL" = 'yes' ]; then
210-
conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
210+
conf="$HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.ssl.conf"
211211
add_web_config "$WEB_SYSTEM" "$TPL.stpl"
212212
cp -f $USER_DATA/ssl/$domain.crt \
213-
$HOMEDIR/$user/conf/web/ssl.$domain.crt
213+
$HOMEDIR/$user/conf/web/$domain/ssl/$domain.crt
214214
cp -f $USER_DATA/ssl/$domain.key \
215-
$HOMEDIR/$user/conf/web/ssl.$domain.key
215+
$HOMEDIR/$user/conf/web/$domain/ssl/$domain.key
216216
cp -f $USER_DATA/ssl/$domain.pem \
217-
$HOMEDIR/$user/conf/web/ssl.$domain.pem
217+
$HOMEDIR/$user/conf/web/$domain/ssl/$domain.pem
218218
if [ -e "$USER_DATA/ssl/$domain.ca" ]; then
219219
cp -f $USER_DATA/ssl/$domain.ca \
220-
$HOMEDIR/$user/conf/web/ssl.$domain.ca
220+
$HOMEDIR/$user/conf/web/$domain/ssl/$domain.ca
221221
fi
222222
fi
223223

224224
# Adding proxy configuration
225225
if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
226-
conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
226+
conf="$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.conf"
227227
add_web_config "$PROXY_SYSTEM" "$PROXY.tpl"
228228
if [ "$SSL" = 'yes' ]; then
229-
conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
229+
conf="$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.ssl.conf"
230230
add_web_config "$PROXY_SYSTEM" "$PROXY.stpl"
231231
fi
232232
fi

0 commit comments

Comments
 (0)