Bot Updating Templated Files

Merge pull request #54 from Roxedus/master
Added helpers
2026-03-10 04:05:16 +09:00 · 2021-01-08 15:13:54 +00:00 · 2021-01-08 10:12:18 -05:00 · 2021-01-08 15:47:36 +01:00 · 2021-01-08 09:19:46 -05:00 · 2021-01-03 20:23:48 +01:00
7 changed files with 130 additions and 41 deletions
--- a/README.md
+++ b/README.md
@@ -323,6 +323,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

+* **03.01.21:** - Add helper pages to aid troubleshooting
 * **10.12.20:** - Add support for njalla dns validation
 * **09.12.20:** - Check for template/conf updates and notify in the log. Add support for gehirn and sakuracloud dns validation.
 * **01.11.20:** - Add support for netcup dns validation
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -123,55 +123,55 @@ pcre2-10.35-r0
 perl-5.30.3-r0
 perl-error-0.17029-r0
 perl-git-2.26.2-r0
-php7-7.3.25-r0
-php7-bcmath-7.3.25-r0
-php7-bz2-7.3.25-r0
-php7-common-7.3.25-r0
-php7-ctype-7.3.25-r0
-php7-curl-7.3.25-r0
-php7-dom-7.3.25-r0
-php7-exif-7.3.25-r0
+php7-7.3.26-r0
+php7-bcmath-7.3.26-r0
+php7-bz2-7.3.26-r0
+php7-common-7.3.26-r0
+php7-ctype-7.3.26-r0
+php7-curl-7.3.26-r0
+php7-dom-7.3.26-r0
+php7-exif-7.3.26-r0
 php7-fileinfo-7.3.25-r0
 php7-fpm-7.3.25-r0
-php7-ftp-7.3.25-r0
-php7-gd-7.3.25-r0
-php7-iconv-7.3.25-r0
-php7-imap-7.3.25-r0
-php7-intl-7.3.25-r0
-php7-json-7.3.25-r0
-php7-ldap-7.3.25-r0
-php7-mbstring-7.3.25-r0
-php7-mysqli-7.3.25-r0
-php7-mysqlnd-7.3.25-r0
-php7-opcache-7.3.25-r0
-php7-openssl-7.3.25-r0
-php7-pdo-7.3.25-r0
-php7-pdo_mysql-7.3.25-r0
-php7-pdo_odbc-7.3.25-r0
-php7-pdo_pgsql-7.3.25-r0
-php7-pdo_sqlite-7.3.25-r0
-php7-pear-7.3.25-r0
+php7-ftp-7.3.26-r0
+php7-gd-7.3.26-r0
+php7-iconv-7.3.26-r0
+php7-imap-7.3.26-r0
+php7-intl-7.3.26-r0
+php7-json-7.3.26-r0
+php7-ldap-7.3.26-r0
+php7-mbstring-7.3.26-r0
+php7-mysqli-7.3.26-r0
+php7-mysqlnd-7.3.26-r0
+php7-opcache-7.3.26-r0
+php7-openssl-7.3.26-r0
+php7-pdo-7.3.26-r0
+php7-pdo_mysql-7.3.26-r0
+php7-pdo_odbc-7.3.26-r0
+php7-pdo_pgsql-7.3.26-r0
+php7-pdo_sqlite-7.3.26-r0
+php7-pear-7.3.26-r0
 php7-pecl-apcu-5.1.19-r0
 php7-pecl-igbinary-3.1.6-r0
 php7-pecl-mcrypt-1.0.3-r0
 php7-pecl-memcached-3.1.5-r0
 php7-pecl-redis-5.2.2-r1
-php7-pgsql-7.3.25-r0
-php7-phar-7.3.25-r0
-php7-posix-7.3.25-r0
-php7-session-7.3.25-r0
+php7-pgsql-7.3.26-r0
+php7-phar-7.3.26-r0
+php7-posix-7.3.26-r0
+php7-session-7.3.26-r0
 php7-simplexml-7.3.25-r0
-php7-soap-7.3.25-r0
-php7-sockets-7.3.25-r0
-php7-sodium-7.3.25-r0
-php7-sqlite3-7.3.25-r0
-php7-tokenizer-7.3.25-r0
-php7-xml-7.3.25-r0
-php7-xmlreader-7.3.25-r0
-php7-xmlrpc-7.3.25-r0
+php7-soap-7.3.26-r0
+php7-sockets-7.3.26-r0
+php7-sodium-7.3.26-r0
+php7-sqlite3-7.3.26-r0
+php7-tokenizer-7.3.26-r0
+php7-xml-7.3.26-r0
+php7-xmlreader-7.3.26-r0
+php7-xmlrpc-7.3.26-r0
 php7-xmlwriter-7.3.25-r0
-php7-xsl-7.3.25-r0
-php7-zip-7.3.25-r0
+php7-xsl-7.3.26-r0
+php7-zip-7.3.26-r0
 pinentry-1.1.0-r2
 popt-1.16-r7
 procps-3.3.16-r0
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -150,6 +150,7 @@ app_setup_nginx_reverse_proxy_block: ""

 # changelog
 changelogs:
