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

bundles/nginx: support non-domain vhost names

Browse source
This commit is contained in:
Franzi 2020-10-31 10:30:07 +01:00
parent 4873ec053e
commit 67c5c23194
Signed by: kunsi
GPG key ID: 12E3D2136B818350
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bundles/nginx/items.py
View file

@ -51,14 +51,14 @@ if node.metadata['nginx']['use_ssl_for_all_connections']:
},
}
for domain, config in node.metadata.get('nginx', {}).get('vhosts', {}).items():
files['/etc/nginx/sites/{}'.format(domain)] = {
for vhost, config in node.metadata.get('nginx', {}).get('vhosts', {}).items():
if not 'domain' in config:
config['domain'] = vhost
files['/etc/nginx/sites/{}'.format(vhost)] = {
'source': 'site_template',
'content_type': 'mako',
'context': {
'domain': domain,
**config
},
'context': config,
'needs': set(),
'triggers': {
'svc_systemd:nginx:restart',
@ -66,7 +66,7 @@ for domain, config in node.metadata.get('nginx', {}).get('vhosts', {}).items():
}
if not 'webroot' in config:
directories['/var/www/{}'.format(domain)] = config.get('webroot_config', {})
directories['/var/www/{}'.format(vhost)] = config.get('webroot_config', {})
if node.metadata['nginx']['use_ssl_for_all_connections']:
files['/etc/nginx/sites/{}'.format(domain)]['needs'].add('action:letsencrypt_update_certificates')
files['/etc/nginx/sites/{}'.format(vhost)]['needs'].add('action:letsencrypt_update_certificates')

3
bundles/nginx/metadata.py
View file

@ -34,7 +34,8 @@ def letsencrypt(metadata):
domains = {}
for domain in metadata.get('nginx/vhosts', {}).keys():
for vhost, config in metadata.get('nginx/vhosts', {}).items():
domain = config.get('domain', vhost)
domains[domain] = set()
return {