update to bw4

This commit is contained in:
Franzi 2020-08-18 15:27:55 +02:00
parent d7862918a6
commit 5e2fea8497
Signed by: kunsi
GPG key ID: 12E3D2136B818350
22 changed files with 223 additions and 501 deletions

View file

@ -1,39 +1,37 @@
@metadata_processor
def defaults(metadata):
return {
'apt': {
'repos': {
'nginx': {
'key': '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62',
'items': [
'deb http://nginx.org/packages/debian buster nginx',
],
},
},
'unattended-upgrades': {
'origins': {
'o=nginx,a=stable,n=buster,l=nginx,c=nginx',
},
},
'packages': {
'nginx': {},
defaults = {
'apt': {
'repos': {
'nginx': {
'key': '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62',
'items': [
'deb http://nginx.org/packages/debian buster nginx',
],
},
},
'nginx': {
'worker_processes': 4,
'worker_connections': 1000,
'unattended-upgrades': {
'origins': {
'o=nginx,a=stable,n=buster,l=nginx,c=nginx',
},
},
}, DEFAULTS, DONE
'packages': {
'nginx': {},
},
},
'nginx': {
'worker_processes': 4,
'worker_connections': 1000,
},
}
@metadata_processor
@metadata_reactor
def letsencrypt(metadata):
if not node.has_bundle('letsencrypt'):
return metadata, DONE
raise DoNotRunAgain
domains = {}
for domain in metadata.get('nginx', {}).get('vhosts', {}).keys():
for domain in metadata.get('nginx/vhosts', {}).keys():
domains[domain] = set()
return {
@ -43,4 +41,4 @@ def letsencrypt(metadata):
'nginx',
},
},
}, DEFAULTS, RUN_ME_AGAIN
}