diff --git a/bundles/ifupdown/items.py b/bundles/ifupdown/items.py new file mode 100644 index 0000000..9972a7e --- /dev/null +++ b/bundles/ifupdown/items.py @@ -0,0 +1,3 @@ +# svc_systemd = { +# 'ifupdown.service': {}, +# } diff --git a/bundles/mariadb/files/override.conf b/bundles/mariadb/files/override.conf deleted file mode 100644 index ae2fccd..0000000 --- a/bundles/mariadb/files/override.conf +++ /dev/null @@ -1,11 +0,0 @@ -% for section, options in sorted(conf.items()): -[${section}] -% for key, value in sorted(options.items()): -% if value is None: -${key} -% else: -${key} = ${value} -% endif -% endfor - -% endfor diff --git a/bundles/mariadb/items.py b/bundles/mariadb/items.py index 58fd34e..6758c48 100644 --- a/bundles/mariadb/items.py +++ b/bundles/mariadb/items.py @@ -10,8 +10,6 @@ directories = { 'group': 'mysql', 'needs': [ 'zfs_dataset:tank/mariadb', - ], - 'needs': [ 'pkg_apt:mariadb-server', 'pkg_apt:mariadb-client', ], @@ -20,10 +18,8 @@ directories = { files = { '/etc/mysql/conf.d/override.conf': { - 'context': { - 'conf': node.metadata.get('mariadb/conf'), - }, - 'content_type': 'mako', + 'content': repo.libs.ini.dumps(node.metadata.get('mariadb/conf')), + 'content_type': 'text', }, } diff --git a/bundles/mariadb/metadata.py b/bundles/mariadb/metadata.py index 8b65e31..ee406cb 100644 --- a/bundles/mariadb/metadata.py +++ b/bundles/mariadb/metadata.py @@ -3,12 +3,12 @@ defaults = { 'packages': { 'mariadb-server': { 'needs': { - #'zfs_dataset:tank/mariadb', + 'zfs_dataset:tank/mariadb', }, }, 'mariadb-client': { 'needs': { - #'zfs_dataset:tank/mariadb', + 'zfs_dataset:tank/mariadb', }, }, }, diff --git a/bundles/network/metadata.py b/bundles/network/metadata.py index 8e8adbd..9e70910 100644 --- a/bundles/network/metadata.py +++ b/bundles/network/metadata.py @@ -36,61 +36,64 @@ def dhcp(metadata): 'systemd/units', ) def units(metadata): - units = {} + if node.has_bundle('systemd-networkd'): + units = {} - for network_name, network_conf in metadata.get('network').items(): - interface_type = network_conf.get('type', None) + for network_name, network_conf in metadata.get('network').items(): + interface_type = network_conf.get('type', None) - # network + # network - units[f'{network_name}.network'] = { - 'Match': { - 'Name': network_name if interface_type == 'vlan' else network_conf['interface'], - }, - 'Network': { - 'DHCP': network_conf.get('dhcp', 'no'), - 'IPv6AcceptRA': network_conf.get('dhcp', 'no'), - 'VLAN': set(network_conf.get('vlans', set())) - } - } - - # type - - if interface_type: - units[f'{network_name}.network']['Match']['Type'] = interface_type - - # ips - - for i in [4, 6]: - if network_conf.get(f'ipv{i}', None): - units[f'{network_name}.network'].update({ - f'Address#ipv{i}': { - 'Address': network_conf[f'ipv{i}'], - }, - }) - if f'gateway{i}' in network_conf: - units[f'{network_name}.network'].update({ - f'Route#ipv{i}': { - 'Gateway': network_conf[f'gateway{i}'], - 'GatewayOnlink': 'yes', - } - }) - - # as vlan - - if interface_type == 'vlan': - units[f"{network_name}.netdev"] = { - 'NetDev': { - 'Name': network_name, - 'Kind': 'vlan', + units[f'{network_name}.network'] = { + 'Match': { + 'Name': network_name if interface_type == 'vlan' else network_conf['interface'], }, - 'VLAN': { - 'Id': network_conf['id'], + 'Network': { + 'DHCP': network_conf.get('dhcp', 'no'), + 'IPv6AcceptRA': network_conf.get('dhcp', 'no'), + 'VLAN': set(network_conf.get('vlans', set())) } } - return { - 'systemd': { - 'units': units, + # type + + if interface_type: + units[f'{network_name}.network']['Match']['Type'] = interface_type + + # ips + + for i in [4, 6]: + if network_conf.get(f'ipv{i}', None): + units[f'{network_name}.network'].update({ + f'Address#ipv{i}': { + 'Address': network_conf[f'ipv{i}'], + }, + }) + if f'gateway{i}' in network_conf: + units[f'{network_name}.network'].update({ + f'Route#ipv{i}': { + 'Gateway': network_conf[f'gateway{i}'], + 'GatewayOnlink': 'yes', + } + }) + + # as vlan + + if interface_type == 'vlan': + units[f"{network_name}.netdev"] = { + 'NetDev': { + 'Name': network_name, + 'Kind': 'vlan', + }, + 'VLAN': { + 'Id': network_conf['id'], + } + } + + return { + 'systemd': { + 'units': units, + } } - } + else: + return {} diff --git a/bundles/proxmox-ve/items.py b/bundles/proxmox-ve/items.py new file mode 100644 index 0000000..d00540f --- /dev/null +++ b/bundles/proxmox-ve/items.py @@ -0,0 +1,21 @@ +files = { + '/etc/apt/apt.conf.d/10pveapthook': { + 'content_type': 'any', + 'mode': '0644', + }, + '/etc/apt/apt.conf.d/76pveconf': { + 'content_type': 'any', + 'mode': '0444', + }, + '/etc/apt/apt.conf.d/76pveproxy': { + 'content_type': 'any', + 'mode': '0444', + }, + '/etc/network/interfaces': { + 'content_type': 'any', + }, +} + +symlinks['/etc/ssh/ssh_host_rsa_key.pub'] = { + 'target': '/etc/ssh/ssh_host_managed_key.pub', +} diff --git a/bundles/proxmox-ve/metadata.py b/bundles/proxmox-ve/metadata.py new file mode 100644 index 0000000..0abe2ae --- /dev/null +++ b/bundles/proxmox-ve/metadata.py @@ -0,0 +1,99 @@ +defaults = { + 'apt': { + 'packages': { + 'linux-image-amd64': { + 'installed': False, + }, + 'proxmox-default-kernel': {}, + # after reboot + 'proxmox-ve': {}, + 'postfix': {}, + 'open-iscsi': {}, + 'chrony': {}, + 'os-prober': { + 'installed': False, + }, + 'dnsmasq-base': {}, + }, + 'sources': { + 'proxmox-ve': { + 'options': { + 'aarch': 'amd64', + }, + 'urls': { + 'http://download.proxmox.com/debian/pve', + }, + 'suites': { + '{codename}', + }, + 'components': { + 'pve-no-subscription', + }, + 'key': 'proxmox-ve-{codename}', + }, + }, + }, + # 'nftables': { + # 'input': { + # 'tcp dport 8006 accept', + # }, + # }, + 'zfs': { + 'datasets': { + 'tank/proxmox-ve': { + 'mountpoint': '/var/lib/proxmox-ve', + }, + } + } +} + + +# @metadata_reactor.provides( +# 'systemd', +# ) +# def bridge(metadata): +# return { +# 'systemd': { +# 'units': { +# # f'internal.network': { +# # 'Network': { +# # 'Bridge': 'br0', +# # }, +# # }, +# 'br0.netdev': { +# 'NetDev': { +# 'Name': 'br0', +# 'Kind': 'bridge' +# }, +# }, +# 'br0.network': { +# 'Match': { +# 'Name': 'br0', +# }, +# 'Network': { +# 'Unmanaged': 'yes' +# }, +# }, +# }, +# }, +# } + + +@metadata_reactor.provides( + 'nginx/vhosts', +) +def nginx(metadata): + return { + 'nginx': { + 'has_websockets': True, + 'vhosts': { + metadata.get('proxmox-ve/domain'): { + 'content': 'nginx/proxy_pass.conf', + 'context': { + 'target': 'https://localhost:8006', + 'websockets': True, + } + }, + }, + }, + } diff --git a/bundles/systemd-networkd/items.py b/bundles/systemd-networkd/items.py index 47bb2bd..af033ba 100644 --- a/bundles/systemd-networkd/items.py +++ b/bundles/systemd-networkd/items.py @@ -21,4 +21,3 @@ directories = { svc_systemd = { 'systemd-networkd.service': {}, } - diff --git a/data/apt/keys/proxmox-ve-bookworm.gpg b/data/apt/keys/proxmox-ve-bookworm.gpg new file mode 100644 index 0000000..8e6e95e Binary files /dev/null and b/data/apt/keys/proxmox-ve-bookworm.gpg differ diff --git a/groups/os/debian-11.py b/groups/os/debian-11.py index 81c8de7..bde0f45 100644 --- a/groups/os/debian-11.py +++ b/groups/os/debian-11.py @@ -2,6 +2,9 @@ 'supergroups': [ 'debian', ], + 'bundles': [ + 'systemd-networkd', + ], 'metadata': { 'php': { 'version': '7.4', diff --git a/groups/os/debian-12-common.py b/groups/os/debian-12-common.py new file mode 100644 index 0000000..4c3e8ba --- /dev/null +++ b/groups/os/debian-12-common.py @@ -0,0 +1,26 @@ +{ + 'metadata': { + 'apt': { + 'sources': { + 'debian': { + 'components': { + 'non-free-firmware', + }, + }, + 'debian-security': { + 'components': { + 'non-free-firmware', + }, + }, + }, + }, + 'php': { + 'version': '8.2', + }, + 'postgresql': { + 'version': '15', + }, + 'os_codename': 'bookworm', + }, + 'os_version': (12,), +} diff --git a/groups/os/debian-12-pve.py b/groups/os/debian-12-pve.py new file mode 100644 index 0000000..cbe54c9 --- /dev/null +++ b/groups/os/debian-12-pve.py @@ -0,0 +1,10 @@ +{ + 'supergroups': [ + 'debian', + 'debian-12-common', + ], + 'bundles': [ + 'ifupdown', + 'proxmox-ve', + ], +} diff --git a/groups/os/debian-12.py b/groups/os/debian-12.py index e749175..6318024 100644 --- a/groups/os/debian-12.py +++ b/groups/os/debian-12.py @@ -1,6 +1,10 @@ { 'supergroups': [ 'debian', + 'debian-12-common', + ], + 'bundles': [ + 'systemd-networkd', ], 'metadata': { 'apt': { diff --git a/groups/os/debian.py b/groups/os/debian.py index 69bb0d2..270fa60 100644 --- a/groups/os/debian.py +++ b/groups/os/debian.py @@ -47,6 +47,14 @@ 'mtr-tiny': {}, }, }, + # iperf3 + 'nftables': { + 'input': { + 'tcp dport 5201 accept', + 'udp dport 5201 accept', + }, + }, + }, 'os': 'debian', 'pip_command': 'pip3', diff --git a/groups/os/linux.py b/groups/os/linux.py index 3b38dd0..21f82a3 100644 --- a/groups/os/linux.py +++ b/groups/os/linux.py @@ -14,7 +14,6 @@ 'system', 'systemd', 'systemd-journald', - 'systemd-networkd', 'systemd-mount', 'systemd-timers', 'users', diff --git a/libs/ini.py b/libs/ini.py index f042569..f530144 100644 --- a/libs/ini.py +++ b/libs/ini.py @@ -14,7 +14,7 @@ class CaseSensitiveConfigParser(ConfigParser): return value def parse(text): - config = CaseSensitiveConfigParser() + config = CaseSensitiveConfigParser(allow_no_value=True) config.read_string(text) return { @@ -24,8 +24,7 @@ def parse(text): def dumps(dict): sorted_dict = json.loads(json.dumps(dict, sort_keys=True, cls=MetadataJSONEncoder)) - - parser = CaseSensitiveConfigParser() + parser = CaseSensitiveConfigParser(allow_no_value=True) parser.read_dict(sorted_dict) writable = Writable() diff --git a/nodes/home.router.py b/nodes/home.router.py index d5ace54..12169fd 100644 --- a/nodes/home.router.py +++ b/nodes/home.router.py @@ -15,10 +15,10 @@ 'id': '1d6a43e5-858c-42f9-9c40-ab63d61c787c', 'network': { 'external': { - 'interface': 'enx00e04c220682', + 'interface': 'enp2s0', 'ipv4': '10.0.99.126/24', 'gateway4': '10.0.99.1', - 'vlans': {'iot', 'internet', 'guest', 'rolf', 'internal'}, + 'vlans': {'iot', 'internet', 'guest', 'rolf', 'internal', 'proxmox'}, }, 'internal': { 'type': 'vlan', @@ -37,6 +37,12 @@ 'id': 3, 'ipv4': '10.0.3.1/24', }, + 'proxmox': { + 'type': 'vlan', + 'id': 4, + 'ipv4': '10.0.4.1/24', + 'dhcp_server': True, + }, 'guest': { 'type': 'vlan', 'id': 9, diff --git a/nodes/home.server.py b/nodes/home.server.py index b8e6c80..4b30c61 100644 --- a/nodes/home.server.py +++ b/nodes/home.server.py @@ -3,7 +3,7 @@ 'groups': [ 'autologin', 'backup', - 'debian-12', + 'debian-12-pve', 'home', 'nextcloud', 'monitored', @@ -12,7 +12,6 @@ 'build-server', ], 'bundles': [ - 'apcupsd', 'build-agent', 'crystal', 'gitea', @@ -32,7 +31,6 @@ 'systemd-swap', 'twitch-clip-download', 'raspberrymatic-cert', - #'tasmota-charge', 'wol-waker', 'zfs', ], @@ -47,7 +45,7 @@ }, 'apt': { 'packages': { - 'firmware-realtek': {}, + # 'firmware-realtek': {}, proxmox-ve incompatibility }, }, 'build-server': { @@ -124,6 +122,9 @@ 'unsortable': 'SofortUpload/Unsortable', }, }, + 'proxmox-ve': { + 'domain': 'pve.ckn.li', + }, 'raspberrymatic-cert': { 'domain': 'homematic.ckn.li', 'node': 'home.homematic', @@ -152,18 +153,6 @@ }, }, 'systemd-swap': 4_000_000_000, - 'tasmota-charge': { - 'phone': { - 'ip': '10.0.0.175', - 'user': 'u0_a233', - 'password': 'november', - }, - 'plug': { - 'ip': '10.0.2.115', - 'min': 45, - 'max': 70, - }, - }, 'twitch-clip-download': { 'channel_name': 'cronekorkn_', },