Skip to content

Commit 419506b

Browse files
author
Kristan Kenney
committed
Merge branch 'bugfix-mail-docerrors' into develop
2 parents 9f822be + 8a0a6c8 commit 419506b

27 files changed

+32
-16
lines changed

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

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

47+
location /assets {
48+
root /var/www/document_errors;
49+
}
50+
4751
location @fallback {
4852
proxy_pass https://%ip%:%web_ssl_port%;
4953
}

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

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

4751
location @fallback {
4852
proxy_pass http://%ip%:%web_port%;

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

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

4549
include %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*;
4650
}

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

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

4549
include %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*;
4650
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
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="css/bootstrap.min.css">
8-
<link type="text/css" rel="stylesheet" href="css/all.min.css">
9-
<link type="text/css" rel="stylesheet" href="css/animate.css">
10-
<link type="text/css" rel="stylesheet" href="css/style.css">
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">
1111
<title>Access Denied</title>
1212
</head>
1313
<body>
@@ -27,6 +27,6 @@ <h1 class="animated fadeIn">Access Denied</h1>
2727
</div>
2828
</div>
2929

30-
<script src="js/bootstrap.min.js"></script>
30+
<script src="assets/js/bootstrap.min.js"></script>
3131
</body>
3232
</html>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
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="css/bootstrap.min.css">
8-
<link type="text/css" rel="stylesheet" href="css/all.min.css">
9-
<link type="text/css" rel="stylesheet" href="css/animate.css">
10-
<link type="text/css" rel="stylesheet" href="css/style.css">
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">
1111
<title>Page Not Found</title>
1212
</head>
1313
<body>
@@ -27,6 +27,6 @@ <h1 class="animated fadeIn">Page Not Found</h1>
2727
</div>
2828
</div>
2929

30-
<script src="js/bootstrap.min.js"></script>
30+
<script src="assets/js/bootstrap.min.js"></script>
3131
</body>
32-
</html>
32+
</html>

‎install/deb/templates/web/skel/document_errors/50x.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
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="css/bootstrap.min.css">
8-
<link type="text/css" rel="stylesheet" href="css/all.min.css">
9-
<link type="text/css" rel="stylesheet" href="css/animate.css">
10-
<link type="text/css" rel="stylesheet" href="css/style.css">
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">
1111
<title>Internal Server Error</title>
1212
</head>
1313
<body>
@@ -27,6 +27,6 @@ <h1 class="animated fadeIn">Internal Server Error</h1>
2727
</div>
2828
</div>
2929

30-
<script src="js/bootstrap.min.js"></script>
30+
<script src="assets/js/bootstrap.min.js"></script>
3131
</body>
3232
</html>

install/deb/templates/web/skel/document_errors/css/all.min.css renamed to install/deb/templates/web/skel/document_errors/assets/css/all.min.css

File renamed without changes.

install/deb/templates/web/skel/document_errors/css/animate.css renamed to install/deb/templates/web/skel/document_errors/assets/css/animate.css

File renamed without changes.

install/deb/templates/web/skel/document_errors/css/bootstrap.min.css renamed to install/deb/templates/web/skel/document_errors/assets/css/bootstrap.min.css

File renamed without changes.

0 commit comments

Comments
 (0)