Mercurial Hosting > luan
changeset 2154:03d4c892b436 nginx_sites_addon
include nginx_sites ssl files; use absolute paths in Https.luan:nginx_ssl_conf()
| author | Violet7 |
|---|---|
| date | Tue, 27 Jan 2026 18:54:59 -0800 |
| parents | 867e88728368 |
| children | 088d5f215d66 |
| files | host/startup/nginx/nginx.conf.luan src/luan/host/Https.luan |
| diffstat | 2 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
diff -r 867e88728368 -r 03d4c892b436 host/startup/nginx/nginx.conf.luan --- a/host/startup/nginx/nginx.conf.luan Tue Jan 27 18:49:42 2026 -0700 +++ b/host/startup/nginx/nginx.conf.luan Tue Jan 27 18:54:59 2026 -0800 @@ -38,5 +38,7 @@ # the ssl/ subdir, so this is ok include <%=rootDir%>/sites/*/ssl/nginx.ssl.conf; include <%=rootDir%>/nginx_sites/*/*.conf; + include <%=rootDir%>/nginx_sites/*/https/*/ssl/*.conf; + } <%
diff -r 867e88728368 -r 03d4c892b436 src/luan/host/Https.luan --- a/src/luan/host/Https.luan Tue Jan 27 18:49:42 2026 -0700 +++ b/src/luan/host/Https.luan Tue Jan 27 18:54:59 2026 -0800 @@ -97,10 +97,9 @@ return 301 http://$http_host$request_uri; } - ssl_certificate <%= files.local_cer_file.to_string() %>; - ssl_certificate_key <%= files.key_file.to_string() %>; - # path is relative to the dir of the conf this comment is found in. - include nginx.default.conf; + ssl_certificate <%= files.local_cer_file.canonical().to_string() %>; + ssl_certificate_key <%= files.key_file.canonical().to_string() %>; + include <%= luanhost_dir.canonical().to_string() %>/local/nginx.default.conf; } <% end