Compare commits

..

No commits in common. "53659b43641797fcef008dd3b13133894480d655" and "5d95a33c5a56788336a3094c67a2d2843164310d" have entirely different histories.

4 changed files with 45 additions and 33 deletions

View file

@ -4,13 +4,6 @@ directories = {
'group': 'www-data', 'group': 'www-data',
'mode': '0755', 'mode': '0755',
}, },
# FIXME:
'/var/www/certbot': {
'owner': 'www-data',
'group': 'www-data',
'mode': '0755',
}
} }
git_deploy = { git_deploy = {
@ -45,4 +38,11 @@ files = {
'svc_systemd:nginx:restart', 'svc_systemd:nginx:restart',
], ],
}, },
# FIXME:
'/var/www/certbot': {
'owner': 'www-data',
'group': 'www-data',
'mode': '0755',
}
} }

View file

@ -9,6 +9,7 @@
'webserver', 'webserver',
'dnsserver', 'dnsserver',
'wordpress', 'wordpress',
#'left4dead2',
], ],
'bundles': [ 'bundles': [
'bind-acme', 'bind-acme',
@ -16,6 +17,7 @@
'download-server', 'download-server',
'islamicstate.eu', 'islamicstate.eu',
#'nginx-rtmps', #'nginx-rtmps',
#'steam',
'wireguard', 'wireguard',
'zfs', 'zfs',
], ],
@ -52,7 +54,6 @@
'left4.me', 'left4.me',
'elimu-kwanza.de', 'elimu-kwanza.de',
'cronekorkn.de', 'cronekorkn.de',
'direkt.oranienschule.de',
'foerderkreis.oranienschule-wiesbaden-wiki.de', 'foerderkreis.oranienschule-wiesbaden-wiki.de',
}, },
}, },
@ -85,6 +86,34 @@
'domain': 'elimu-kwanza.de', 'domain': 'elimu-kwanza.de',
}, },
}, },
'left4dead2': {
'servers': {
'standard': {
'port': 27020,
},
# 'standard-2': {
# 'port': 27021,
# 'workshop': {
# #2256379828, # bhop detect
# },
# },
},
'admins': {
'STEAM_1:0:12376499', # CroneKorkN ☮UKRAINE❤
'STEAM_1:1:169960486', # *RED*
'STEAM_1:1:112940736', # Ðark-AnGe
'STEAM_1:1:34263261', # Alekc
'STEAM_1:0:583132949', # Cat
'STEAM_1:0:610180592', # SonovaBeach
'STEAM_1:1:157619181', # Null
},
'workshop': {
214630948,
1229957234,
698857882,
},
'steamgroups': {'103582791467869287'},
},
'letsencrypt': { 'letsencrypt': {
'domains': { 'domains': {
'ckn.li': {}, 'ckn.li': {},
@ -195,11 +224,6 @@
'10.0.227.0/24', '10.0.227.0/24',
], ],
}, },
'mseibert.yourls': {
'allowed_ips': [
'10.0.228.0/24',
],
},
}, },
'clients': { 'clients': {
'macbook': { 'macbook': {

View file

@ -46,6 +46,7 @@
'10.0.2.0/24', '10.0.2.0/24',
'10.0.9.0/24', '10.0.9.0/24',
'10.0.10.0/24', '10.0.10.0/24',
'10.0.10.0/24',
], ],
}, },
}, },

View file

@ -4,13 +4,13 @@
{ {
'hostname': '168.119.250.114', 'hostname': '168.119.250.114',
'groups': [ 'groups': [
'backup', #'backup',
'debian-12', 'debian-12',
'monitored', #'monitored',
'webserver', 'webserver',
], ],
'bundles': [ 'bundles': [
'wireguard', #'wireguard',
'mariadb', 'mariadb',
'php', 'php',
'yourls', 'yourls',
@ -21,7 +21,7 @@
'network': { 'network': {
'internal': { 'internal': {
'interface': 'ens10', 'interface': 'ens10',
'ipv4': '10.0.228.2/24', 'ipv4': '10.0.227.4/24',
}, },
'external': { 'external': {
'interface': 'eth0', 'interface': 'eth0',
@ -40,26 +40,13 @@
}, },
}, },
# FIXME: # FIXME:
# 'overwrite_nameservers': [ 'overwrite_nameservers': [
# '8.8.8.8', '8.8.8.8',
# ], ],
'vm': { 'vm': {
'cores': 2, 'cores': 2,
'ram': 4096, 'ram': 4096,
}, },
'wireguard': {
'my_ip': '172.30.0.239/32',
's2s': {
'htz.mails': {
'allowed_ips': [
'10.0.0.0/24',
'10.0.2.0/24',
'10.0.9.0/24',
'10.0.10.0/24',
],
},
},
},
'zfs': { 'zfs': {
'pools': { 'pools': {
'tank': { 'tank': {