Merge branch 'develop' into disable-must-staple

Zoey2936 · web-flow · commit 678bd88f2933 · 2024-12-14T19:34:41.000+01:00
Signed-off-by: Zoey &lt;zoey@z0ey.de&gt;
diff --git a/backend/schema/components/stream-object.json b/backend/schema/components/stream-object.json
@@ -18,7 +18,7 @@
 		},
 		"incoming_port": {
 			"type": "string",
-			"pattern": "^(?!80$|81$|91$|443$)([0-9]+|[0-9]+-[0-9]+)$",
+			"pattern": "^(?!80$|443$)([0-9]+|[0-9]+-[0-9]+)$",
 			"maxLength": 11
 		},
 		"forwarding_host": {
diff --git a/backend/templates/dead_host.conf b/backend/templates/dead_host.conf
@@ -17,7 +17,7 @@ include conf.d/include/always.conf;
     include conf.d/include/always.conf;
     root /html/404deadpage;
     error_page 404 /404deadpage.html;
-    return 404;
+    try_files $uri =404;
   }
 {%- endif %}
 
diff --git a/backend/templates/default.conf b/backend/templates/default.conf
@@ -28,7 +28,7 @@ server {
     include conf.d/include/always.conf;
     root /html/404deadpage;
     error_page 404 /404deadpage.html;
-    return 404;
+    try_files $uri =404;
   }
 {%- endif %}
 
diff --git a/rootfs/html/404deadpage/404deadpage.html b/rootfs/html/404deadpage/404deadpage.html
@@ -4,12 +4,6 @@
     <title>Dead Host</title>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="application-name" content="NPMplus" />
-    <meta name="author" content="ZoeyVid" />
-    <meta name="description" content="Dead Host Page of NPMplus" />
-    <meta name="keywords" content="NPMplus, dead, 404" />
-    <!-- TODO: Icon -->
-    <link rel="icon" type="image/webp" href="/favicon.webp" />
   </head>
   <body>
     <style>
@@ -85,6 +79,5 @@
     <div id="box">
       <h1>Dead Host</h1>
     </div>
-    <p id="notice">Powered by <a href="https://github.com/ZoeyVid/NPMplus">NPMplus</a></p>
   </body>
 </html>
diff --git a/rootfs/html/dead/index.html b/rootfs/html/dead/index.html
@@ -4,12 +4,6 @@
     <title>Dead Host</title>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="application-name" content="NPMplus" />
-    <meta name="author" content="ZoeyVid" />
-    <meta name="description" content="Dead Host Page of NPMplus" />
-    <meta name="keywords" content="NPMplus, dead, 404" />
-    <!-- TODO: Icon -->
-    <link rel="icon" type="image/webp" href="/favicon.webp" />
   </head>
   <body>
     <style>
@@ -85,6 +79,5 @@
     <div id="box">
       <h1>Dead Host</h1>
     </div>
-    <p id="notice">Powered by <a href="https://github.com/ZoeyVid/NPMplus">NPMplus</a></p>
   </body>
 </html>
diff --git a/rootfs/html/fancyindex/footer.html b/rootfs/html/fancyindex/footer.html
@@ -1,5 +1,4 @@
     </div>
-    <p id="notice">Powered by <a href="https://github.com/ZoeyVid/NPMplus">NPMplus</a></p>
     <script>
       var input = document.createElement("input");
       input.id = "search";
diff --git a/rootfs/html/fancyindex/header.html b/rootfs/html/fancyindex/header.html
@@ -4,12 +4,6 @@
     <title>Directory index</title>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="application-name" content="NPMplus" />
-    <meta name="author" content="ZoeyVid" />
-    <meta name="description" content="Directory index of NPMplus" />
-    <meta name="keywords" content="NPMplus, default" />
-    <!-- TODO: Icon -->
-    <link rel="icon" type="image/webp" href="/fancyindex/favicon.webp" />
   </head>
   <body>
     <style>

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ include conf.d/include/always.conf;`
`17`	`17`	`include conf.d/include/always.conf;`
`18`	`18`	`root /html/404deadpage;`
`19`	`19`	`error_page 404 /404deadpage.html;`
`20`		`- return 404;`
	`20`	`+ try_files $uri =404;`
`21`	`21`	`}`
`22`	`22`	`{%- endif %}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ server {`
`28`	`28`	`include conf.d/include/always.conf;`
`29`	`29`	`root /html/404deadpage;`
`30`	`30`	`error_page 404 /404deadpage.html;`
`31`		`- return 404;`
	`31`	`+ try_files $uri =404;`
`32`	`32`	`}`
`33`	`33`	`{%- endif %}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`</div>`
`2`		`- <p id="notice">Powered by <a href="https://github.com/ZoeyVid/NPMplus">NPMplus</a></p>`
`3`	`2`	`<script>`
`4`	`3`	`var input = document.createElement("input");`
`5`	`4`	`input.id = "search";`