Skip to content

Commit 98a5277

Browse files
author
Kristan Kenney
committed
Merge branch 'develop' of https://github.com/hestiacp/hestiacp into develop
2 parents 03e71ce + 8b0d763 commit 98a5277

File tree

122 files changed

+690
-61670
lines changed

Some content is hidden

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

122 files changed

+690
-61670
lines changed

‎bin/v-add-user‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ echo "$user:$password" | /usr/sbin/chpasswd
6363

6464
# Add a general group for normal users created by Hestia
6565
if [ -z "$(grep ^hestia-users: /etc/group)" ]; then
66-
groupadd "hestia-users"
66+
groupadd --system "hestia-users"
6767
fi
6868

6969
# Add membership to hestia-users group to non-admin users

‎bin/v-add-web-domain‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,6 @@ chmod 640 /var/log/$WEB_SYSTEM/domains/$domain.*
9292
chmod 751 $HOMEDIR/$user/web/$domain $HOMEDIR/$user/web/$domain/*
9393
chmod 551 $HOMEDIR/$user/web/$domain/stats $HOMEDIR/$user/web/$domain/logs
9494
chmod 644 $HOMEDIR/$user/web/$domain/public_*html/*
95-
chmod 751 $HOMEDIR/$user/web/$domain/public*_html/css
96-
chmod 751 $HOMEDIR/$user/web/$domain/public*_html/js
97-
chmod 751 $HOMEDIR/$user/web/$domain/public*_html/webfonts
98-
chmod 751 $HOMEDIR/$user/web/$domain/document_errors/css
99-
chmod 751 $HOMEDIR/$user/web/$domain/document_errors/js
100-
chmod 751 $HOMEDIR/$user/web/$domain/document_errors/webfonts
10195

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

‎bin/v-update-web-templates‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ fi
3838
#----------------------------------------------------------#
3939

4040
# Update templates
41+
if [ -d $HESTIA/data/templates/web ]; then
42+
rm -rf $HESTIA/data/templates/web/skel 2>/dev/null
43+
rm -rf $HESTIA/data/templates/web/suspend 2>/dev/null
44+
rm -rf $HESTIA/data/templates/web/unassigned 2>/dev/null
45+
fi
46+
4147
cp -rf $HESTIA/install/$type/templates/web $HESTIA/data/templates/
4248

4349
# Update Multi-PHP templates

‎func/rebuild.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,10 @@ rebuild_web_domain_conf() {
168168
fi
169169

170170
# Rebuilding domain directories
171+
if [ -d "$HOMEDIR/$user/web/$domain/document_errors" ]; then
172+
rm -rf "$HOMEDIR/$user/web/$domain/document_errors"
173+
fi
174+
171175
mkdir -p $HOMEDIR/$user/web/$domain \
172176
$HOMEDIR/$user/web/$domain/public_html \
173177
$HOMEDIR/$user/web/$domain/public_shtml \
@@ -193,7 +197,7 @@ rebuild_web_domain_conf() {
193197
cd /
194198

195199
# Propagating html skeleton
196-
if [ ! -e "$WEBTPL/skel/document_errors/" ]; then
200+
if [ -d "$WEBTPL/skel/document_errors/" ]; then
197201
cp -r $WEBTPL/skel/document_errors/ $HOMEDIR/$user/web/$domain/
198202
fi
199203

‎install/deb/templates/mail/nginx/default.stpl‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ server {
4343
location /error/ {
4444
alias /var/www/document_errors/;
4545
}
46-
47-
location /assets {
48-
root /var/www/document_errors;
49-
}
5046

5147
location @fallback {
5248
proxy_pass https://%ip%:%web_ssl_port%;

‎install/deb/templates/mail/nginx/default.tpl‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ server {
4444
alias /var/www/document_errors/;
4545
}
4646

47-
location /assets {
48-
root /var/www/document_errors;
49-
}
50-
5147
location @fallback {
5248
proxy_pass http://%ip%:%web_port%;
5349
}

‎install/deb/templates/mail/nginx/web_system.stpl‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ server {
4141
location /error/ {
4242
alias /var/www/document_errors/;
4343
}
44-
45-
location /assets {
46-
root /var/www/document_errors;
47-
}
4844

4945
include %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*;
5046
}

‎install/deb/templates/mail/nginx/web_system.tpl‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,5 @@ server {
4242
alias /var/www/document_errors/;
4343
}
4444

45-
location /assets {
46-
root /var/www/document_errors;
47-
}
48-
4945
include %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*;
5046
}

‎install/deb/templates/web/skel/document_errors/403.html‎

Lines changed: 88 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,101 @@
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<meta http-equiv="X-UA-Compatible" content="ie=edge">
7-
<link type="text/css" rel="stylesheet" href="assets/css/bootstrap.min.css">
8-
<link type="text/css" rel="stylesheet" href="assets/css/all.min.css">
9-
<link type="text/css" rel="stylesheet" href="assets/css/animate.css">
10-
<link type="text/css" rel="stylesheet" href="assets/css/style.css">
117
<title>Access Denied</title>
8+
<style type="text/css">
9+
body {
10+
background-color: #f5f5f5;
11+
margin-top: 8%;
12+
color: #5d5d5d;
13+
font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
14+
text-shadow: 0px 1px 1px rgba(255,255,255,0.75);
15+
text-align: center !important;
16+
}
17+
18+
h1 {
19+
font-size: 2.45em;
20+
font-weight: 700;
21+
color: #5d5d5d;
22+
letter-spacing: -0.02em;
23+
margin-bottom: 30px;
24+
margin-top: 30px;
25+
}
26+
27+
.container {
28+
width: 100%;
29+
margin-right: auto;
30+
margin-left: auto;
31+
}
32+
33+
.animated {
34+
-webkit-animation-duration: 1s;
35+
animation-duration: 1s;
36+
-webkit-animation-fill-mode: both;
37+
animation-fill-mode: both;
38+
}
39+
40+
.fadeIn {
41+
-webkit-animation-name: fadeIn;
42+
animation-name: fadeIn;
43+
}
44+
45+
.info {
46+
color:#5594cf;
47+
fill:#5594cf;
48+
}
49+
50+
.error {
51+
color:#c92127;
52+
fill:#c92127;
53+
}
54+
55+
.warning {
56+
color:#ffcc33;
57+
fill:#ffcc33;
58+
}
59+
60+
.success {
61+
color:#5aba47;
62+
fill:#5aba47;
63+
}
64+
65+
.icon-large {
66+
height: 132px;
67+
width: 132px;
68+
}
69+
70+
.description-text {
71+
color: #707070;
72+
letter-spacing: -0.01em;
73+
font-size: 1.25em;
74+
line-height: 20px;
75+
}
76+
77+
.footer {
78+
margin-top: 40px;
79+
font-size: 0.7em;
80+
}
81+
82+
.delay-1s {
83+
-webkit-animation-delay: 1s;
84+
animation-delay: 1s;
85+
}
86+
87+
@keyframes fadeIn {
88+
from { opacity: 0; }
89+
to { opacity: 1; }
90+
}
91+
92+
</style>
1293
</head>
1394
<body>
1495
<div class="container text-center">
1596
<div class="row">
1697
<div class="col">
1798
<div class="animated fadeIn">
18-
<i class="fas fa-times-circle icon-large error"></i>
99+
<svg class="error icon-large fa-times-circle" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
100+
<path d="M256 8C119 8 8 119 8 256s111 248 248 248 248-111 248-248S393 8 256 8zm121.6 313.1c4.7 4.7 4.7 12.3 0 17L338 377.6c-4.7 4.7-12.3 4.7-17 0L256 312l-65.1 65.6c-4.7 4.7-12.3 4.7-17 0L134.4 338c-4.7-4.7-4.7-12.3 0-17l65.6-65-65.6-65.1c-4.7-4.7-4.7-12.3 0-17l39.6-39.6c4.7-4.7 12.3-4.7 17 0l65 65.7 65.1-65.6c4.7-4.7 12.3-4.7 17 0l39.6 39.6c4.7 4.7 4.7 12.3 0 17L312 256l65.6 65.1z"></path>
101+
</svg>
19102
</div>
20103
<h1 class="animated fadeIn">Access Denied</h1>
21104
<div class="description-text animated fadeIn delay-1s">
@@ -26,7 +109,5 @@ <h1 class="animated fadeIn">Access Denied</h1>
26109
</div>
27110
</div>
28111
</div>
29-
30-
<script src="assets/js/bootstrap.min.js"></script>
31112
</body>
32113
</html>

‎install/deb/templates/web/skel/document_errors/404.html‎

Lines changed: 88 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,101 @@
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<meta http-equiv="X-UA-Compatible" content="ie=edge">
7-
<link type="text/css" rel="stylesheet" href="assets/css/bootstrap.min.css">
8-
<link type="text/css" rel="stylesheet" href="assets/css/all.min.css">
9-
<link type="text/css" rel="stylesheet" href="assets/css/animate.css">
10-
<link type="text/css" rel="stylesheet" href="assets/css/style.css">
117
<title>Page Not Found</title>
8+
<style type="text/css">
9+
body {
10+
background-color: #f5f5f5;
11+
margin-top: 8%;
12+
color: #5d5d5d;
13+
font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
14+
text-shadow: 0px 1px 1px rgba(255,255,255,0.75);
15+
text-align: center !important;
16+
}
17+
18+
h1 {
19+
font-size: 2.45em;
20+
font-weight: 700;
21+
color: #5d5d5d;
22+
letter-spacing: -0.02em;
23+
margin-bottom: 30px;
24+
margin-top: 30px;
25+
}
26+
27+
.container {
28+
width: 100%;
29+
margin-right: auto;
30+
margin-left: auto;
31+
}
32+
33+
.animated {
34+
-webkit-animation-duration: 1s;
35+
animation-duration: 1s;
36+
-webkit-animation-fill-mode: both;
37+
animation-fill-mode: both;
38+
}
39+
40+
.fadeIn {
41+
-webkit-animation-name: fadeIn;
42+
animation-name: fadeIn;
43+
}
44+
45+
.info {
46+
color:#5594cf;
47+
fill:#5594cf;
48+
}
49+
50+
.error {
51+
color:#c92127;
52+
fill:#c92127;
53+
}
54+
55+
.warning {
56+
color:#ffcc33;
57+
fill:#ffcc33;
58+
}
59+
60+
.success {
61+
color:#5aba47;
62+
fill:#5aba47;
63+
}
64+
65+
.icon-large {
66+
height: 132px;
67+
width: 132px;
68+
}
69+
70+
.description-text {
71+
color: #707070;
72+
letter-spacing: -0.01em;
73+
font-size: 1.25em;
74+
line-height: 20px;
75+
}
76+
77+
.footer {
78+
margin-top: 40px;
79+
font-size: 0.7em;
80+
}
81+
82+
.delay-1s {
83+
-webkit-animation-delay: 1s;
84+
animation-delay: 1s;
85+
}
86+
87+
@keyframes fadeIn {
88+
from { opacity: 0; }
89+
to { opacity: 1; }
90+
}
91+
92+
</style>
1293
</head>
1394
<body>
1495
<div class="container text-center">
1596
<div class="row">
1697
<div class="col">
1798
<div class="animated fadeIn">
18-
<i class="fas fa-question-circle icon-large info"></i>
99+
<svg class="info icon-large fa-question-circle" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
100+
<path d="M504 256c0 136.997-111.043 248-248 248S8 392.997 8 256C8 119.083 119.043 8 256 8s248 111.083 248 248zM262.655 90c-54.497 0-89.255 22.957-116.549 63.758-3.536 5.286-2.353 12.415 2.715 16.258l34.699 26.31c5.205 3.947 12.621 3.008 16.665-2.122 17.864-22.658 30.113-35.797 57.303-35.797 20.429 0 45.698 13.148 45.698 32.958 0 14.976-12.363 22.667-32.534 33.976C247.128 238.528 216 254.941 216 296v4c0 6.627 5.373 12 12 12h56c6.627 0 12-5.373 12-12v-1.333c0-28.462 83.186-29.647 83.186-106.667 0-58.002-60.165-102-116.531-102zM256 338c-25.365 0-46 20.635-46 46 0 25.364 20.635 46 46 46s46-20.636 46-46c0-25.365-20.635-46-46-46z"></path>
101+
</svg>
19102
</div>
20103
<h1 class="animated fadeIn">Page Not Found</h1>
21104
<div class="description-text animated fadeIn delay-1s">
@@ -26,7 +109,5 @@ <h1 class="animated fadeIn">Page Not Found</h1>
26109
</div>
27110
</div>
28111
</div>
29-
30-
<script src="assets/js/bootstrap.min.js"></script>
31112
</body>
32113
</html>

0 commit comments

Comments
 (0)