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

TOTAL FACKUP

Browse source
This commit is contained in:
cronekorkn 2024-09-21 14:42:25 +02:00
parent 6751cd0b44
commit 3066ae699b
Signed by: cronekorkn
SSH key fingerprint: SHA256:v0410ZKfuO1QHdgKBsdQNF64xmTxOF8osF1LIqwTcVw
14 changed files with 92 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bundles/letsencrypt/items.py
View file

@ -56,6 +56,7 @@ for domain in node.metadata.get('letsencrypt/domains').keys():
'unless': f'/etc/dehydrated/letsencrypt-ensure-some-certificate {domain} true', 'unless': f'/etc/dehydrated/letsencrypt-ensure-some-certificate {domain} true',
'needs': { 'needs': {
'file:/etc/dehydrated/letsencrypt-ensure-some-certificate', 'file:/etc/dehydrated/letsencrypt-ensure-some-certificate',
'pkg_apt:dehydrated',
}, },
'needed_by': { 'needed_by': {
'svc_systemd:nginx', 'svc_systemd:nginx',

2
bundles/mariadb/items.py
View file

@ -13,6 +13,7 @@ directories = {
], ],
'needed_by': [ 'needed_by': [
'pkg_apt:mariadb-server', 'pkg_apt:mariadb-server',
'pkg_apt:mariadb-client',
], ],
}, },
} }
@ -30,6 +31,7 @@ svc_systemd = {
'mariadb.service': { 'mariadb.service': {
'needs': [ 'needs': [
'pkg_apt:mariadb-server', 'pkg_apt:mariadb-server',
'pkg_apt:mariadb-client',
], ],
}, },
} }

11
bundles/mariadb/metadata.py
View file

