Mercurial Hosting > luan

changeset 2080:d7de1f976c1d ssltesting

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use site/xyz/ssl/ for fullchain
author Violet7
date Tue, 09 Dec 2025 17:33:51 -0800
parents d9d6d25e28c4
children 7980c6707150
files host/startup/nginx/nginx.acme_setup.conf.luan host/startup/nginx/nginx.ssl.conf.luan
diffstat 2 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/host/startup/nginx/nginx.acme_setup.conf.luan	Tue Dec 09 17:15:47 2025 -0800
+++ b/host/startup/nginx/nginx.acme_setup.conf.luan	Tue Dec 09 17:33:51 2025 -0800
@@ -12,9 +12,16 @@
 		error_log <%=rootDir%>/error.log;
 		access_log <%=rootDir%>/access.log;
 
+    # this directive should be included in a per-site
+    # nginx conf. this only exists for nginx.ssl.conf
+    # as far as I am aware. Currently, this will cause
+    # conflict with the server block defined in that
+    # file, so this file should be deleted when the
+    # initial setup is finished, and this directive
+    # should be added to that file instead.
 		location /.well-known/acme-challenge/ {
         root <%=rootDir%>;
-				try_files $uri $uri/ =404;
+        try_files $uri $uri/ =404;
 		}
 
     include nginx.default.conf;
--- a/host/startup/nginx/nginx.ssl.conf.luan	Tue Dec 09 17:15:47 2025 -0800
+++ b/host/startup/nginx/nginx.ssl.conf.luan	Tue Dec 09 17:33:51 2025 -0800
@@ -17,8 +17,8 @@
 			return 301 http://$http_host$request_uri;
 		}
 
-		ssl_certificate <%=rootDir%>/sites/<%=domain%>/fullchain.cer;
-		ssl_certificate_key <%=rootDir%>/sites/<%=domain%>/<%=domain%>.key;
+		ssl_certificate <%=rootDir%>/sites/<%=domain%>/ssl/fullchain.cer;
+		ssl_certificate_key <%=rootDir%>/sites/<%=domain%>/ssl/<%=domain%>.key;
 		include <%=rootDir%>/sites/<%=domain%>/site/nginx.*.conf;
 		include <%=rootDir%>/local/nginx.default.conf;
 	}