@peerbit/server 5.4.14 → 5.4.15

package/dist/ui/index.html

@@ -23,7 +23,7 @@
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
 	<title>Peerbit</title>
-  <script type="module" crossorigin src="/assets/index-BiNPt6Oq.js"></script>
+  <script type="module" crossorigin src="/assets/index-BPdbODjv.js"></script>
   <link rel="stylesheet" crossorigin href="/assets/index-CIfVvUo9.css">
 </head>
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@peerbit/server",
-	"version": "5.4.14",
+	"version": "5.4.15",
 	"author": "dao.xyz",
 	"repository": {
 		"type": "git",

package/src/domain.ts

@@ -156,7 +156,8 @@ export const startCertbot = async (
     -v $(pwd)/nginx_secrets:/etc/letsencrypt \
     -v ${nginxConfigPath}:/etc/nginx/user_conf.d:ro \
     -v $(pwd)/ui:/usr/share/nginx/html:ro \
-    --name ${dockerProcessName} jonasal/nginx-certbot:latest`;
+    --name ${dockerProcessName} jonasal/nginx-certbot:latest \
+	--restart unless-stopped`;
 
 	console.log("Starting Certbot");
 	// try two times with some delay, because sometimes the docker daemon is not available immidatel

package/src/nginx-template.conf

@@ -86,8 +86,16 @@ server {
 }
 
 server {
-    server_name %DOMAIN%; # managed by Certbot
-    
+    server_name %DOMAIN%;
+    listen [::]:443 ssl ipv6only=on;
+    listen 443 ssl; 
+
+     # Allow ACME challenge to resolve even if a client lands on https
+    location ^~ /.well-known/acme-challenge/ {
+        root /var/www/letsencrypt;
+        default_type text/plain;
+    }
+
     root /usr/share/nginx/html;
     index index.html index.htm;
 
@@ -95,8 +103,6 @@ server {
         try_files $uri $uri/ =404;
     }
     
-    listen [::]:443 ssl ipv6only=on; # managed by Certbot
-    listen 443 ssl; # managed by Certbot
 
      # Load the certificate files.
     ssl_certificate         /etc/letsencrypt/live/%DOMAIN%/fullchain.pem;
@@ -135,14 +141,13 @@ server {
     # Anything requesting this particular URL should be served content from
     # Certbot's folder so the HTTP-01 ACME challenges can be completed for the
     # HTTPS certificates.
-    location '/.well-known/acme-challenge' {
-        default_type "text/plain";
+    location ^~ /.well-known/acme-challenge/ {
         root /var/www/letsencrypt;
+        default_type text/plain;
     }
 
-    if ($host = %DOMAIN%) {
+    # Everything else: redirect to HTTPS
+    location / {
         return 301 https://$host$request_uri;
-    } # managed by Certbot
- 
-    return 404; # managed by Certbot
+    }
 }

package/src/routes.ts

@@ -21,6 +21,6 @@ export const INSTALL_PATH = "/install";
 export const BOOTSTRAP_PATH = "/network/bootstrap";
 export const RESTART_PATH = "/restart";
 export const TERMINATE_PATH = "/terminate";
-export const STOP_PATH = "/path";
+export const STOP_PATH = "/stop";
 export const LOG_PATH = "/log";
 export const VERSIONS_PATH = "/versions";

package/src/trust.ts

@@ -29,7 +29,7 @@ export class Trust {
 	}
 
 	remove(hashcode: string) {
-		const existing = this.trusted.findIndex((x) => (x = hashcode));
+		const existing = this.trusted.findIndex((x) => x === hashcode);
 		if (existing >= 0) {
 			this.trusted.splice(existing, 1);
 			return true;