@ -1,7 +1,16 @@
defaults = { defaults = {
'apt': { 'apt': {
'packages': { 'packages': {
'mariadb-server': {}, 'mariadb-server': {
'needs': {
'zfs_dataset:tank/mariadb',
},
},
'mariadb-client': {
'needs': {
'zfs_dataset:tank/mariadb',
},
},
}, },
}, },
'mariadb': { 'mariadb': {

6
bundles/postgresql/metadata.py
View file

@ -6,7 +6,11 @@ root_password = repo.vault.password_for(f'{node.name} postgresql root')
defaults = { defaults = {
'apt': { 'apt': {
'packages': { 'packages': {
'postgresql': {}, 'postgresql': {
'needs': {
'zfs_dataset:tank/postgresql',
},
},
}, },
}, },
'backup': { 'backup': {

20
bundles/telegraf/items.py
View file

@ -15,16 +15,16 @@ files = {
'svc_systemd:telegraf:restart', 'svc_systemd:telegraf:restart',
], ],
}, },
'/usr/local/share/telegraf/procio': { # '/usr/local/share/telegraf/procio': {
'content_type': 'download', # 'content_type': 'download',
'source': f"https://dl.sublimity.de/telegraf-procio/telegraf-procio-{node.metadata.get('system/architecture')}-latest", # 'source': f"https://dl.sublimity.de/telegraf-procio/telegraf-procio-{node.metadata.get('system/architecture')}-latest",
'mode': '0755', # 'mode': '0755',
}, # },
'/usr/local/share/telegraf/pressure_stall': { # '/usr/local/share/telegraf/pressure_stall': {
'content_type': 'download', # 'content_type': 'download',
'source': f"https://dl.sublimity.de/telegraf-pressure-stall/telegraf-pressure-stall-{node.metadata.get('system/architecture')}-latest", # 'source': f"https://dl.sublimity.de/telegraf-pressure-stall/telegraf-pressure-stall-{node.metadata.get('system/architecture')}-latest",
'mode': '0755', # 'mode': '0755',
}, # },
} }
svc_systemd['telegraf'] = { svc_systemd['telegraf'] = {

28
bundles/telegraf/metadata.py
View file

@ -73,20 +73,20 @@ defaults = {
'system': {h({})}, 'system': {h({})},
'net': {h({})}, 'net': {h({})},
'exec': { 'exec': {
h({ # h({
'commands': [ # 'commands': [
f'sudo /usr/local/share/telegraf/procio', # f'sudo /usr/local/share/telegraf/procio',
], # ],
'data_format': 'influx', # 'data_format': 'influx',
'interval': '20s', # 'interval': '20s',
}), # }),
h({ # h({
'commands': [ # 'commands': [
f'/usr/local/share/telegraf/pressure_stall', # f'/usr/local/share/telegraf/pressure_stall',
], # ],
'data_format': 'influx', # 'data_format': 'influx',
'interval': '10s', # 'interval': '10s',
}), # }),
}, },
}, },
}, },

6
groups/os/linux.py
View file

@ -23,16 +23,16 @@
'metadata': { 'metadata': {
'dns': {}, 'dns': {},
'hosts': { 'hosts': {
'10.0.11.3': [ '10.0.10.2': [
'resolver.name', 'resolver.name',
'secondary.resolver.name', 'secondary.resolver.name',
], ],
}, },
'letsencrypt': { 'letsencrypt': {
'acme_node': 'netcup.mails', 'acme_node': 'htz.mails',
}, },
'nameservers': { 'nameservers': {
'10.0.11.3', '10.0.10.2',
}, },
'systemd-timers': { 'systemd-timers': {
'trim': { 'trim': {

6
nodes/home.homeassistant.py
View file

@ -68,20 +68,20 @@
}, },
}, },
'hosts': { 'hosts': {
'10.0.11.3': [ '10.0.10.2': [
'resolver.name', 'resolver.name',
'secondary.resolver.name', 'secondary.resolver.name',
], ],
}, },
'letsencrypt': { 'letsencrypt': {
'acme_node': 'netcup.mails', 'acme_node': 'htz.mails',
}, },
'homeassistant': { 'homeassistant': {
'domain': 'homeassistant.ckn.li', 'domain': 'homeassistant.ckn.li',
'os_agent_version': '1.6.0', 'os_agent_version': '1.6.0',
}, },
'nameservers': { 'nameservers': {
'10.0.11.3', '10.0.10.2',
}, },
'users': { 'users': {
'ckn': { 'ckn': {

6
nodes/home.server.py
View file

@ -63,7 +63,7 @@
'target': 'aarch64-unknown-linux-gnu', 'target': 'aarch64-unknown-linux-gnu',
}, },
}, },
'download_server': 'netcup.mails', 'download_server': 'htz.mails',
}, },
'gitea': { 'gitea': {
'version': '7.0.1', 'version': '7.0.1',
@ -169,10 +169,10 @@
'wireguard': { 'wireguard': {
'my_ip': '172.30.0.2/32', 'my_ip': '172.30.0.2/32',
's2s': { 's2s': {
'netcup.mails': { 'htz.mails': {
'allowed_ips': [ 'allowed_ips': [
'10.0.10.0/24', '10.0.10.0/24',
'10.0.11.0/24', '10.0.10.0/24',
'192.168.179.0/24', '192.168.179.0/24',
'10.0.227.0/24', # mseibert.freescout '10.0.227.0/24', # mseibert.freescout
], ],

2
nodes/htz.games.py
View file

@ -37,7 +37,7 @@
'network': { 'network': {
'internal': { 'internal': {
'interface': 'ens10', 'interface': 'ens10',
'ipv4': '10.0.10.3/32', 'ipv4': '10.0.10.2/32',
}, },
'external': { 'external': {
'interface': 'eth0', 'interface': 'eth0',

52
nodes/netcup.mails.py → nodes/htz.mails.py
View file

@ -1,37 +1,47 @@
{ {
'hostname': '202.61.255.108', 'hostname': '49.12.184.229',
'groups': [ 'groups': [
'backup', #'backup',
'debian-12', 'debian-12',
'hetzner-cloud',
'mailserver', 'mailserver',
'monitored', #'monitored',
'webserver', 'webserver',
'dnsserver', 'dnsserver',
'wordpress', #'wordpress',
#'left4dead2', #'left4dead2',
], ],
'bundles': [ 'bundles': [
'bind-acme', 'bind-acme',
'build-ci', #'build-ci',
'download-server', 'download-server',
'islamicstate.eu', 'islamicstate.eu',
'nginx-rtmps', #'nginx-rtmps',
#'steam', #'steam',
'wireguard', 'wireguard',
'zfs', 'zfs',
], ],
'metadata': { 'metadata': {
'users': {
'root': {
#'password': 'November99!!..',
},
},
'id': 'ea29bdf0-0b47-4bf4-8346-67d60c9dc4ae', 'id': 'ea29bdf0-0b47-4bf4-8346-67d60c9dc4ae',
'network': { 'network': {
'internal': { 'internal': {
'interface': 'eth1', 'interface': 'enp7s0',
'ipv4': '10.0.11.3/24', 'ipv4': '10.0.10.2/24',
}, },
'external': { 'external': {
'interface': 'eth0', 'interface': 'eth0',
'ipv4': '202.61.255.108/22', 'ipv4': '49.12.184.229/32',
'gateway4': '202.61.252.1', 'gateway4': '172.31.1.1',
'ipv6': '2a03:4000:55:a89::1/64', 'ipv6': '2a01:4f8:c013:51f2::1',
'gateway6': 'fe80::1', 'gateway6': 'fe80::1',
} }
}, },
@ -58,20 +68,20 @@
}, },
'dns': { 'dns': {
'ckn.li': { 'ckn.li': {
'A': ['202.61.255.108'], 'A': ['49.12.184.229'],
'AAAA': ['2a01:4f8:1c1c:4121::1'], 'AAAA': ['2a01:4f8:c013:51f2::1'],
}, },
'sublimity.de': { 'sublimity.de': {
'A': ['202.61.255.108'], 'A': ['49.12.184.229'],
'AAAA': ['2a01:4f8:1c1c:4121::1'], 'AAAA': ['2a01:4f8:c013:51f2::1'],
}, },
'freibrief.net': { 'freibrief.net': {
'A': ['202.61.255.108'], 'A': ['49.12.184.229'],
'AAAA': ['2a01:4f8:1c1c:4121::1'], 'AAAA': ['2a01:4f8:c013:51f2::1'],
}, },
'left4.me': { 'left4.me': {
'A': ['202.61.255.108'], 'A': ['49.12.184.229'],
'AAAA': ['2a01:4f8:1c1c:4121::1'], 'AAAA': ['2a01:4f8:c013:51f2::1'],
}, },
'elimu-kwanza.de': { 'elimu-kwanza.de': {
'TXT': ['google-site-verification=JwgcfXQ6nIXKxjMqUGHVBDISgMCQXgzMryPBsP2ZXnE'], 'TXT': ['google-site-verification=JwgcfXQ6nIXKxjMqUGHVBDISgMCQXgzMryPBsP2ZXnE'],
@ -209,7 +219,7 @@
}, },
'ovh.secondary': { 'ovh.secondary': {
'allowed_ips': [ 'allowed_ips': [
'10.0.11.0/24', '10.0.10.0/24',
], ],
}, },
'wb.offsite-backups': { 'wb.offsite-backups': {
@ -239,7 +249,7 @@
'pools': { 'pools': {
'tank': { 'tank': {
'devices': [ 'devices': [
'/dev/sda4', '/dev/disk/by-id/scsi-0HC_Volume_101332312',
], ],
}, },
}, },

6
nodes/mseibert.freescout.py
View file

@ -1,5 +1,5 @@
{ {
#'dummy': True, 'dummy': True,
'hostname': '159.69.117.89', 'hostname': '159.69.117.89',
'groups': [ 'groups': [
'backup', 'backup',
@ -37,13 +37,13 @@
'wireguard': { 'wireguard': {
'my_ip': '172.30.0.238/32', 'my_ip': '172.30.0.238/32',
's2s': { 's2s': {
'netcup.mails': { 'htz.mails': {
'allowed_ips': [ 'allowed_ips': [
'10.0.0.0/24', '10.0.0.0/24',
'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.11.0/24', '10.0.10.0/24',
], ],
}, },
}, },

8
nodes/ovh.secondary.py
View file

@ -20,22 +20,22 @@
}, },
}, },
'bind': { 'bind': {
'master_node': 'netcup.mails', 'master_node': 'htz.mails',
'hostname': 'secondary.resolver.name', 'hostname': 'secondary.resolver.name',
}, },
# 'postfix': { # 'postfix': {
# 'master_node': 'netcup.mails', # 'master_node': 'htz.mails',
# 'hostname': 'mail2.sublimity.de', # 'hostname': 'mail2.sublimity.de',
# }, # },
'wireguard': { 'wireguard': {
'my_ip': '172.30.0.3/32', 'my_ip': '172.30.0.3/32',
's2s': { 's2s': {
'netcup.mails': { 'htz.mails': {
'allowed_ips': [ 'allowed_ips': [
'10.0.0.0/24', '10.0.0.0/24',
'10.0.2.0/24', '10.0.2.0/24',
'10.0.9.0/24', '10.0.9.0/24',
'10.0.11.0/24', '10.0.10.0/24',
], ],
}, },
}, },

4
nodes/wb.offsite-backups.py
View file

@ -43,13 +43,13 @@
'wireguard': { 'wireguard': {
'my_ip': '172.30.0.4/32', 'my_ip': '172.30.0.4/32',
's2s': { 's2s': {
'netcup.mails': { 'htz.mails': {
'allowed_ips': [ 'allowed_ips': [
'10.0.0.0/24', '10.0.0.0/24',
'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.11.0/24', '10.0.10.0/24',
], ],
}, },
}, },