various fixes, remove some TODOs

This commit is contained in:
Franzi 2021-11-27 10:40:20 +01:00
parent a76c60f881
commit 74f5b25f0d
Signed by: kunsi
GPG key ID: 12E3D2136B818350
6 changed files with 7 additions and 17 deletions

View file

@ -1,3 +1,3 @@
deb http://deb.debian.org/debian/ bullseye main non-free contrib
#deb http://security.debian.org/debian-security bullseye/updates main contrib non-free
deb http://security.debian.org/debian-security bullseye-security main contrib non-free
deb http://deb.debian.org/debian/ bullseye-updates main contrib non-free

View file

@ -3,8 +3,6 @@ from uuid import UUID
from bundlewrap.utils.text import italic
# TODO support non-systemd systems
files = {
'/etc/default/locale': {
'content_type': 'mako',

View file

@ -4,15 +4,18 @@ defaults = {
'apt': {
'packages': {
'nftables': {},
# XXX remove after all systems have been migrated
},
},
'pacman': {
'packages': {
'nftables': {},
'iptables': {
'installed': False,
'needed_by': {
'pkg_pacman:iptables-nft',
},
},
'iptables-nft': {
# uninstalls iptables automatically
'needed_by': {
'pkg_pacman:nftables',
},

View file

@ -36,15 +36,6 @@ nodes['home.router'] = {
'snmp': {},
'snmp-mibs-downloader': {},
},
# XXX remove this once nginx.org has packages for debian bullseye
'repos': {
'nginx': {
'items': atomic({
'deb http://nginx.org/packages/debian buster nginx',
}),
},
},
},
'backups': {
'exclude_from_backups': True,

View file

@ -18,7 +18,6 @@ nodes['kunsi-t470'] = {
},
'hosts': {
'entries': {
# XXX maybe outdated, verify on next train trip
'10.101.64.10': {
'www.wifionice.de',
'wifionice.de',

View file

@ -480,7 +480,6 @@ nodes['rx300'] = {
'185.106.84.32/26',
'2001:67c:20a0:e::/64',
},
# TODO change this
'password': bwpass.password('bw/rx300/rspamd'),
'dkim': 'uO4aNejDvVdw8BKne3KJIqAvCQMJ0416',
},