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..52cc30a --- /dev/null +++ b/bundles/proxmox-ve/metadata.py @@ -0,0 +1,98 @@ +defaults = { + 'apt': { + 'packages': { + 'linux-image-amd64': { + 'installed': False, + }, + 'proxmox-default-kernel': {}, + # after reboot + 'proxmox-ve': {}, + 'postfix': {}, + 'open-iscsi': {}, + 'chrony': {}, + 'os-prober': { + 'installed': False, + }, + }, + '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..f8b80c8 100644 --- a/bundles/systemd-networkd/items.py +++ b/bundles/systemd-networkd/items.py @@ -1,9 +1,6 @@ assert node.has_bundle('systemd') files = { - '/etc/network/interfaces': { - 'delete': True, - }, '/etc/resolv.conf': { 'content_type': 'mako', }, @@ -22,3 +19,8 @@ svc_systemd = { 'systemd-networkd.service': {}, } + +if not node.has_bundle('proxmox-ve'): + files['/etc/network/interfaces'] = { + 'delete': True, + } 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..ea29665 --- /dev/null +++ b/groups/os/debian-12-pve.py @@ -0,0 +1,9 @@ +{ + 'supergroups': [ + 'debian', + 'debian-12-common', + ], + 'bundles': [ + 'ifupdown', + ], +} 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/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/nodes/home.router.py b/nodes/home.router.py index d5ace54..b4ec4fc 100644 --- a/nodes/home.router.py +++ b/nodes/home.router.py @@ -18,7 +18,7 @@ 'interface': 'enx00e04c220682', '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..cef6c5b 100644 --- a/nodes/home.server.py +++ b/nodes/home.server.py @@ -35,6 +35,7 @@ #'tasmota-charge', 'wol-waker', 'zfs', + 'proxmox-ve', ], 'metadata': { 'id': 'af96709e-b13f-4965-a588-ef2cd476437a', @@ -47,7 +48,7 @@ }, 'apt': { 'packages': { - 'firmware-realtek': {}, + # 'firmware-realtek': {}, proxmox-ve incompatibility }, }, 'build-server': { @@ -124,6 +125,9 @@ 'unsortable': 'SofortUpload/Unsortable', }, }, + 'proxmox-ve': { + 'domain': 'pve.ckn.li', + }, 'raspberrymatic-cert': { 'domain': 'homematic.ckn.li', 'node': 'home.homematic',