浏览代码

Fix LE certs for IPv6 only domains Fixes 394

Jamie Curnow 5 年之前
父节点
当前提交
2ebfdcf0c9
共有 2 个文件被更改,包括 7 次插入0 次删除
  1. 3 0
      backend/internal/nginx.js
  2. 4 0
      backend/templates/letsencrypt-request.conf

+ 3 - 0
backend/internal/nginx.js

@@ -273,6 +273,7 @@ const internalNginx = {
 		return new Promise((resolve, reject) => {
 		return new Promise((resolve, reject) => {
 			let template = null;
 			let template = null;
 			let filename = '/data/nginx/temp/letsencrypt_' + certificate.id + '.conf';
 			let filename = '/data/nginx/temp/letsencrypt_' + certificate.id + '.conf';
+
 			try {
 			try {
 				template = fs.readFileSync(__dirname + '/../templates/letsencrypt-request.conf', {encoding: 'utf8'});
 				template = fs.readFileSync(__dirname + '/../templates/letsencrypt-request.conf', {encoding: 'utf8'});
 			} catch (err) {
 			} catch (err) {
@@ -280,6 +281,8 @@ const internalNginx = {
 				return;
 				return;
 			}
 			}
 
 
+			certificate.ipv6 = internalNginx.ipv6Enabled();
+
 			renderEngine
 			renderEngine
 				.parseAndRender(template, certificate)
 				.parseAndRender(template, certificate)
 				.then((config_text) => {
 				.then((config_text) => {

+ 4 - 0
backend/templates/letsencrypt-request.conf

@@ -2,6 +2,10 @@
 
 
 server {
 server {
   listen 80;
   listen 80;
+{% if ipv6 -%}
+  listen [::]:80;
+{% endif %}
+
   server_name {{ domain_names | join: " " }};
   server_name {{ domain_names | join: " " }};
 
 
   access_log /data/logs/letsencrypt-requests.log standard;
   access_log /data/logs/letsencrypt-requests.log standard;