Просмотр исходного кода

Make wellknown-path a config variable

pull/5/head
Shane Mc Cormack 6 лет назад
Родитель
Сommit
57063e311e
2 измененных файлов: 3 добавлений и 2 удалений
  1. 2
    1
      generate.py
  2. 1
    1
      nginx.tpl

+ 2
- 1
generate.py Просмотреть файл

14
 parser.add_argument('--trusted-cert-path', help='Path to use for trusted CA certificate. Use "%s" for hostname', default='/letsencrypt/certs/%s/chain.pem')
14
 parser.add_argument('--trusted-cert-path', help='Path to use for trusted CA certificate. Use "%s" for hostname', default='/letsencrypt/certs/%s/chain.pem')
15
 parser.add_argument('--cert-path', help='Path to use for certificates. Use "%s" for hostname', default='/letsencrypt/certs/%s/fullchain.pem')
15
 parser.add_argument('--cert-path', help='Path to use for certificates. Use "%s" for hostname', default='/letsencrypt/certs/%s/fullchain.pem')
16
 parser.add_argument('--cert-key-path', help='Path to use for certificate private keys. Use "%s" for hostname', default='/letsencrypt/certs/%s/privkey.pem')
16
 parser.add_argument('--cert-key-path', help='Path to use for certificate private keys. Use "%s" for hostname', default='/letsencrypt/certs/%s/privkey.pem')
17
+parser.add_argument('--wellknown-path', help='Path to use for wellknown directory for http-01 challenge.', default='/letsencrypt/well-known/')
17
 args = parser.parse_args()
18
 args = parser.parse_args()
18
 
19
 
19
 jinja_env = jinja2.Environment(loader=jinja2.FileSystemLoader('/'))
20
 jinja_env = jinja2.Environment(loader=jinja2.FileSystemLoader('/'))
51
   if wroteConfig or len(services) > 0 or not os.path.isfile('/nginx-config/vhosts.conf'):
52
   if wroteConfig or len(services) > 0 or not os.path.isfile('/nginx-config/vhosts.conf'):
52
     with open('/nginx-config/vhosts.conf', 'w') as f:
53
     with open('/nginx-config/vhosts.conf', 'w') as f:
53
       print('Writing vhosts.conf...', flush=True)
54
       print('Writing vhosts.conf...', flush=True)
54
-      f.write(template.render(services=services))
55
+      f.write(template.render(services=services, wellknown_path=args.wellknown_path))
55
       wroteConfig = True;
56
       wroteConfig = True;
56
     print('Done writing config.', flush=True)
57
     print('Done writing config.', flush=True)
57
   else:
58
   else:

+ 1
- 1
nginx.tpl Просмотреть файл

19
     # From https://community.letsencrypt.org/t/how-to-nginx-configuration-to-enable-acme-challenge-support-on-all-http-virtual-hosts/5622
19
     # From https://community.letsencrypt.org/t/how-to-nginx-configuration-to-enable-acme-challenge-support-on-all-http-virtual-hosts/5622
20
     location ^~ /.well-known/acme-challenge/ {
20
     location ^~ /.well-known/acme-challenge/ {
21
         default_type "text/plain";
21
         default_type "text/plain";
22
-        alias /letsencrypt/well-known/;
22
+        alias {{ wellknown_path }};
23
     }
23
     }
24
 
24
 
25
     # Hide /acme-challenge subdirectory and return 404 on all requests.
25
     # Hide /acme-challenge subdirectory and return 404 on all requests.

Загрузка…
Отмена
Сохранить