Mercurial Hosting > luan
changeset 2090:639441abad7b ssltesting
revert to using site/DOMAIN instead of site/DOMAIN/ssl
| author | Violet7 |
|---|---|
| date | Thu, 11 Dec 2025 20:28:38 -0800 |
| parents | fefa68b56ddd |
| children | ee7e711a91f2 |
| files | host/local_https.sh host/startup/nginx/nginx.ssl.conf.luan src/luan/host/https.luan |
| diffstat | 3 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
diff -r fefa68b56ddd -r 639441abad7b host/local_https.sh --- a/host/local_https.sh Wed Dec 10 22:53:56 2025 -0700 +++ b/host/local_https.sh Thu Dec 11 20:28:38 2025 -0800 @@ -3,8 +3,8 @@ DOMAIN=$1 -cd sites/$DOMAIN/ssl +cd sites/$DOMAIN openssl req -x509 -newkey rsa:2048 -nodes -keyout "$DOMAIN.key" -out fullchain.cer -days 365 \ - -subj "/CN=$DOMAIN" \ - -addext "subjectAltName=DNS:$DOMAIN,IP:127.0.0.1" + -subj "/CN=$DOMAIN" \ + -addext "subjectAltName=DNS:$DOMAIN,IP:127.0.0.1"
diff -r fefa68b56ddd -r 639441abad7b host/startup/nginx/nginx.ssl.conf.luan --- a/host/startup/nginx/nginx.ssl.conf.luan Wed Dec 10 22:53:56 2025 -0700 +++ b/host/startup/nginx/nginx.ssl.conf.luan Thu Dec 11 20:28:38 2025 -0800 @@ -25,8 +25,8 @@ return 301 http://$http_host$request_uri; } - ssl_certificate <%=rootDir%>/sites/<%=domain%>/ssl/fullchain.cer; - ssl_certificate_key <%=rootDir%>/sites/<%=domain%>/ssl/<%=domain%>.key; + ssl_certificate <%=rootDir%>/sites/<%=domain%>/fullchain.cer; + ssl_certificate_key <%=rootDir%>/sites/<%=domain%>/<%=domain%>.key; include <%=rootDir%>/sites/<%=domain%>/site/nginx.*.conf; include <%=rootDir%>/local/nginx.default.conf; }
diff -r fefa68b56ddd -r 639441abad7b src/luan/host/https.luan --- a/src/luan/host/https.luan Wed Dec 10 22:53:56 2025 -0700 +++ b/src/luan/host/https.luan Thu Dec 11 20:28:38 2025 -0800 @@ -22,8 +22,9 @@ local function do_set_https(is_https,domain,site_dir,luanhost_dir,dry_run) local nginx_file = site_dir.child("nginx.ssl.conf") - local ssl_files_dir = site_dir.child("ssl/") - ssl_files_dir.mkdir() + -- TODO: implement this later + local ssl_files_dir = site_dir--.child("ssl/") + -- ssl_files_dir.mkdir() local key_file = ssl_files_dir.child(domain..".key") local csr_file = ssl_files_dir.child(domain..".csr")