kunsi/bundlewrap
1
0
Fork 0
Code Issues 1 Pull requests 2 Releases Activity

bundles/nginx: add metadata option to disable https

Browse source
This commit is contained in:
Franzi 2020-09-20 14:36:43 +02:00
parent 2ac2982463
commit d6799088c4
Signed by: kunsi
GPG key ID: 12E3D2136B818350
3 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
bundles/nginx/items.py
View file

@ -1,8 +1,3 @@
# TODO rework this to support specifying a certificate instead of
# relying on letsencrypt for the specific domain (for example to
# support wildcard certificates
assert node.has_bundle('letsencrypt'), 'nginx needs letsencrypt'
directories = {
'/etc/nginx/sites': {
'purge': True,
@ -20,12 +15,6 @@ files = {
'svc_systemd:nginx:restart',
},
},
'/etc/nginx/sites/000-port80.conf': {
'source': 'port80.conf',
'triggers': {
'svc_systemd:nginx:restart',
},
},
'/etc/nginx/sites/stub_status': {
'triggers': {
'svc_systemd:nginx:restart',
@ -41,6 +30,19 @@ svc_systemd = {
},
}
if node.metadata['nginx']['use_ssl_for_all_connections']:
# TODO rework this to support specifying a certificate instead of
# relying on letsencrypt for the specific domain (for example to
# support wildcard certificates
assert node.has_bundle('letsencrypt'), 'nginx needs letsencrypt'
files['/etc/nginx/sites/000-port80.conf'] = {
'source': 'port80.conf',
'triggers': {
'svc_systemd:nginx:restart',
},
}
for domain, config in node.metadata.get('nginx', {}).get('vhosts', {}).items():
files['/etc/nginx/sites/{}'.format(domain)] = {
'source': 'site_template',
@ -49,10 +51,11 @@ for domain, config in node.metadata.get('nginx', {}).get('vhosts', {}).items():
'domain': domain,
**config
},
'needs': {
'action:letsencrypt_update_certificates',
},
'needs': set(),
'triggers': {
'svc_systemd:nginx:restart',
},
}
if node.metadata['nginx']['use_ssl_for_all_connections']:
files['/etc/nginx/sites/{}'.format(domain)]['needs'].add('action:letsencrypt_update_certificates')