Browse Source

Fix document errors for mail domains

Fixes CSS/JS/Webfonts dependencies
Twissell 6 years ago
parent
commit
8a0a6c809e
27 changed files with 32 additions and 16 deletions
  1. 4 0
      install/deb/templates/mail/nginx/default.stpl
  2. 4 0
      install/deb/templates/mail/nginx/default.tpl
  3. 4 0
      install/deb/templates/mail/nginx/web_system.stpl
  4. 4 0
      install/deb/templates/mail/nginx/web_system.tpl
  5. 5 5
      install/deb/templates/web/skel/document_errors/403.html
  6. 6 6
      install/deb/templates/web/skel/document_errors/404.html
  7. 5 5
      install/deb/templates/web/skel/document_errors/50x.html
  8. 0 0
      install/deb/templates/web/skel/document_errors/assets/css/all.min.css
  9. 0 0
      install/deb/templates/web/skel/document_errors/assets/css/animate.css
  10. 0 0
      install/deb/templates/web/skel/document_errors/assets/css/bootstrap.min.css
  11. 0 0
      install/deb/templates/web/skel/document_errors/assets/css/style.css
  12. 0 0
      install/deb/templates/web/skel/document_errors/assets/js/bootstrap.min.js
  13. 0 0
      install/deb/templates/web/skel/document_errors/assets/webfonts/fa-brands-400.eot
  14. 0 0
      install/deb/templates/web/skel/document_errors/assets/webfonts/fa-brands-400.svg
  15. 0 0
      install/deb/templates/web/skel/document_errors/assets/webfonts/fa-brands-400.ttf
  16. 0 0
      install/deb/templates/web/skel/document_errors/assets/webfonts/fa-brands-400.woff
  17. 0 0
      install/deb/templates/web/skel/document_errors/assets/webfonts/fa-brands-400.woff2
  18. 0 0
      install/deb/templates/web/skel/document_errors/assets/webfonts/fa-regular-400.eot
  19. 0 0
      install/deb/templates/web/skel/document_errors/assets/webfonts/fa-regular-400.svg
  20. 0 0
      install/deb/templates/web/skel/document_errors/assets/webfonts/fa-regular-400.ttf
  21. 0 0
      install/deb/templates/web/skel/document_errors/assets/webfonts/fa-regular-400.woff
  22. 0 0
      install/deb/templates/web/skel/document_errors/assets/webfonts/fa-regular-400.woff2
  23. 0 0
      install/deb/templates/web/skel/document_errors/assets/webfonts/fa-solid-900.eot
  24. 0 0
      install/deb/templates/web/skel/document_errors/assets/webfonts/fa-solid-900.svg
  25. 0 0
      install/deb/templates/web/skel/document_errors/assets/webfonts/fa-solid-900.ttf
  26. 0 0
      install/deb/templates/web/skel/document_errors/assets/webfonts/fa-solid-900.woff
  27. 0 0
      install/deb/templates/web/skel/document_errors/assets/webfonts/fa-solid-900.woff2

+ 4 - 0
install/deb/templates/mail/nginx/default.stpl

@@ -44,6 +44,10 @@ server {
         alias /var/www/document_errors/;
     }
 
+	location /assets {
+        root /var/www/document_errors;
+    }
+	
     location @fallback {
         proxy_pass https://%ip%:%web_ssl_port%;
     }

+ 4 - 0
install/deb/templates/mail/nginx/default.tpl

