cronekorkn/bundlewrap
1
0
Fork 0
Code Issues Pull requests 8 Projects Releases Wiki Activity

wip

Browse source
This commit is contained in:
mwiegand 2021-06-26 13:58:35 +02:00
parent f00d936921
commit 3a04293007
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bundles/nginx/files/site_template
View file

@ -51,9 +51,6 @@ server {
add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
% endif % endif
resolver 8.8.8.8 8.8.4.4 valid=300s;
resolver_timeout 5s;
access_log /var/log/nginx/access-${vhost}.log; access_log /var/log/nginx/access-${vhost}.log;
error_log /var/log/nginx/error-${vhost}.log; error_log /var/log/nginx/error-${vhost}.log;

1
bundles/nginx/items.py
View file

@ -69,6 +69,7 @@ for vhost, config in node.metadata.get('nginx/vhosts', {}).items():
'create_access_log': config.get('access_log', node.metadata.get('nginx/access_log', False)), 'create_access_log': config.get('access_log', node.metadata.get('nginx/access_log', False)),
'php_version': node.metadata.get('php/version', ''), 'php_version': node.metadata.get('php/version', ''),
'vhost': vhost, 'vhost': vhost,
'nameservers': node.metadata.get('nameservers'),
**config, **config,
}, },
'needs': set(), 'needs': set(),

2
bundles/systemd-networkd/files/resolv.conf
View file

@ -1,3 +1,3 @@
% for nameserver in sorted(node.metadata.get('nameservers', {'9.9.9.10', '2620:fe::10'})): % for nameserver in sorted(node.metadata.get('nameservers')):
nameserver ${nameserver} nameserver ${nameserver}
% endfor % endfor

3
groups/all.py
View file

@ -8,6 +8,9 @@
'server': 'home.backups', 'server': 'home.backups',
}, },
'dns': {}, 'dns': {},
'nameservers': [
'10.0.10.2',
],
'users': { 'users': {
'root': { 'root': {
'authorized_keys': [ 'authorized_keys': [

3
nodes/htz.mails.py
View file

@ -19,7 +19,6 @@
'bind': { 'bind': {
'domain': 'ns.sublimity.de', 'domain': 'ns.sublimity.de',
'zones': { 'zones': {
'mail2.sublimity.de': [],
'sublimity.de': [], 'sublimity.de': [],
'freibrief.net': [], 'freibrief.net': [],
'nadenau.net': [], 'nadenau.net': [],
@ -70,7 +69,7 @@
}, },
}, },
'mailserver': { 'mailserver': {
'hostname': 'mail2.sublimity.de', 'hostname': 'mail.sublimity.de',
'admin_email': 'postmaster@sublimity.de', 'admin_email': 'postmaster@sublimity.de',
'domains': [ 'domains': [
'mail3.sublimity.de', 'mail3.sublimity.de',