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

proxmox_mergable #22

Merged
cronekorkn merged 6 commits from proxmox_mergable into master 2025-06-29 12:25:34 +02:00
Conversation 0 Commits 6 Files changed 18 +246 -92
18 changed files with 246 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bundles/ifupdown/items.py Normal file
View file

@ -0,0 +1,3 @@
# svc_systemd = {
# 'ifupdown.service': {},
# }

11
bundles/mariadb/files/override.conf
View file

@ -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

8
bundles/mariadb/items.py
View file

@ -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',
},
}

4
bundles/mariadb/metadata.py
View file

@ -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',
},
},
},

3
bundles/network/metadata.py
View file

@ -36,6 +36,7 @@ def dhcp(metadata):
'systemd/units',
)
def units(metadata):
if node.has_bundle('systemd-networkd'):
units = {}
for network_name, network_conf in metadata.get('network').items():
@ -94,3 +95,5 @@ def units(metadata):
'units': units,
}
}
else:
return {}

21
bundles/proxmox-ve/items.py Normal file
View file

@ -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',
}

99
bundles/proxmox-ve/metadata.py Normal file
View file

@ -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,
}
},
},
},
}

1
bundles/systemd-networkd/items.py
View file

@ -21,4 +21,3 @@ directories = {
svc_systemd = {
'systemd-networkd.service': {},
}

BIN
data/apt/keys/proxmox-ve-bookworm.gpg Normal file
View file

Binary file not shown.

3
groups/os/debian-11.py
View file

@ -2,6 +2,9 @@
'supergroups': [
'debian',
],
'bundles': [
'systemd-networkd',
],
'metadata': {
'php': {
'version': '7.4',

26
groups/os/debian-12-common.py Normal file
View file

@ -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,),
}

10
groups/os/debian-12-pve.py Normal file
View file

@ -0,0 +1,10 @@
{
'supergroups': [
'debian',
'debian-12-common',
],
'bundles': [
'ifupdown',
'proxmox-ve',
],
}

4
groups/os/debian-12.py
View file

@ -1,6 +1,10 @@
{
'supergroups': [
'debian',
'debian-12-common',
],
'bundles': [
'systemd-networkd',
],
'metadata': {
'apt': {

8
groups/os/debian.py
View file

@ -47,6 +47,14 @@
'mtr-tiny': {},
},
},
# iperf3
'nftables': {
'input': {
'tcp dport 5201 accept',
'udp dport 5201 accept',
},
},
},
'os': 'debian',
'pip_command': 'pip3',

1
groups/os/linux.py
View file

@ -14,7 +14,6 @@
'system',
'systemd',
'systemd-journald',
'systemd-networkd',
'systemd-mount',
'systemd-timers',
'users',

5
libs/ini.py
View file

@ -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()

10
nodes/home.router.py
View file

@ -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,

21
nodes/home.server.py
View file

@ -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_',
},