@@ -43,6 +43,10 @@ server {
     location /error/ {
         alias /var/www/document_errors/;
     }
+	
+	location /assets {
+        root /var/www/document_errors;
+    }
 
     location @fallback {
         proxy_pass http://%ip%:%web_port%;

+ 4 - 0
install/deb/templates/mail/nginx/web_system.stpl

@@ -41,6 +41,10 @@ server {
     location /error/ {
         alias /var/www/document_errors/;
     }
+	
+	location /assets {
+        root /var/www/document_errors;
+    }
 
     include %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*;
 }

+ 4 - 0
install/deb/templates/mail/nginx/web_system.tpl

@@ -41,6 +41,10 @@ server {
     location /error/ {
         alias /var/www/document_errors/;
     }
+	
+	location /assets {
+        root /var/www/document_errors;
+    }
 
     include %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*;
 }

+ 5 - 5
install/deb/templates/web/skel/document_errors/403.html

@@ -4,10 +4,10 @@
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta http-equiv="X-UA-Compatible" content="ie=edge">
-<link type="text/css" rel="stylesheet" href="css/bootstrap.min.css">
-<link type="text/css" rel="stylesheet" href="css/all.min.css">
-<link type="text/css" rel="stylesheet" href="css/animate.css">
-<link type="text/css" rel="stylesheet" href="css/style.css">   
+<link type="text/css" rel="stylesheet" href="assets/css/bootstrap.min.css">
+<link type="text/css" rel="stylesheet" href="assets/css/all.min.css">
+<link type="text/css" rel="stylesheet" href="assets/css/animate.css">
+<link type="text/css" rel="stylesheet" href="assets/css/style.css">   
 <title>Access Denied</title>
 </head>
 <body>
@@ -27,6 +27,6 @@
     </div>
 </div>
     
-<script src="js/bootstrap.min.js"></script>
+<script src="assets/js/bootstrap.min.js"></script>
 </body>
 </html>

+ 6 - 6
install/deb/templates/web/skel/document_errors/404.html

@@ -4,10 +4,10 @@
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta http-equiv="X-UA-Compatible" content="ie=edge">
-<link type="text/css" rel="stylesheet" href="css/bootstrap.min.css">
-<link type="text/css" rel="stylesheet" href="css/all.min.css">
-<link type="text/css" rel="stylesheet" href="css/animate.css">
-<link type="text/css" rel="stylesheet" href="css/style.css">   
+<link type="text/css" rel="stylesheet" href="assets/css/bootstrap.min.css">
+<link type="text/css" rel="stylesheet" href="assets/css/all.min.css">
+<link type="text/css" rel="stylesheet" href="assets/css/animate.css">
+<link type="text/css" rel="stylesheet" href="assets/css/style.css">   
 <title>Page Not Found</title>
 </head>
 <body>
@@ -27,6 +27,6 @@
     </div>
 </div>
     
-<script src="js/bootstrap.min.js"></script>
+<script src="assets/js/bootstrap.min.js"></script>
 </body>
-</html>
+</html>

+ 5 - 5
install/deb/templates/web/skel/document_errors/50x.html

@@ -4,10 +4,10 @@
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta http-equiv="X-UA-Compatible" content="ie=edge">
-<link type="text/css" rel="stylesheet" href="css/bootstrap.min.css">
-<link type="text/css" rel="stylesheet" href="css/all.min.css">
-<link type="text/css" rel="stylesheet" href="css/animate.css">
-<link type="text/css" rel="stylesheet" href="css/style.css">   
+<link type="text/css" rel="stylesheet" href="assets/css/bootstrap.min.css">
+<link type="text/css" rel="stylesheet" href="assets/css/all.min.css">
+<link type="text/css" rel="stylesheet" href="assets/css/animate.css">
+<link type="text/css" rel="stylesheet" href="assets/css/style.css">   
 <title>Internal Server Error</title>
 </head>
 <body>
@@ -27,6 +27,6 @@
     </div>
 </div>
     
-<script src="js/bootstrap.min.js"></script>
+<script src="assets/js/bootstrap.min.js"></script>
 </body>
 </html>

+ 0 - 0
install/deb/templates/web/skel/document_errors/css/all.min.css → install/deb/templates/web/skel/document_errors/assets/css/all.min.css


+ 0 - 0
install/deb/templates/web/skel/document_errors/css/animate.css → install/deb/templates/web/skel/document_errors/assets/css/animate.css


+ 0 - 0
install/deb/templates/web/skel/document_errors/css/bootstrap.min.css → install/deb/templates/web/skel/document_errors/assets/css/bootstrap.min.css


+ 0 - 0
install/deb/templates/web/skel/document_errors/css/style.css → install/deb/templates/web/skel/document_errors/assets/css/style.css


+ 0 - 0
install/deb/templates/web/skel/document_errors/js/bootstrap.min.js → install/deb/templates/web/skel/document_errors/assets/js/bootstrap.min.js


+ 0 - 0
install/deb/templates/web/skel/document_errors/webfonts/fa-brands-400.eot → install/deb/templates/web/skel/document_errors/assets/webfonts/fa-brands-400.eot


+ 0 - 0
install/deb/templates/web/skel/document_errors/webfonts/fa-brands-400.svg → install/deb/templates/web/skel/document_errors/assets/webfonts/fa-brands-400.svg


+ 0 - 0
install/deb/templates/web/skel/document_errors/webfonts/fa-brands-400.ttf → install/deb/templates/web/skel/document_errors/assets/webfonts/fa-brands-400.ttf


+ 0 - 0
install/deb/templates/web/skel/document_errors/webfonts/fa-brands-400.woff → install/deb/templates/web/skel/document_errors/assets/webfonts/fa-brands-400.woff


+ 0 - 0
install/deb/templates/web/skel/document_errors/webfonts/fa-brands-400.woff2 → install/deb/templates/web/skel/document_errors/assets/webfonts/fa-brands-400.woff2


+ 0 - 0
install/deb/templates/web/skel/document_errors/webfonts/fa-regular-400.eot → install/deb/templates/web/skel/document_errors/assets/webfonts/fa-regular-400.eot


+ 0 - 0
install/deb/templates/web/skel/document_errors/webfonts/fa-regular-400.svg → install/deb/templates/web/skel/document_errors/assets/webfonts/fa-regular-400.svg


+ 0 - 0
install/deb/templates/web/skel/document_errors/webfonts/fa-regular-400.ttf → install/deb/templates/web/skel/document_errors/assets/webfonts/fa-regular-400.ttf


+ 0 - 0
install/deb/templates/web/skel/document_errors/webfonts/fa-regular-400.woff → install/deb/templates/web/skel/document_errors/assets/webfonts/fa-regular-400.woff


+ 0 - 0
install/deb/templates/web/skel/document_errors/webfonts/fa-regular-400.woff2 → install/deb/templates/web/skel/document_errors/assets/webfonts/fa-regular-400.woff2


+ 0 - 0
install/deb/templates/web/skel/document_errors/webfonts/fa-solid-900.eot → install/deb/templates/web/skel/document_errors/assets/webfonts/fa-solid-900.eot


+ 0 - 0
install/deb/templates/web/skel/document_errors/webfonts/fa-solid-900.svg → install/deb/templates/web/skel/document_errors/assets/webfonts/fa-solid-900.svg


+ 0 - 0
install/deb/templates/web/skel/document_errors/webfonts/fa-solid-900.ttf → install/deb/templates/web/skel/document_errors/assets/webfonts/fa-solid-900.ttf


+ 0 - 0
install/deb/templates/web/skel/document_errors/webfonts/fa-solid-900.woff → install/deb/templates/web/skel/document_errors/assets/webfonts/fa-solid-900.woff


+ 0 - 0
install/deb/templates/web/skel/document_errors/webfonts/fa-solid-900.woff2 → install/deb/templates/web/skel/document_errors/assets/webfonts/fa-solid-900.woff2