+  - { date: "03.01.21:", desc: "Add helper pages to aid troubleshooting" }
  - { date: "10.12.20:", desc: "Add support for njalla dns validation" }
  - { date: "09.12.20:", desc: "Check for template/conf updates and notify in the log. Add support for gehirn and sakuracloud dns validation." }
  - { date: "01.11.20:", desc: "Add support for netcup dns validation" }
--- a/root/defaults/502.html
+++ b/root/defaults/502.html
@@ -0,0 +1,44 @@
+<html>
+    <head>
+        <title>502</title>
+        <style>
+        body{
+            font-family: Helvetica, Arial, sans-serif;
+            background-color: #961313;
+        }
+        .message{
+            width:440px;
+            padding:20px 40px;
+            margin:0 auto;
+            background-color:#f9f9f9;
+            border:1px solid #ddd;
+            color: #1e3d62;
+        }
+        center{
+            margin:40px 0;
+        }
+        h1{
+            font-size: 28px;
+            line-height: 26px;
+        }
+        h2{
+            font-size: 18px;
+            line-height: 26px;
+        }
+        p{
+            font-size: 12px;
+        }
+        a{
+            color: rgb(207, 48, 139);
+        }
+        </style>
+    </head>
+    <body>
+        <div class="message">
+            <h1>502</h1>
+            <h2>Nginx can not connect to the application</h2>
+            <p>Some common reasons are listed here: <a target="_blank" href="https://docs.linuxserver.io/general/swag#502">docs.linuxserver.io</a></p>
+            <p>For help and support, please visit: <a target="_blank" href="https://www.linuxserver.io/support">linuxserver.io/support</a></p>
+        </div>
+    </body>
+</html>
--- a/root/defaults/default
+++ b/root/defaults/default
@@ -1,4 +1,6 @@
-## Version 2020/05/23 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/default
+## Version 2021/01/03 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/default
+
+error_page 502 /502.html;

 # redirect all traffic to https
 server {
--- a/root/defaults/index.html
+++ b/root/defaults/index.html
@@ -0,0 +1,39 @@
+<html>
+    <head>
+        <title>Welcome to your SWAG instance</title>
+        <style>
+        body{
+            font-family: Helvetica, Arial, sans-serif;
+        }
+        .message{
+            width:440px;
+            padding:20px 40px;
+            margin:0 auto;
+            background-color:#f9f9f9;
+            border:1px solid #ddd;
+            color: #1e3d62;
+        }
+        center{
+            margin:40px 0;
+        }
+        h1{
+            font-size: 18px;
+            line-height: 26px;
+        }
+        p{
+            font-size: 12px;
+        }
+        a{
+            color: rgb(207, 48, 139);
+        }
+        </style>
+    </head>
+    <body>
+        <div class="message">
+            <h1>Welcome to your <a target="_blank" href="https://github.com/linuxserver/docker-swag">SWAG</a> instance</h1>
+            <p>A webserver and reverse proxy solution brought to you by <a target="_blank" href="https://www.linuxserver.io/">linuxserver.io</a> with php support and a built-in Certbot client.</p>
+            <p>We have an article on how to use swag here: <a target="_blank" href="https://docs.linuxserver.io/general/swag">docs.linuxserver.io</a></p>
+            <p>For help and support, please visit: <a target="_blank" href="https://www.linuxserver.io/support">linuxserver.io/support</a></p>
+        </div>
+    </body>
+</html>
--- a/root/etc/cont-init.d/50-config
+++ b/root/etc/cont-init.d/50-config
@@ -77,6 +77,8 @@ cp /config/fail2ban/jail.local /etc/fail2ban/jail.local
 	cp /defaults/authelia-location.conf /config/nginx/authelia-location.conf
 [[ ! -f /config/nginx/geoip2.conf ]] && \
 	cp /defaults/geoip2.conf /config/nginx/geoip2.conf
+[[ ! -f /config/www/502.html ]] &&
+	cp /defaults/502.html /config/www/502.html

 # copy pre-generated dhparams or generate if needed
 [[ ! -f /config/nginx/dhparams.pem ]] && \
Author	SHA1	Message	Date
LinuxServer-CI	bb53d24b40	Bot Updating Templated Files	2021-01-08 15:13:54 +00:00
aptalca	f0fd8e67fd	Merge pull request #54 from Roxedus/master Added helpers	2021-01-08 10:12:18 -05:00
Roxedus	77a82f7163	Fix issues from review	2021-01-08 15:47:36 +01:00
LinuxServer-CI	0c7bc26fc2	Bot Updating Package Versions	2021-01-08 09:19:46 -05:00
Roxedus	6ebfdc1e87	Update dates	2021-01-03 20:23:48 +01:00
Roxedus	76f0a8c34c	Added helpers Replaced index.html with page with some info, including a the swag documentation. Added http502 helper page, also linking to our docs. UI suggestions welcome	2020-12-30 22:58:59 +01:00