Compare commits
No commits in common. "main" and "navidrome" have entirely different histories.
72 changed files with 336 additions and 8410 deletions
|
|
@ -138,7 +138,6 @@ pkg_apt = {
|
|||
'tmux': {},
|
||||
'tree': {},
|
||||
'unzip': {},
|
||||
'util-linux': {},
|
||||
'vim': {},
|
||||
'wget': {},
|
||||
'whois': {},
|
||||
|
|
@ -156,6 +155,9 @@ pkg_apt = {
|
|||
'popularity-contest': {
|
||||
'installed': False,
|
||||
},
|
||||
'python3-packaging': {
|
||||
'installed': False,
|
||||
},
|
||||
'unattended-upgrades': {
|
||||
'installed': False,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -15,15 +15,16 @@ for line in check_output('LC_ALL=C zfs list -H -t snapshot -o name', shell=True)
|
|||
line = line.decode('UTF-8')
|
||||
|
||||
if line.startswith('{}/'.format(server_settings['zfs-base'])):
|
||||
try:
|
||||
dataset, snapname = line.split('@', 1)
|
||||
dataset, snapname = line.split('@', 1)
|
||||
|
||||
dataset = dataset.split('/')[-1]
|
||||
ts, bucket = snapname.split('-', 1)
|
||||
dataset = dataset.split('/')[-1]
|
||||
ts, bucket = snapname.split('-', 1)
|
||||
|
||||
snapshots[dataset].add(int(ts))
|
||||
except Exception as e:
|
||||
print(f"Exception while parsing snapshot name {line!r}: {e!r}")
|
||||
if not ts.isdigit():
|
||||
# garbage, ignore
|
||||
continue
|
||||
|
||||
snapshots[dataset].add(int(ts))
|
||||
|
||||
backups = {}
|
||||
for dataset, snaps in snapshots.items():
|
||||
|
|
|
|||
|
|
@ -83,24 +83,47 @@ def zfs_pool(metadata):
|
|||
|
||||
devices = metadata.get('backup-server/encrypted-devices')
|
||||
|
||||
pool_devices = set()
|
||||
# TODO remove this once we have migrated all systems
|
||||
if isinstance(devices, dict):
|
||||
pool_devices = set()
|
||||
|
||||
for device, dconfig in devices.items():
|
||||
crypt_devices[dconfig['device']] = {
|
||||
'dm-name': f'backup-{device}',
|
||||
'passphrase': dconfig['passphrase'],
|
||||
}
|
||||
pool_devices.add(f'/dev/mapper/backup-{device}')
|
||||
unlock_actions.add(f'action:dm-crypt_open_backup-{device}')
|
||||
for number, (device, passphrase) in enumerate(sorted(devices.items())):
|
||||
crypt_devices[device] = {
|
||||
'dm-name': f'backup{number}',
|
||||
'passphrase': passphrase,
|
||||
}
|
||||
pool_devices.add(f'/dev/mapper/backup{number}')
|
||||
unlock_actions.add(f'action:dm-crypt_open_backup{number}')
|
||||
|
||||
pool_config = [{
|
||||
'devices': pool_devices,
|
||||
}]
|
||||
pool_config = [{
|
||||
'devices': pool_devices,
|
||||
}]
|
||||
|
||||
if len(pool_devices) > 2:
|
||||
pool_config[0]['type'] = 'raidz'
|
||||
elif len(pool_devices) > 1:
|
||||
pool_config[0]['type'] = 'mirror'
|
||||
if len(pool_devices) > 2:
|
||||
pool_config[0]['type'] = 'raidz'
|
||||
elif len(pool_devices) > 1:
|
||||
pool_config[0]['type'] = 'mirror'
|
||||
|
||||
elif isinstance(devices, list):
|
||||
pool_config = []
|
||||
|
||||
for idx, intended_pool in enumerate(devices):
|
||||
pool_devices = set()
|
||||
|
||||
for number, (device, passphrase) in enumerate(sorted(intended_pool.items())):
|
||||
crypt_devices[device] = {
|
||||
'dm-name': f'backup{idx}-{number}',
|
||||
'passphrase': passphrase,
|
||||
}
|
||||
pool_devices.add(f'/dev/mapper/backup{idx}-{number}')
|
||||
unlock_actions.add(f'action:dm-crypt_open_backup{idx}-{number}')
|
||||
|
||||
pool_config.append({
|
||||
'devices': pool_devices,
|
||||
'type': 'raidz',
|
||||
})
|
||||
else:
|
||||
raise BundleError(f'{node.name}: unsupported configuration for backup-server/encrypted-devices')
|
||||
|
||||
return {
|
||||
'backup-server': {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
import logging
|
||||
from json import loads
|
||||
from os import environ
|
||||
from subprocess import check_output
|
||||
|
|
@ -13,8 +12,6 @@ PSQL_USER = environ['DB_USERNAME']
|
|||
PSQL_PASS = environ['DB_PASSWORD']
|
||||
PSQL_DB = environ['DB_DATABASE_NAME']
|
||||
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
|
||||
docker_networks = loads(check_output(['docker', 'network', 'inspect', 'aaarghhh']))
|
||||
|
||||
container_ip = None
|
||||
|
|
@ -29,11 +26,11 @@ for network in docker_networks:
|
|||
container_ip = container['IPv4Address'].split('/')[0]
|
||||
|
||||
if not container_ip:
|
||||
logging.error(f'could not find ip address for container {PSQL_HOST=} in json')
|
||||
logging.debug(f'{docker_networks=}')
|
||||
exit(0)
|
||||
print(f'could not find ip address for container {PSQL_HOST=} in json')
|
||||
print(docker_networks)
|
||||
exit(1)
|
||||
|
||||
logging.debug(f'{PSQL_HOST=} {container_ip=}')
|
||||
print(f'{PSQL_HOST=} {container_ip=}')
|
||||
|
||||
conn = psycopg2.connect(
|
||||
dbname=PSQL_DB,
|
||||
|
|
@ -52,7 +49,6 @@ with conn:
|
|||
}
|
||||
for i in cur.fetchall()
|
||||
}
|
||||
logging.debug(f'{albums=}')
|
||||
|
||||
with conn.cursor() as cur:
|
||||
cur.execute('SELECT "id","name" FROM users;')
|
||||
|
|
@ -60,28 +56,25 @@ with conn:
|
|||
i[0]: i[1]
|
||||
for i in cur.fetchall()
|
||||
}
|
||||
logging.debug(f'{users=}')
|
||||
|
||||
for album_id, album in albums.items():
|
||||
log = logging.getLogger(album["name"])
|
||||
print(f'----- working on album: {album["name"]}')
|
||||
with conn:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute('SELECT "usersId" FROM albums_shared_users_users WHERE "albumsId" = %s;', (album_id,))
|
||||
album_shares = [i[0] for i in cur.fetchall()]
|
||||
log.info(f'album is shared with {len(album_shares)} users')
|
||||
log.debug(f'{album_shares=}')
|
||||
print(f' album is shared with {len(album_shares)} users: {album_shares}')
|
||||
for user_id, user_name in users.items():
|
||||
if user_id == album['owner'] or user_id in album_shares:
|
||||
continue
|
||||
|
||||
log.info(f'sharing album with user {user_name}')
|
||||
try:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
'INSERT INTO albums_shared_users_users ("albumsId","usersId","role") VALUES (%s, %s, %s);',
|
||||
(album_id, user_id, 'viewer'),
|
||||
)
|
||||
except Exception:
|
||||
log.exception('failure while creating share')
|
||||
print(f' sharing album with user {user_name} ... ', end='')
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
'INSERT INTO albums_shared_users_users ("albumsId","usersId","role") VALUES (%s, %s, %s);',
|
||||
(album_id, user_id, 'viewer'),
|
||||
)
|
||||
print('done')
|
||||
print()
|
||||
|
||||
conn.close()
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
directories['/opt/hetzner-dyndns/src'] = {}
|
||||
|
||||
git_deploy['/opt/hetzner-dyndns/src'] = {
|
||||
'repo': 'https://git.franzi.business/sophie/hetzner-dyndns.git',
|
||||
'rev': 'main',
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
defaults = {
|
||||
'systemd-timers': {
|
||||
'timers': {
|
||||
'hetzner-dyndns-update': {
|
||||
'when': 'hourly',
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
@metadata_reactor.provides(
|
||||
'systemd-timers/timers/hetzner-dyndns-update',
|
||||
)
|
||||
def command_template(metadata):
|
||||
empty_command = f'/usr/bin/python3 /opt/hetzner-dyndns/src/hetzner-api-dyndns.py --api_key {{}} --zone {node.metadata.get('hetzner-dyndns/zone')} --record {node.metadata.get('hetzner-dyndns/record')}'
|
||||
|
||||
return {
|
||||
'systemd-timers': {
|
||||
'timers': {
|
||||
'hetzner-dyndns-update': {
|
||||
'command': node.metadata.get('hetzner-dyndns/api_key').format_into(empty_command),
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
@ -46,7 +46,6 @@ bridge:
|
|||
- username
|
||||
- phone number
|
||||
displayname_max_length: 100
|
||||
caption_in_message: true
|
||||
allow_avatar_remove: false
|
||||
max_initial_member_sync: -1
|
||||
sync_channel_members: true
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
# ensure users set this to avoid using the shared key
|
||||
node.metadata.get('navidrome/config/PasswordEncryptionKey')
|
||||
|
||||
users = {
|
||||
'navidrome': {
|
||||
'home': '/opt/navidrome',
|
||||
|
|
@ -24,7 +21,9 @@ svc_systemd = {
|
|||
}
|
||||
|
||||
actions['navidrome_install'] = {
|
||||
'command': 'tar -C /opt/navidrome -xf /opt/navidrome/navidrome.tar.gz',
|
||||
'command': ' && '.join([
|
||||
'tar -C /opt/navidrome -xf /opt/navidrome/navidrome.tar.gz',
|
||||
]),
|
||||
'after': {
|
||||
'pkg_apt:',
|
||||
},
|
||||
|
|
@ -42,12 +41,6 @@ files = {
|
|||
},
|
||||
},
|
||||
'/etc/systemd/system/navidrome.service': {
|
||||
'triggers': {
|
||||
'action:systemd-reload',
|
||||
},
|
||||
'delete': True,
|
||||
},
|
||||
'/usr/local/lib/systemd/system/navidrome.service': {
|
||||
'triggers': {
|
||||
'action:systemd-reload',
|
||||
'svc_systemd:navidrome:restart',
|
||||
|
|
|
|||
|
|
@ -6,58 +6,39 @@ defaults = {
|
|||
|
||||
},
|
||||
},
|
||||
'backups': {
|
||||
'paths': {
|
||||
'/var/opt/navidrome',
|
||||
},
|
||||
},
|
||||
'navidrome': {
|
||||
'config': {
|
||||
'Address': '127.0.0.1',
|
||||
'DataFolder': '/var/opt/navidrome',
|
||||
'Address': '127.0.0.1',
|
||||
'MusicFolder': '/mnt/music',
|
||||
'EnableExternalServices': False,
|
||||
'EnableInsightsCollector': False,
|
||||
'LastFM.Enabled': False,
|
||||
'ListenBrainz.Enabled': False,
|
||||
'PasswordEncryptionKey': repo.vault.password_for('{} encryption navidrome'.format(node.name)),
|
||||
'Scanner.Schedule': '@every 72h',
|
||||
'Port': 4533,
|
||||
'LastFM': {
|
||||
'Enabled': False,
|
||||
},
|
||||
},
|
||||
'zfs': {
|
||||
'datasets': {
|
||||
'tank/navidrome': {},
|
||||
'tank/navidrome/install': {
|
||||
'mountpoint': '/opt/navidrome',
|
||||
'needed_by': {
|
||||
'directory:/opt/navidrome',
|
||||
},
|
||||
},
|
||||
'ListenBrainz': {
|
||||
'Enabled': False,
|
||||
},
|
||||
'Scanner': {
|
||||
'Schedule': '@every 72h',
|
||||
'tank/navidrome/home': {
|
||||
'mountpoint': '/var/opt/navidrome',
|
||||
'needed_by': {
|
||||
'directory:/var/opt/navidrome',
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
@metadata_reactor.provides(
|
||||
'zfs/datasets',
|
||||
)
|
||||
def zfs(metadata):
|
||||
zfs_base = metadata.get('navidrome/zfs_base', 'tank')
|
||||
return {
|
||||
'zfs': {
|
||||
'datasets': {
|
||||
f'{zfs_base}/navidrome': {},
|
||||
f'{zfs_base}/navidrome/install': {
|
||||
'mountpoint': '/opt/navidrome',
|
||||
'needed_by': {
|
||||
'directory:/opt/navidrome',
|
||||
},
|
||||
},
|
||||
f'{zfs_base}/navidrome/home': {
|
||||
'mountpoint': '/var/opt/navidrome',
|
||||
'needed_by': {
|
||||
'directory:/var/opt/navidrome',
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
@metadata_reactor.provides(
|
||||
'navidrome/config/baseurl',
|
||||
)
|
||||
|
|
@ -86,34 +67,10 @@ def nginx(metadata):
|
|||
'locations': {
|
||||
'/': {
|
||||
'target': f'http://127.0.0.1:{metadata.get('navidrome/config/Port')}',
|
||||
# some requests take a loooooong time (for example,
|
||||
# "delete all missing files" will wait until
|
||||
# everything has been purged from the database)
|
||||
'proxy_read_timeout': '1h',
|
||||
},
|
||||
},
|
||||
'website_check_path': '/app/',
|
||||
'website_check_string': 'Navidrome Music Server',
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
@metadata_reactor.provides(
|
||||
'icinga2_api/navidrome/services',
|
||||
)
|
||||
def icinga_check_for_new_release(metadata):
|
||||
version = metadata.get('navidrome/version')
|
||||
return {
|
||||
'icinga2_api': {
|
||||
'pretalx': {
|
||||
'services': {
|
||||
'NAVIDROME UPDATE': {
|
||||
'command_on_monitored_host': '/usr/local/share/icinga/plugins/check_github_for_new_release navidrome/navidrome {}'.format(version),
|
||||
'vars.notification.mail': True,
|
||||
'check_interval': '60m',
|
||||
},
|
||||
'website_check_path': '/user/login',
|
||||
'website_check_string': 'Sign in',
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@ actions['netbox_install'] = {
|
|||
'triggered': True,
|
||||
'command': ' && '.join([
|
||||
'cd /opt/netbox/src',
|
||||
'/opt/netbox/venv/bin/pip install --upgrade --upgrade-strategy=eager pip wheel setuptools django-auth-ldap gunicorn',
|
||||
'/opt/netbox/venv/bin/pip install --upgrade --upgrade-strategy=eager -r requirements.txt',
|
||||
'/opt/netbox/venv/bin/pip install --upgrade pip wheel setuptools django-auth-ldap gunicorn',
|
||||
'/opt/netbox/venv/bin/pip install --upgrade -r requirements.txt',
|
||||
]),
|
||||
'needs': {
|
||||
'pkg_apt:build-essential',
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
<?xml version="1.0" standalone='no'?>
|
||||
<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
|
||||
<service-group>
|
||||
<name replace-wildcards="yes">NFS ${path} on %h</name>
|
||||
<service>
|
||||
<type>_nfs._tcp</type>
|
||||
<port>2049</port>
|
||||
<txt-record>path=${path}</txt-record>
|
||||
</service>
|
||||
</service-group>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
% for path, shares in sorted(node.metadata.get('nfs-server/shares', {}).items()):
|
||||
% for path, shares in sorted(node.metadata['nfs-server']['shares'].items()):
|
||||
% for share_target, share_options in sorted(shares.items()):
|
||||
% for ip_list in repo.libs.tools.resolve_identifier(repo, share_target).values():
|
||||
% for ip in sorted(ip_list):
|
||||
|
|
|
|||
|
|
@ -1,40 +1,25 @@
|
|||
from re import sub
|
||||
|
||||
files['/etc/exports'] = {
|
||||
'content_type': 'mako',
|
||||
'triggers': {
|
||||
'action:nfs_reload_shares',
|
||||
files = {
|
||||
'/etc/exports': {
|
||||
'content_type': 'mako',
|
||||
'triggers': {
|
||||
'action:nfs_reload_shares',
|
||||
},
|
||||
},
|
||||
'/etc/default/nfs-kernel-server': {
|
||||
'source': 'etc-default',
|
||||
'triggers': {
|
||||
'svc_systemd:nfs-server:restart',
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
files['/etc/default/nfs-kernel-server'] = {
|
||||
'source': 'etc-default',
|
||||
'triggers': {
|
||||
'svc_systemd:nfs-server:restart',
|
||||
actions = {
|
||||
'nfs_reload_shares': {
|
||||
'command': 'exportfs -a',
|
||||
'triggered': True,
|
||||
},
|
||||
}
|
||||
|
||||
actions['nfs_reload_shares'] = {
|
||||
'command': 'exportfs -a',
|
||||
'triggered': True,
|
||||
svc_systemd = {
|
||||
'nfs-server': {},
|
||||
}
|
||||
|
||||
svc_systemd['nfs-server'] = {}
|
||||
|
||||
if node.has_bundle('avahi-daemon'):
|
||||
for path, shares in node.metadata.get('nfs-server/shares', {}).items():
|
||||
create_avahi_file = False
|
||||
for share_target, share_options in shares.items():
|
||||
if ',insecure,' in f',{share_options},':
|
||||
create_avahi_file = True
|
||||
|
||||
if create_avahi_file:
|
||||
share_name_normalized = sub('[^a-z0-9-_]+', '_', path)
|
||||
|
||||
files[f'/etc/avahi/services/nfs{share_name_normalized}.service'] = {
|
||||
'source': 'avahi.service',
|
||||
'content_type': 'mako',
|
||||
'context': {
|
||||
'path': path,
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,11 +8,8 @@ Requires=redis.service
|
|||
User=paperless
|
||||
Group=paperless
|
||||
Environment=PAPERLESS_CONFIGURATION_PATH=/opt/paperless/paperless.conf
|
||||
Environment=GRANIAN_PORT=22070
|
||||
Environment=GRANIAN_WORKERS=4
|
||||
Environment=GRANIAN_HOST=::1
|
||||
WorkingDirectory=/opt/paperless/src/paperless-ngx/src
|
||||
ExecStart=/opt/paperless/venv/bin/granian --interface asginl --ws "paperless.asgi:application"
|
||||
ExecStart=/opt/paperless/venv/bin/gunicorn -c /opt/paperless/src/paperless-ngx/gunicorn.conf.py -b 127.0.0.1:22070 paperless.asgi:application
|
||||
Restart=always
|
||||
RestartSec=10
|
||||
SyslogIdentifier=paperless-webserver
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ PAPERLESS_FILENAME_FORMAT={{ created_year }}/{{ created_month }}/{{ corresponden
|
|||
# Security and hosting
|
||||
|
||||
PAPERLESS_SECRET_KEY=${repo.vault.random_bytes_as_base64_for(f'{node.name} paperless secret key')}
|
||||
PAPERLESS_CSRF_TRUSTED_ORIGINS=https://${node.metadata.get('paperless/domain')}
|
||||
PAPERLESS_ALLOWED_HOSTS=${node.metadata.get('paperless/domain')}
|
||||
PAPERLESS_CORS_ALLOWED_HOSTS=http://${node.metadata.get('paperless/domain')},https://${node.metadata.get('paperless/domain')}
|
||||
#PAPERLESS_FORCE_SCRIPT_NAME=
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ def nginx(metadata):
|
|||
'domain': metadata.get('paperless/domain'),
|
||||
'locations': {
|
||||
'/': {
|
||||
'target': 'http://[::1]:22070',
|
||||
'target': 'http://127.0.0.1:22070',
|
||||
'websockets': True,
|
||||
'proxy_set_header': {
|
||||
'X-Forwarded-Host': '$server_name',
|
||||
|
|
|
|||
|
|
@ -2,14 +2,13 @@ from datetime import datetime
|
|||
from os import listdir
|
||||
from os.path import isfile, join
|
||||
from subprocess import check_output
|
||||
from textwrap import dedent
|
||||
|
||||
from bundlewrap.utils.ui import io
|
||||
|
||||
zone_path = join(repo.path, 'data', 'powerdns', 'files', 'bind-zones')
|
||||
|
||||
nameservers = set()
|
||||
for rnode in repo.nodes_in_group('dns'):
|
||||
for rnode in sorted(repo.nodes_in_group('dns')):
|
||||
nameservers.add(rnode.metadata.get('powerdns/my_hostname', rnode.metadata.get('hostname')))
|
||||
|
||||
my_primary_servers = set()
|
||||
|
|
@ -76,45 +75,25 @@ actions = {
|
|||
}
|
||||
|
||||
if node.metadata.get('powerdns/features/bind', False):
|
||||
try:
|
||||
output = check_output(['git', 'log', '-1', '--pretty=%ci']).decode('utf-8').strip()
|
||||
serial = datetime.strptime(output, '%Y-%m-%d %H:%M:%S %z').strftime('%y%m%d%H%M')
|
||||
except Exception as e:
|
||||
io.stderr(f"{node.name} Error while parsing commit time for powerdns zone serial: {e!r}")
|
||||
serial = datetime.now().strftime('%y%m%d0000')
|
||||
|
||||
HEADER = dedent(f"""
|
||||
$TTL 60
|
||||
@ IN SOA ns-mephisto.kunbox.net. hostmaster.kunbox.net. (
|
||||
{serial}
|
||||
3600
|
||||
600
|
||||
86400
|
||||
300
|
||||
)
|
||||
""").strip()
|
||||
|
||||
for ns in sorted(nameservers):
|
||||
HEADER += f"\n@ IN NS {ns}."
|
||||
|
||||
primary_zones = set()
|
||||
for zone in listdir(zone_path):
|
||||
if (
|
||||
not (
|
||||
isfile(join(zone_path, zone))
|
||||
or islink(join(zone_path, zone))
|
||||
)
|
||||
or zone.startswith(".")
|
||||
or zone.startswith("_")
|
||||
):
|
||||
if not isfile(join(zone_path, zone)) or zone.startswith(".") or zone.startswith("_"):
|
||||
continue
|
||||
|
||||
try:
|
||||
output = check_output(['git', 'log', '-1', '--pretty=%ci']).decode('utf-8').strip()
|
||||
serial = datetime.strptime(output, '%Y-%m-%d %H:%M:%S %z').strftime('%y%m%d%H%M')
|
||||
except Exception as e:
|
||||
io.stderr(f"Error while parsing commit time for {zone} serial: {e!r}")
|
||||
serial = datetime.now().strftime('%y%m%d0000')
|
||||
|
||||
primary_zones.add(zone)
|
||||
|
||||
files[f'/var/lib/powerdns/zones/{zone}'] = {
|
||||
'content_type': 'mako',
|
||||
'context': {
|
||||
'HEADER': HEADER + f"\n$ORIGIN {zone}.",
|
||||
'NAMESERVERS': '\n'.join(sorted({f'@ IN NS {ns}.' for ns in nameservers})),
|
||||
'SERIAL': serial,
|
||||
'metadata_records': node.metadata.get(f'powerdns/bind-zones/{zone}/records', []),
|
||||
},
|
||||
'source': f'bind-zones/{zone}',
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
ROUTEROS_VERSION = node.os_version[0]
|
||||
|
||||
routeros['/ip/dns'] = {
|
||||
'servers': '8.8.8.8',
|
||||
}
|
||||
|
|
@ -20,7 +18,7 @@ for service in (
|
|||
'ssh',
|
||||
'www',
|
||||
):
|
||||
routeros[f'/ip/service?name={service}&dynamic=false'] = {
|
||||
routeros[f'/ip/service?name={service}'] = {
|
||||
'disabled': False,
|
||||
}
|
||||
|
||||
|
|
@ -59,26 +57,16 @@ routeros['/system/clock'] = {
|
|||
'time-zone-name': 'UTC',
|
||||
}
|
||||
|
||||
routeros['/ip/neighbor/discovery-settings'] = {
|
||||
'protocol': 'lldp',
|
||||
}
|
||||
|
||||
routeros['/system/identity'] = {
|
||||
'name': node.name,
|
||||
# doing this first gives us some chance to notice an IP mixup
|
||||
'before': {'routeros:'},
|
||||
}
|
||||
|
||||
if ROUTEROS_VERSION < 7:
|
||||
routeros['/system/ntp/client'] = {
|
||||
'enabled': True,
|
||||
'server-dns-names': 'de.pool.ntp.org',
|
||||
}
|
||||
else:
|
||||
routeros['/system/ntp/client'] = {
|
||||
'enabled': True,
|
||||
'servers': 'de.pool.ntp.org',
|
||||
}
|
||||
routeros['/system/ntp/client'] = {
|
||||
'enabled': True,
|
||||
'server-dns-names': 'de.pool.ntp.org',
|
||||
}
|
||||
|
||||
if node.metadata.get('routeros/gateway'):
|
||||
routeros['/ip/route?dst-address=0.0.0.0/0'] = {
|
||||
|
|
@ -88,7 +76,6 @@ if node.metadata.get('routeros/gateway'):
|
|||
routeros['/interface/bridge?name=bridge'] = {
|
||||
'priority': node.metadata.get('routeros/bridge_priority', '0x8000'),
|
||||
'protocol-mode': 'rstp',
|
||||
'igmp-snooping': False,
|
||||
'vlan-filtering': True,
|
||||
}
|
||||
|
||||
|
|
@ -172,13 +159,7 @@ for vlan, conf in node.metadata.get('routeros/vlans').items():
|
|||
}
|
||||
|
||||
# assign ports to vlans
|
||||
#
|
||||
# Be sure to only consider non-dynamic VLANs: When you remove a
|
||||
# port from a VLAN (if that VLAN is the PVID of the port) while
|
||||
# the port is UP, then a dynamic temporary VLAN object will be
|
||||
# created in the switch. That is harmless and it will vanish as
|
||||
# soon as the PVID of the port also changes.
|
||||
routeros[f"/interface/bridge/vlan?vlan-ids={conf['id']}&dynamic=false"] = {
|
||||
routeros[f"/interface/bridge/vlan?vlan-ids={conf['id']}"] = {
|
||||
'bridge': 'bridge',
|
||||
'untagged': sorted(conf['untagged']),
|
||||
'tagged': sorted(conf['tagged']),
|
||||
|
|
@ -189,25 +170,3 @@ for vlan, conf in node.metadata.get('routeros/vlans').items():
|
|||
'tag:routeros-vlan',
|
||||
},
|
||||
}
|
||||
|
||||
# purge unused vlans
|
||||
routeros['/interface/vlan'] = {
|
||||
'purge': {
|
||||
'id-by': 'name',
|
||||
},
|
||||
'needed_by': {
|
||||
'tag:routeros-vlan',
|
||||
}
|
||||
}
|
||||
|
||||
routeros['/interface/bridge/vlan'] = {
|
||||
'purge': {
|
||||
'id-by': 'vlan-ids',
|
||||
'keep': {
|
||||
'dynamic': True,
|
||||
},
|
||||
},
|
||||
'needed_by': {
|
||||
'tag:routeros-vlan',
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ def firewall(metadata):
|
|||
|
||||
|
||||
@metadata_reactor.provides(
|
||||
'backups/paths',
|
||||
'zfs/datasets',
|
||||
)
|
||||
def timemachine_zfs(metadata):
|
||||
|
|
@ -41,18 +40,13 @@ def timemachine_zfs(metadata):
|
|||
datasets = {
|
||||
'tank/timemachine': {},
|
||||
}
|
||||
paths = set()
|
||||
|
||||
for share_name in shares:
|
||||
datasets[f'tank/timemachine/{share_name}'] = {
|
||||
'mountpoint': f'/srv/timemachine/{share_name}',
|
||||
}
|
||||
paths.add(f'/srv/timemachine/{share_name}')
|
||||
|
||||
return {
|
||||
'backups': {
|
||||
'paths': paths,
|
||||
},
|
||||
'zfs': {
|
||||
'datasets': datasets,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ files = {
|
|||
},
|
||||
}
|
||||
|
||||
if node.os == 'debian' and node.os_version < (13,):
|
||||
if node.os == 'debian':
|
||||
# debian insists on creating that file during almost every
|
||||
# unattended-upgrades run. Make it known to bundlewrap, so
|
||||
# it does not get removed during applies.
|
||||
|
|
|
|||
|
|
@ -33,12 +33,6 @@
|
|||
from => '${mail_from}',
|
||||
},
|
||||
|
||||
% if not enable_registration:
|
||||
registration => {
|
||||
disabled => 1,
|
||||
},
|
||||
% endif
|
||||
|
||||
ref => {
|
||||
issues => 'https://github.com/derf/travelynx/issues',
|
||||
source => 'https://github.com/derf/travelynx',
|
||||
|
|
|
|||
|
|
@ -10,12 +10,11 @@ defaults = {
|
|||
'password': repo.vault.password_for('{} postgresql travelynx'.format(node.name)),
|
||||
'database': 'travelynx',
|
||||
},
|
||||
'additional_cookie_secrets': set(),
|
||||
'cookie_secret': repo.vault.password_for('{} travelynx cookie_secret'.format(node.name)),
|
||||
'enable_registration': False,
|
||||
'mail_from': 'travelynx@{}'.format(node.hostname),
|
||||
'spare_workers': 2,
|
||||
'workers': 4,
|
||||
'spare_workers': 2,
|
||||
'mail_from': 'travelynx@{}'.format(node.hostname),
|
||||
'cookie_secret': repo.vault.password_for('{} travelynx cookie_secret'.format(node.name)),
|
||||
'additional_cookie_secrets': set(),
|
||||
},
|
||||
'postgresql': {
|
||||
'roles': {
|
||||
|
|
|
|||
|
|
@ -67,7 +67,6 @@ svc_systemd = {
|
|||
'file:/etc/systemd/system/zfs-import-scan.service.d/bundlewrap.conf',
|
||||
},
|
||||
'after': {
|
||||
'bundle:dm-crypt', # might unlock disks
|
||||
'pkg_apt:',
|
||||
},
|
||||
'before': {
|
||||
|
|
@ -84,7 +83,6 @@ svc_systemd = {
|
|||
},
|
||||
'zfs-mount.service': {
|
||||
'after': {
|
||||
'bundle:dm-crypt', # might unlock disks
|
||||
'pkg_apt:',
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,590 +0,0 @@
|
|||
{
|
||||
"interfaces": {
|
||||
"ether1": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether10": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether11": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether12": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether13": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether14": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether15": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether16": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether17": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether18": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether19": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether2": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether20": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether21": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether22": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether23": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether24": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether25": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether26": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether27": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether28": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether29": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether3": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether30": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether31": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether32": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether33": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether34": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether35": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether36": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether37": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether38": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether39": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether4": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether40": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether41": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether42": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether43": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether44": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether45": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether46": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether47": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether48": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether49": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether5": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether6": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether7": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether8": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"ether9": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": "access",
|
||||
"tagged_vlans": [],
|
||||
"type": "1000base-t",
|
||||
"untagged_vlan": "home.clients"
|
||||
},
|
||||
"home.clients": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [
|
||||
"172.19.138.2/24"
|
||||
],
|
||||
"mode": null,
|
||||
"tagged_vlans": [],
|
||||
"type": "virtual",
|
||||
"untagged_vlan": null
|
||||
},
|
||||
"qsfpplus1-1": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": null,
|
||||
"tagged_vlans": [],
|
||||
"type": "40gbase-x-qsfpp",
|
||||
"untagged_vlan": null
|
||||
},
|
||||
"qsfpplus1-2": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": null,
|
||||
"tagged_vlans": [],
|
||||
"type": "40gbase-x-qsfpp",
|
||||
"untagged_vlan": null
|
||||
},
|
||||
"qsfpplus1-3": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": null,
|
||||
"tagged_vlans": [],
|
||||
"type": "40gbase-x-qsfpp",
|
||||
"untagged_vlan": null
|
||||
},
|
||||
"qsfpplus1-4": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": null,
|
||||
"tagged_vlans": [],
|
||||
"type": "40gbase-x-qsfpp",
|
||||
"untagged_vlan": null
|
||||
},
|
||||
"qsfpplus2-1": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": null,
|
||||
"tagged_vlans": [],
|
||||
"type": "40gbase-x-qsfpp",
|
||||
"untagged_vlan": null
|
||||
},
|
||||
"qsfpplus2-2": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": null,
|
||||
"tagged_vlans": [],
|
||||
"type": "40gbase-x-qsfpp",
|
||||
"untagged_vlan": null
|
||||
},
|
||||
"qsfpplus2-3": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": null,
|
||||
"tagged_vlans": [],
|
||||
"type": "40gbase-x-qsfpp",
|
||||
"untagged_vlan": null
|
||||
},
|
||||
"qsfpplus2-4": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": null,
|
||||
"tagged_vlans": [],
|
||||
"type": "40gbase-x-qsfpp",
|
||||
"untagged_vlan": null
|
||||
},
|
||||
"sfp-sfpplus1": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": null,
|
||||
"tagged_vlans": [],
|
||||
"type": "10gbase-x-sfpp",
|
||||
"untagged_vlan": null
|
||||
},
|
||||
"sfp-sfpplus2": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": null,
|
||||
"tagged_vlans": [],
|
||||
"type": "10gbase-x-sfpp",
|
||||
"untagged_vlan": null
|
||||
},
|
||||
"sfp-sfpplus3": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": null,
|
||||
"tagged_vlans": [],
|
||||
"type": "10gbase-x-sfpp",
|
||||
"untagged_vlan": null
|
||||
},
|
||||
"sfp-sfpplus4": {
|
||||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": null,
|
||||
"tagged_vlans": [],
|
||||
"type": "10gbase-x-sfpp",
|
||||
"untagged_vlan": null
|
||||
}
|
||||
},
|
||||
"vlans": [
|
||||
{
|
||||
"name": "home.wan",
|
||||
"vid": 7
|
||||
},
|
||||
{
|
||||
"name": "home.clients",
|
||||
"vid": 1138
|
||||
},
|
||||
{
|
||||
"name": "home.dmz",
|
||||
"vid": 1139
|
||||
},
|
||||
{
|
||||
"name": "home.v6only",
|
||||
"vid": 2000
|
||||
},
|
||||
{
|
||||
"name": "ffwi.mesh",
|
||||
"vid": 3000
|
||||
},
|
||||
{
|
||||
"name": "ffwi.client",
|
||||
"vid": 3001
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -231,7 +231,7 @@
|
|||
"ips": [
|
||||
"172.19.138.4/24"
|
||||
],
|
||||
"mode": null,
|
||||
"mode": "",
|
||||
"tagged_vlans": [],
|
||||
"type": "virtual",
|
||||
"untagged_vlan": null
|
||||
|
|
@ -240,7 +240,7 @@
|
|||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": null,
|
||||
"mode": "",
|
||||
"tagged_vlans": [],
|
||||
"type": "10gbase-x-sfpp",
|
||||
"untagged_vlan": null
|
||||
|
|
@ -249,7 +249,7 @@
|
|||
"description": "",
|
||||
"enabled": true,
|
||||
"ips": [],
|
||||
"mode": null,
|
||||
"mode": "",
|
||||
"tagged_vlans": [],
|
||||
"type": "10gbase-x-sfpp",
|
||||
"untagged_vlan": null
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,36 +0,0 @@
|
|||
location / {
|
||||
proxy_pass http://172.30.17.52:8000/;
|
||||
|
||||
# Ensure streams don't end after a short time.
|
||||
proxy_read_timeout 7d;
|
||||
|
||||
# Disable request size limit, very important for uploading large files
|
||||
client_max_body_size 0;
|
||||
|
||||
# Enable support `Transfer-Encoding: chunked`
|
||||
chunked_transfer_encoding on;
|
||||
|
||||
# Disable request and response buffering, minimize latency to/from Icecast
|
||||
proxy_buffering off;
|
||||
proxy_request_buffering off;
|
||||
|
||||
# Icecast needs HTTP/1.1, not 1.0 or 2
|
||||
proxy_http_version 1.1;
|
||||
|
||||
# Forward all original request headers
|
||||
proxy_pass_request_headers on;
|
||||
|
||||
# Set some standard reverse proxy headers. Icecast server currently ignores these,
|
||||
# but may support them in a future version so that access logs are more useful.
|
||||
proxy_set_header Host $http_host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
|
||||
auth_basic "Rotten City Eventradio";
|
||||
auth_basic_user_file /etc/nginx/radio-htpasswd;
|
||||
|
||||
location /admin/ {
|
||||
deny all;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
@ IN TXT "v=spf1 -all"
|
||||
_dmarc IN TXT "v=DMARC1; p=reject"
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
@ IN TXT "v=spf1 mx -all"
|
||||
@ IN MX 10 mail.franzi.business.
|
||||
_dmarc IN TXT "v=DMARC1; p=quarantine; rua=mailto:dmarc@kunbox.net; ruf=mailto:dmarc@kunbox.net; fo=0:d:s; adkim=s; aspf=s"
|
||||
_mta-sts IN TXT "v=STSv1;id=20201111;"
|
||||
_smtp._tls IN TXT "v=TLSRPTv1;rua=mailto:tlsrpt@kunbox.net"
|
||||
|
||||
mta-sts IN CNAME carlene.kunbox.net.
|
||||
|
||||
2019._domainkey IN TXT "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwkg6UAcu3V98hal1UVf6yB0WT1CKDS0AK83CUlSP8bUwraPxkxK1nkQOUsmjbQs6a3FhdsKprMi32GeUaTVvZg81JIybPk3jNugfNWfSjs2TXPomYu+XD2pmmbR3cZlzC5NGR2nmBFt/P/S2ihPHj35KziiBIwK1TdvOi1M2+upCjK33Icco0ByCm0gJpD2O0cbqcBcUKqd6X440vYhNXH1ygp0e91P0iRnvS9sg6yD0xjD8kD6j/8GfxBY+9bpU3EvDoBgyJSbjw5b6PUVJbKMXzw1NIRNj0SXKs5BakjS8+7u62vR11IPCYRwy+yr0rDT0tNegM7gStIIgoTpOoQIDAQAB"
|
||||
|
||||
uo4anejdvvdw8bkne3kjiqavcqmj0416._domainkey IN TXT "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnh5Ym9PO7r+wdOIKfopvHzn3KU3qT6IlCG/gvvbmIqoeFQfRbAe3gQmcG6RcLue55cJQGhI6y2r0lm59ZeoHR40aM+VabAOlplekM7xWmoXb/9vG2OZLIqAyF4I+7GQmTN6B9keBHp9SWtDUkI0B0G9neZ5MkXJP705M0duxritqQlb4YvCZwteHiyckKcg9aE9j+GF2EEawBoVDpoveoB3+wgde3lWEUjjwKFtXNXxuN354o6jgXgPNWtIEdPMLfK/o0CaCjZNlzaLTsTegY/+67hdHFqDmm8zXO9s+Xiyfq7CVq21t7wDhQ2W1agj+up6lH82FMh5rZNxJ6XB0yQIDAQAB"
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
${HEADER}
|
||||
|
||||
<%include file="bind-zones/_mail_NULL" />
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
${HEADER}
|
||||
|
||||
@ IN AAAA 2a0a:51c0:0:225::2
|
||||
@ IN A 193.135.9.29
|
||||
|
||||
<%include file="bind-zones/_mail_NULL" />
|
||||
|
|
@ -1 +0,0 @@
|
|||
_parked
|
||||
|
|
@ -1 +0,0 @@
|
|||
_parked
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
${HEADER}
|
||||
|
||||
<%include file="bind-zones/_mail_NULL" />
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
${HEADER}
|
||||
|
||||
<%include file="bind-zones/_mail_carlene" />
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
${HEADER}
|
||||
|
||||
@ IN AAAA 2a03:4000:4d:5e::1
|
||||
@ IN A 194.36.145.49
|
||||
|
||||
<%include file="bind-zones/_mail_carlene" />
|
||||
|
||||
_acme-challenge IN CNAME 63bc37c61bda3c1f4fa1f270f8890c7f89c24353.acme.ctu.cx.
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
${HEADER}
|
||||
|
||||
@ IN AAAA 2a0a:51c0:0:225::2
|
||||
@ IN A 193.135.9.29
|
||||
|
||||
<%include file="bind-zones/_mail_carlene" />
|
||||
|
||||
_atproto IN TXT "did=did:plc:d762mg6wvvmpeu66zojntlof"
|
||||
_token._dnswl IN TXT "gg3mbwjx9bbuo5osvh7oz6bc881wcmc"
|
||||
_matrix._tcp IN SRV 10 10 443 matrix.franzi.business.
|
||||
|
||||
; carlene
|
||||
git IN CNAME carlene.kunbox.net.
|
||||
irc IN CNAME carlene.kunbox.net.
|
||||
mail IN CNAME carlene.kunbox.net.
|
||||
matrix IN CNAME carlene.kunbox.net.
|
||||
matrix-stickers IN CNAME carlene.kunbox.net.
|
||||
netbox IN CNAME carlene.kunbox.net.
|
||||
ntfy IN CNAME carlene.kunbox.net.
|
||||
postfixadmin IN CNAME carlene.kunbox.net.
|
||||
rss IN CNAME carlene.kunbox.net.
|
||||
travelynx IN CNAME carlene.kunbox.net.
|
||||
|
||||
; icinga2
|
||||
icinga IN CNAME icinga2.kunbox.net.
|
||||
status IN CNAME icinga2.kunbox.net.
|
||||
|
||||
; pretix
|
||||
tickets IN CNAME franzi-business.cname.pretix.eu.
|
||||
|
|
@ -1,4 +1,16 @@
|
|||
${HEADER}
|
||||
$TTL 60
|
||||
@ IN SOA ns-mephisto.kunbox.net. hostmaster.kunbox.net. (
|
||||
${SERIAL}
|
||||
3600
|
||||
600
|
||||
86400
|
||||
300
|
||||
)
|
||||
|
||||
|
||||
${NAMESERVERS}
|
||||
|
||||
$ORIGIN kunbox.net.
|
||||
|
||||
; ends up on carlene.kunbox.net
|
||||
@ IN A 193.135.9.29
|
||||
|
|
@ -17,7 +29,6 @@ aurto IN CNAME aurto.htz-cloud
|
|||
|
||||
; stuff running at home
|
||||
jellyfin.home IN CNAME nas.home
|
||||
navidrome.home IN CNAME nas.home
|
||||
|
||||
; Mail servers
|
||||
mta-sts IN CNAME carlene
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
_parked
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
${HEADER}
|
||||
|
||||
@ IN AAAA 2a0a:51c0:0:225::2
|
||||
@ IN A 193.135.9.29
|
||||
|
||||
<%include file="bind-zones/_mail_carlene" />
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
${HEADER}
|
||||
|
||||
@ IN AAAA 2a0a:51c0:0:225::2
|
||||
@ IN A 193.135.9.29
|
||||
|
||||
<%include file="bind-zones/_mail_carlene" />
|
||||
|
||||
@ IN TXT "google-site-verification=Xl-OBZpTL1maD2Qr8QmQ2aKRXZLnCmvddpFdrTT8L34"
|
||||
|
||||
_token._dnswl IN TXT "5mx0rv9ru8s1zz4tf4xlt48osh09czmg"
|
||||
|
||||
git IN CNAME git.franzi.business.
|
||||
grafana IN CNAME influxdb.htz-cloud.kunbox.net.
|
||||
influxdb IN CNAME influxdb.htz-cloud.kunbox.net.
|
||||
|
|
@ -1 +0,0 @@
|
|||
_parked
|
||||
|
|
@ -1 +0,0 @@
|
|||
_parked
|
||||
|
|
@ -1 +0,0 @@
|
|||
_parked
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
${HEADER}
|
||||
|
||||
@ IN AAAA 2a0a:51c0:0:225::2
|
||||
@ IN A 193.135.9.29
|
||||
|
||||
<%include file="bind-zones/_mail_carlene" />
|
||||
|
|
@ -1 +0,0 @@
|
|||
_parked
|
||||
|
|
@ -1,22 +1,22 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
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
|
||||
-----END CERTIFICATE-----
|
||||
|
|
|
|||
|
|
@ -1,27 +1,27 @@
|
|||
|
||||
-----BEGIN CERTIFICATE-----
|
||||
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
|
||||
Ig46v9mFmBvyH04=
|
||||
Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAH3KdNEVCQdqk0LKyuNImTKdRJY1C
|
||||
2uw2SJajuhqkyGPY8C+zzsufZ+mgnhnq1A2KVQOSykOEnUbx1cy637rBAihx97r+
|
||||
bcwbZM6sTDIaEriR/PLk6LKs9Be0uoVxgOKDcpG9svD33J+G9Lcfv1K9luDmSTgG
|
||||
6XNFIN5vfI5gs/lMPyojEMdIzK9blcl2/1vKxO8WGCcjvsQ1nJ/Pwt8LQZBfOFyV
|
||||
XP8ubAp/au3dc4EKWG9MO5zcx1qT9+NXRGdVWxGvmBFRAajciMfXME1ZuGmk3/GO
|
||||
koAM7ZkjZmleyokP1LGzmfJcUd9s7eeu1/9/eg5XlXd/55GtYjAM+C4DG5i7eaNq
|
||||
cm2F+yxYIPt6cbbtYVNJCGfHWqHEQ4FYStUyFnv8sjyqU8ypgZaNJ9aVcWSICLOI
|
||||
E1/Qv/7oKsnZCWJ926wU6RqG1OYPGOi1zuABhLw61cuPVDT28nQS/e6z95cJXq0e
|
||||
K1BcaJ6fJZsmbjRgD5p3mvEf5vdQM7MCEvU0tHbsx2I5mHHJoABHb8KVBgWp/lcX
|
||||
GWiWaeOyB7RP+OfDtvi2OsapxXiV7vNVs7fMlrRjY1joKaqmmycnBvAq14AEbtyL
|
||||
sVfOS66B8apkeFX2NY4XPEYV4ZSCe8VHPrdrERk2wILG3T/EGmSIkCYVUMSnjmJd
|
||||
VQD9F6Na/+zmXCc=
|
||||
-----END CERTIFICATE-----
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
encrypt$gAAAAABoLkWaAM6hx5Tl_6sPRVNmmcx9OmWYGmrNLIF4J-p7Xhj4O0fQuPcnph0ZFtmlBNWcfGb8G2ysTeEN1-Be2O4JQamvxUyGFT-Jste8GzAH6btiM6ef1E0FO6ovmzUxAiFZCbeXqKXF0opPz2B6rbDKiU-yTEZpid6-D-yz3uGuunhOjL3RpWJ1ArZRiOoX3DKPf5BXn51-71TEhB-lg41sDqnMfl4lo9_9xb5_2MBLsVZ9EYjcxvwgzq7qtdExtmpkWQ7pU6uPSP5w5wc8MFvRbiXNlOrFMLjslcGp7_cbfBMmA56UCVAe2n8HqWRcKHeYo_gNVUi1nDi2GjBmUYygA9yzFcUBqcV5ZUPK-7uwYxh2ZFbBcbwmTtvXYqEEvTLuZbsYwhV5mJR6b7L3MR81g--9D8pSulsKjbrUXXTZ373SWXz_aQoBLg5vOiL4zUo8T0isXIGcGMS8LUn-LvpQyptE-A==
|
||||
encrypt$gAAAAABnuvHlF1U1dT-xIICT5GmDxxqm0hQAgshQSA46WrVoo18ypjyxQE1qRzPNdp0xHKPYwpGmAoT7ftX7U3X3sjIvH8W5DUNMEBPZk6Z2yPxsyMDqUbxqJUOkjsSjVf1GZ_n3R5kZfb-THJMjNQMy3tL5RwrSvZjsYeYT-NwBle5rUKZpgE_6sDr5jSr8xpNx87gJr1vqgnZIBPllU47CJQy7LHEsVcCvbKhpVoau02LlPAoApVt_iYYm1fL_E6jFGfnCwGoeiytMc2fl1DPWS8q8oauQ1pNVTWQ2BXnLiXoc8u3hgp93PpT2LubYgIrVXpY8iErNtghuXi_HmqL37btdN5h-p1Div-R_5uva1maXffduwutCd5xWJK__G_bhqiSoEaKEMvo_H47vqbi7Hvwi70ckYek9KD_bIb2W8zBEPl1Q2436Uz54B0muXv6X7OoZlTj51_gZUcT3cp8SDJqAWDpnWg==
|
||||
|
|
@ -1,23 +1,24 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
MIID1DCCA1qgAwIBAgISBTKUiIkigBvSZVQDbw9ukheIMAoGCCqGSM49BAMDMDIx
|
||||
MIID9jCCA3ygAwIBAgISBaRtAN5dI7hI3l+MeuwXGm48MAoGCCqGSM49BAMDMDIx
|
||||
CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF
|
||||
NjAeFw0yNTA2MjIyMDU5NThaFw0yNTA5MjAyMDU5NTdaMCIxIDAeBgNVBAMTF2hv
|
||||
bWUuc29waGllcy1raXRjaGVuLmV1MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEDNnB
|
||||
CD9xIEtadMu6N0uqHoVUSWLiB+LohLkzfjIzuKSxwdvdjM7aZ+3TTQL6OhNNnzP0
|
||||
5L+XOeW5/LzPwtMR9U67IKl3BFKODr/M5UOQbarHPultrMwtKfs4xPimTaqlo4IC
|
||||
QTCCAj0wDgYDVR0PAQH/BAQDAgeAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
|
||||
BQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRjpEHtCkpi9XffO4TiCHgyaZ7e
|
||||
AjAfBgNVHSMEGDAWgBSTJ0aYA6lRaI6Y1sRCSNsjv1iU0jAyBggrBgEFBQcBAQQm
|
||||
MCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly9lNi5pLmxlbmNyLm9yZy8wPQYDVR0RBDYw
|
||||
NIIZKi5ob21lLnNvcGhpZXMta2l0Y2hlbi5ldYIXaG9tZS5zb3BoaWVzLWtpdGNo
|
||||
ZW4uZXUwEwYDVR0gBAwwCjAIBgZngQwBAgEwLAYDVR0fBCUwIzAhoB+gHYYbaHR0
|
||||
cDovL2U2LmMubGVuY3Iub3JnLzkuY3JsMIIBBgYKKwYBBAHWeQIEAgSB9wSB9ADy
|
||||
AHcA7TxL1ugGwqSiAFfbyyTiOAHfUS/txIbFcA8g3bc+P+AAAAGXmaZlsAAABAMA
|
||||
SDBGAiEA1HNklX3fn9+0ob4WqFUNLrQV1mHN+tVcUKrh1nSyUMYCIQDbIzgNbz13
|
||||
X3nMrY2dcHxFzjBnFHQoYsQgjIHkxuzDXQB3AN3cyjSV1+EWBeeVMvrHn/g9HFDf
|
||||
2wA6FBJ2Ciysu8gqAAABl5mmfWIAAAQDAEgwRgIhAJESizo9faN0c1RD7mvcd8ZT
|
||||
+RMQMdVtU4MiniBcIcwiAiEAwjR0oUcWFeZq56U5jzYyn2i0/LfhWQA1hx+19TuE
|
||||
qwMwCgYIKoZIzj0EAwMDaAAwZQIxAN6rDk9COjwXvDpGuFGbeqUaB72CtEvlXtAC
|
||||
wmjxGdQAd3LyE97muGqtBPLcCBVgPgIwKIVcSS1rJ8NYz93bOPddEn74wPM7UIEG
|
||||
0YpB1kM46bZ1aAubssBGvqiTSPDzVu0k
|
||||
NTAeFw0yNTAzMTkxNzI1NTVaFw0yNTA2MTcxNzI1NTRaMCIxIDAeBgNVBAMTF2hv
|
||||
bWUuc29waGllcy1raXRjaGVuLmV1MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEMpwz
|
||||
KfaRqcoUak1UJzHRmcy1Zz/9KmlEoja94JwEO7qqARCOJedwJ/MS8Zkz3ZkJvjv5
|
||||
iIXe9u6qbn/C8RS+/UqunvnCxTJeWMcXaI2p9M+DE7PlPQiIP1t/SPQ2QsIso4IC
|
||||
YzCCAl8wDgYDVR0PAQH/BAQDAgeAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
|
||||
BQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBSspYDX4yydAiYu+8XZw/Vu7IrW
|
||||
xDAfBgNVHSMEGDAWgBSfK1/PPCFPnQS37SssxMZwi9LXDTBVBggrBgEFBQcBAQRJ
|
||||
MEcwIQYIKwYBBQUHMAGGFWh0dHA6Ly9lNS5vLmxlbmNyLm9yZzAiBggrBgEFBQcw
|
||||
AoYWaHR0cDovL2U1LmkubGVuY3Iub3JnLzA9BgNVHREENjA0ghkqLmhvbWUuc29w
|
||||
aGllcy1raXRjaGVuLmV1ghdob21lLnNvcGhpZXMta2l0Y2hlbi5ldTATBgNVHSAE
|
||||
DDAKMAgGBmeBDAECATAtBgNVHR8EJjAkMCKgIKAehhxodHRwOi8vZTUuYy5sZW5j
|
||||
ci5vcmcvNjEuY3JsMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHcATnWjJ1yaEMM4
|
||||
W2zU3z9S6x3w4I4bjWnAsfpksWKaOd8AAAGVr6ZJYgAABAMASDBGAiEA2TRwcna6
|
||||
vp3yZSUfXjd14SFvTZtXucSMJQQERKgwDekCIQCEppv+qukiFo4SjQBMQ50ptVXC
|
||||
LMJZVy4A6VuMCmj3VQB1AOCSs/wMHcjnaDYf3mG5lk0KUngZinLWcsSwTaVtb1QE
|
||||
AAABla+mSgEAAAQDAEYwRAIgXjJYEE32AFXfqx43ZOQrgP5cGdK5znOGCSxmjcMg
|
||||
S/UCIBZNBTNVtJWGYKJQgS+bx7EbDDWobar7shNd1/jK0Kt3MAoGCCqGSM49BAMD
|
||||
A2gAMGUCMQCoQeeM5wcNWCgtjoWPqduuEP/W0M4UrBydd2tVAAE7dbYb2Batj2Gg
|
||||
qnaDMK2j/+ACMCNtwr4CWsgMAsK8HlDVM0UBvzEFOy2X+hkGzqOe0kfN+abHP0Sf
|
||||
L0aZkl5gt8NcKg==
|
||||
-----END CERTIFICATE-----
|
||||
|
|
|
|||
|
|
@ -1,27 +1,27 @@
|
|||
|
||||
-----BEGIN CERTIFICATE-----
|
||||
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
|
||||
Ig46v9mFmBvyH04=
|
||||
Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAH3KdNEVCQdqk0LKyuNImTKdRJY1C
|
||||
2uw2SJajuhqkyGPY8C+zzsufZ+mgnhnq1A2KVQOSykOEnUbx1cy637rBAihx97r+
|
||||
bcwbZM6sTDIaEriR/PLk6LKs9Be0uoVxgOKDcpG9svD33J+G9Lcfv1K9luDmSTgG
|
||||
6XNFIN5vfI5gs/lMPyojEMdIzK9blcl2/1vKxO8WGCcjvsQ1nJ/Pwt8LQZBfOFyV
|
||||
XP8ubAp/au3dc4EKWG9MO5zcx1qT9+NXRGdVWxGvmBFRAajciMfXME1ZuGmk3/GO
|
||||
koAM7ZkjZmleyokP1LGzmfJcUd9s7eeu1/9/eg5XlXd/55GtYjAM+C4DG5i7eaNq
|
||||
cm2F+yxYIPt6cbbtYVNJCGfHWqHEQ4FYStUyFnv8sjyqU8ypgZaNJ9aVcWSICLOI
|
||||
E1/Qv/7oKsnZCWJ926wU6RqG1OYPGOi1zuABhLw61cuPVDT28nQS/e6z95cJXq0e
|
||||
K1BcaJ6fJZsmbjRgD5p3mvEf5vdQM7MCEvU0tHbsx2I5mHHJoABHb8KVBgWp/lcX
|
||||
GWiWaeOyB7RP+OfDtvi2OsapxXiV7vNVs7fMlrRjY1joKaqmmycnBvAq14AEbtyL
|
||||
sVfOS66B8apkeFX2NY4XPEYV4ZSCe8VHPrdrERk2wILG3T/EGmSIkCYVUMSnjmJd
|
||||
VQD9F6Na/+zmXCc=
|
||||
-----END CERTIFICATE-----
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
encrypt$gAAAAABoWHyMEiWt-0WotQYL4O4bCviT8YZzGhrv5Qzizf1c4THe1exOOlTB9KvjhWUdB8AU_gyzgNnmGXaghavS306OXUBeWFgMA3xlEGz5w9EiaU3djM8ddC1jFLWbm7hTwKnTrsuoee-sj-sep1oNVzr327LsO5EIrLmxqrcvXRGuST2zhHeqMjuxTpyXB-fg9ge_UTBD3W06fy9FwRzD4n1f5InkHTK6EohLMH1scKmIWG52XdZs_Cx3JvXkynfIFyiT7DbzX7YLpRTvLh_Dy3E96F5_H-kR2Uh2db4IL9EwtPGM-jN8XSOFAS14dFeiQTeYzRaGVkQY3YmzsEgxKrSpCjSbUsLNAd4_hqTgbGrlPI1tVjHCozHKiDHM5Taw9b1gxR3pOImONNDFMoV0Pzn2_wsM-GpuLp5q_FtIMb7tHoeDGjplHoshjY998Oc61jA2hhgRfPCCS4BS6EdS6i4Dl93pVQ==
|
||||
encrypt$gAAAAABn2wvcFmCiy7gpvvwJzRVNJSSxLvlld2ob9O2ivyekdR6y1_k90Q1xZhs7-ombGAIyez1D7lvuNhYQrnff5TqRa9wKbIVyqOOj4lc5qS2jJWyMl9BCr7Fu0mdW0_33Ke5nGpc3mAMjwTLCn8aw-I_I0kALuhKvZ_H31Oy0Mdjw9rau8TmeWGmJDiPMyHlg_C6s2Gvj2VKHVuGeSVg01frjlTveK-ZsJNGvKm7njCqvqGJytFeV6iHzWYyzMTk8-z_xtv-PKH82ME_IdGVv8YcgmCrXWzzA35A3YEaac7uKui1RFzqN6K5sYL1hsxU9rAyidNRd1fp0CRlpyJWgcf_ykoe2u3ManhFOdMmJdx_nrt2znNLaiQqcSHWuws7pGeSZtX72rGa5ZEBF5xeTruhRSQyjMUuBZrqi75QKyYnpmNSpgh0fDHqHUVmSQ5vInd8Tai2BWz3oqKhrkqJMIXlKQn35Jw==
|
||||
|
|
@ -6,7 +6,6 @@ AS_NUMBERS = {
|
|||
'htz-cloud': 4290000137,
|
||||
'ionos': 4290000002,
|
||||
'revision': 4290000078,
|
||||
'rottenraptor': 4290000030,
|
||||
}
|
||||
|
||||
WG_AUTOGEN_NODES = [
|
||||
|
|
|
|||
|
|
@ -22,17 +22,15 @@ exclude_from_backups = true
|
|||
[metadata.backup-server.zpool_create_options]
|
||||
ashift = 12
|
||||
|
||||
[metadata.backup-server.encrypted-devices.WVT0RNKF]
|
||||
device = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi4"
|
||||
passphrase = "!bwpass:bw/backup-kunsi/ata-ST20000NM007D-3DJ103_WVT0RNKF"
|
||||
[[metadata.backup-server.encrypted-devices]]
|
||||
"/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi1-part1" = "!bwpass:bw/backup-kunsi/ata-ST18000NM0092-3CX103_ZVV06SLR-part1"
|
||||
"/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi2-part1" = "!bwpass:bw/backup-kunsi/ata-ST18000NM0092-3CX103_ZVV0686W-part1"
|
||||
"/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi3-part1" = "!bwpass:bw/backup-kunsi/ata-ST18000NM0092-3CX103_ZVV06JV7-part1"
|
||||
|
||||
[metadata.backup-server.encrypted-devices.WVT0V0NQ]
|
||||
device = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi5"
|
||||
passphrase = "!bwpass:bw/backup-kunsi/ata-ST20000NM007D-3DJ103_WVT0V0NQ"
|
||||
|
||||
[metadata.backup-server.encrypted-devices.WVT0W64H]
|
||||
device = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi6"
|
||||
passphrase = "!bwpass:bw/backup-kunsi/ata-ST20000NM007D-3DJ103_WVT0W64H"
|
||||
[[metadata.backup-server.encrypted-devices]]
|
||||
"/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi1-part2" = "!bwpass:bw/backup-kunsi/ata-ST18000NM0092-3CX103_ZVV06SLR-part2"
|
||||
"/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi2-part2" = "!bwpass:bw/backup-kunsi/ata-ST18000NM0092-3CX103_ZVV0686W-part2"
|
||||
"/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi3-part2" = "!bwpass:bw/backup-kunsi/ata-ST18000NM0092-3CX103_ZVV06JV7-part2"
|
||||
|
||||
[metadata.zfs]
|
||||
scrub_when = "Wed 08:00 Europe/Berlin"
|
||||
|
|
|
|||
|
|
@ -31,17 +31,14 @@ bundles = [
|
|||
# for auto-deployment of salonkatrin.de
|
||||
[metadata.apt.packages.jekyll]
|
||||
|
||||
[metadata.backups]
|
||||
paths = ["/mnt/sewfile/"]
|
||||
|
||||
[metadata.check-mail-received.t-online]
|
||||
email = "franzi.kunsmann@t-online.de"
|
||||
imap_host = "secureimap.t-online.de"
|
||||
imap_pass = "!bwpass_attr:t-online.de/franzi.kunsmann@t-online.de:imap"
|
||||
|
||||
[metadata.forgejo]
|
||||
version = "11.0.2"
|
||||
sha1 = "242d8df88938115466c9ed32690e3875b9eb86e8"
|
||||
version = "10.0.3"
|
||||
sha1 = "d1199c43de9e69f6bb8058c15290e79862913413"
|
||||
domain = "git.franzi.business"
|
||||
enable_git_hooks = true
|
||||
install_ssh_key = true
|
||||
|
|
@ -101,8 +98,8 @@ provisioning.shared_secret = "!decrypt:encrypt$gAAAAABfVKflEMAi07C_QGP8cy97hF-4g
|
|||
"'@kunsi:franzi.business'" = "admin"
|
||||
|
||||
[metadata.mautrix-whatsapp]
|
||||
version = "v0.12.2"
|
||||
sha1 = "09ae3f46ab6efa0ee15e8570c09a828efbe3ae8d"
|
||||
version = "v0.11.4"
|
||||
sha1 = "71a064b82072d2cec3d655c8848af418c1f54c77"
|
||||
permissions."'@kunsi:franzi.business'" = "admin"
|
||||
[metadata.mautrix-whatsapp.homeserver]
|
||||
domain = "franzi.business"
|
||||
|
|
@ -113,7 +110,7 @@ domain = "rss.franzi.business"
|
|||
|
||||
[metadata.netbox]
|
||||
domain = "netbox.franzi.business"
|
||||
version = "v4.3.3"
|
||||
version = "v4.2.6"
|
||||
admins.kunsi = "hostmaster@kunbox.net"
|
||||
|
||||
[metadata.nextcloud]
|
||||
|
|
@ -247,13 +244,8 @@ disks = [
|
|||
"/dev/disk/by-id/nvme-SAMSUNG_MZVL22T0HBLB-00B00_S677NX0W114380",
|
||||
]
|
||||
|
||||
[metadata.systemd-timers.timers.42c3-topic]
|
||||
command = "/home/kunsi/42c3-topic.sh"
|
||||
user = "kunsi"
|
||||
when = "Mon 04:00:00 Europe/Berlin"
|
||||
|
||||
[metadata.travelynx]
|
||||
version = "2.14.15"
|
||||
version = "2.11.13"
|
||||
mail_from = "travelynx@franzi.business"
|
||||
domain = "travelynx.franzi.business"
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,9 @@ hostname = "172.19.138.25"
|
|||
bundles = [
|
||||
'homeassistant',
|
||||
'nginx',
|
||||
'pyenv',
|
||||
]
|
||||
groups = ["debian-trixie"]
|
||||
groups = ["debian-bookworm"]
|
||||
|
||||
[metadata.icinga_options]
|
||||
also_affected_by = ['home.nas']
|
||||
|
|
@ -23,5 +24,9 @@ ram = 2
|
|||
domain = 'hass.home.kunbox.net'
|
||||
api_secret = '!decrypt:encrypt$gAAAAABm9lNg_mNhyzb4S6WRtVRDmQFBnPpoCwyqMnilRrAFUXc-EDvv-nYXPbSIbjTf7ZReTPtqr8k3WrGPqiuqhJ60LVv4A5DMqT5c6hTVr4WbhP4DPEIPgfd5aq6U9_-H9WDyQYHKjnunLJEYtEREzmhTq3XsYeQ05DyE7hfnQ-zVoBb0CsAK7GdhihRTdvhXv2N9M04_rigyBP-roRcUgCqwyHuWJc0IPAyn3R4Mr43ZqgR2fn6dNV_YUVKn9c0nWxIwRnYy6Ff_Te9NoGVmXxkiNUX-90bBLKFiCzrRAtizxrTiQb2SRipaWbgOlV6wbMy2KNux'
|
||||
|
||||
[metadata.pyenv]
|
||||
version = 'v2.4.23'
|
||||
python_versions = ["3.13.1"]
|
||||
|
||||
[metadata.nginx.vhosts.homeassistant]
|
||||
ssl = '_.home.kunbox.net'
|
||||
|
|
|
|||
4
nodes/home.mitel-rfp35.toml
Normal file
4
nodes/home.mitel-rfp35.toml
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
dummy = true
|
||||
|
||||
[metadata.interfaces.default]
|
||||
ips = ["172.19.138.41"]
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
locking_node = "carlene"
|
||||
groups = ["switches-mikrotik"]
|
||||
hostname = "172.19.138.2"
|
||||
password = "encrypt$gAAAAABoWsrzHpdt8kVtWlIlNwgRtslW0iroluwdxeTIfVlsc4WuxawfFJ1dZgRHn2T2nMDzvayzRkpPP6Kx2whTBSJhIPOJ3RMgGLd4e5QRUjN75CZjLa2Q24jqpmPPxECDEb0WGMj-"
|
||||
os_version = [7]
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
groups = ["switches-mikrotik"]
|
||||
hostname = "172.19.138.4"
|
||||
password = "encrypt$gAAAAABkI1Eqsust7XuYFK2-FaRzXWM5fOXumhdi5fWNokLtM0CBAqVqc5zcg37XH_JIZvkhp3buKvswcvd_znaV3Rb8kKeJTs4_VJo6OsvbiWkujfT50HspoUXER0JSZSmeZts8a_2i"
|
||||
os_version = [6]
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ nodes['home.downloadhelper'] = {
|
|||
'mounts': {
|
||||
'storage': {
|
||||
'mountpoint': '/mnt/nas',
|
||||
'serverpath': '172.19.138.20:/mnt/download',
|
||||
'serverpath': '172.19.138.20:/storage/download',
|
||||
'mount_options': {
|
||||
'retry=0',
|
||||
'rw',
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@ nodes['home.nas'] = {
|
|||
'bundles': {
|
||||
'avahi-daemon',
|
||||
'backup-client',
|
||||
'dm-crypt',
|
||||
'jellyfin',
|
||||
'lm-sensors',
|
||||
'mixcloud-downloader',
|
||||
'mosquitto',
|
||||
'navidrome',
|
||||
'nfs-server',
|
||||
'rsyslogd',
|
||||
'samba',
|
||||
|
|
@ -61,8 +61,6 @@ nodes['home.nas'] = {
|
|||
},
|
||||
'backups': {
|
||||
'paths': {
|
||||
'/home/kunsi/',
|
||||
'/opt/yate/',
|
||||
'/storage/nas/',
|
||||
},
|
||||
},
|
||||
|
|
@ -71,6 +69,22 @@ nodes['home.nas'] = {
|
|||
'avahi-aruba-fixup': '17,47 * * * * root /usr/bin/systemctl restart avahi-daemon.service',
|
||||
},
|
||||
},
|
||||
'dm-crypt': {
|
||||
'encrypted-devices': {
|
||||
'/dev/disk/by-id/ata-Samsung_SSD_870_QVO_8TB_S5SSNJ0X409404K': {
|
||||
'dm-name': 'sam-S5SSNJ0X409404K',
|
||||
'passphrase': bwpass.password('bw/home.nas/dmcrypt/S5SSNJ0X409404K'),
|
||||
},
|
||||
'/dev/disk/by-id/ata-Samsung_SSD_870_QVO_8TB_S5SSNJ0X409845F': {
|
||||
'dm-name': 'sam-S5SSNJ0X409845F',
|
||||
'passphrase': bwpass.password('bw/home.nas/dmcrypt/S5SSNJ0X409845F'),
|
||||
},
|
||||
'/dev/disk/by-id/ata-Samsung_SSD_870_QVO_8TB_S5SSNJ0X409870J': {
|
||||
'dm-name': 'sam-S5SSNJ0X409870J',
|
||||
'passphrase': bwpass.password('bw/home.nas/dmcrypt/S5SSNJ0X409870J'),
|
||||
},
|
||||
},
|
||||
},
|
||||
'groups': {
|
||||
'nas': {},
|
||||
},
|
||||
|
|
@ -82,9 +96,11 @@ nodes['home.nas'] = {
|
|||
},
|
||||
'5060/tcp': { # yate SIP
|
||||
'home.snom-wohnzimmer',
|
||||
'home.mitel-rfp35',
|
||||
},
|
||||
'5061/tcp': { # yate SIPS
|
||||
'home.snom-wohnzimmer',
|
||||
'home.mitel-rfp35',
|
||||
},
|
||||
# yate RTP uses some random UDP port. We cannot firewall
|
||||
# it, because for incoming calls the other side decides
|
||||
|
|
@ -94,6 +110,7 @@ nodes['home.nas'] = {
|
|||
# to deal with randomly changing IPs here.
|
||||
'*/udp': {
|
||||
'home.snom-wohnzimmer',
|
||||
'home.mitel-rfp35',
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -135,32 +152,13 @@ nodes['home.nas'] = {
|
|||
'htz-cloud.molly-connector',
|
||||
},
|
||||
},
|
||||
'navidrome': {
|
||||
'domain': 'navidrome.home.kunbox.net',
|
||||
'version': '0.56.1',
|
||||
'sha1': '5235cb11e5fa3fd1c0a5065dcf5529a96e629ce9',
|
||||
'zfs_base': 'ssdpool',
|
||||
'config': {
|
||||
'EnableExternalServices': True, # need spotify for artist images
|
||||
'EnableSharing': True,
|
||||
'EnableStarRating': False,
|
||||
'IgnoredArticles': 'The El La Los Las Le Les Os As O A Der Die Das',
|
||||
'MusicFolder': '/storage/nas/music',
|
||||
'PasswordEncryptionKey': vault.decrypt('encrypt$gAAAAABoRXLELiE8_PQyh4elPnSgMDKi7mPpNZweAZQykvfUbeVHv2JVXyzbOOerL3STeTIv8QbGKAqVGyDSzACRdGg4S6DP6Q5FiKFFbkOgKgc7WXQfT59QRP8jMoc2QSe_SQ3SvHFv'),
|
||||
# currently broken <https://github.com/navidrome/navidrome/issues/4026>
|
||||
#'Spotify': {
|
||||
# 'ID': vault.decrypt('encrypt$gAAAAABoRXGJc4qqAttRNsRIP6N9yJ5LPMwItFW4vwm6Dnf9LVgaYdsXD1D-yx32B5iHgLIDCoeds2IpCAZCtPpmN-75i9AeblQGmqEopUThdkpOxeCwwJtBFkhl36T_O5YjLRA5MAYo'),
|
||||
# 'Secret': vault.decrypt('encrypt$gAAAAABoRXGOyOItedfJI10IkAlfHYeiJUcCzYqCLQMkMecK8X3d_tsssCeE5lWZshEvgWVqWW7Iyi-as22uI6PEa0Xm3uwJUNvvRR2qCnwpX0Adv-4NZ7WizA6KX6E6P2zIYZ6tneeG'),
|
||||
#},
|
||||
},
|
||||
},
|
||||
'nfs-server': {
|
||||
'shares': {
|
||||
'/mnt/download': {
|
||||
'/storage/download': {
|
||||
'home.downloadhelper': 'rw,all_squash,anonuid=65534,anongid=1012,no_subtree_check',
|
||||
},
|
||||
'/storage/nas': {
|
||||
'172.19.138.0/24': 'ro,all_squash,anonuid=65534,anongid=65534,no_subtree_check,insecure',
|
||||
'172.19.138.0/24': 'ro,all_squash,anonuid=65534,anongid=65534,no_subtree_check',
|
||||
},
|
||||
'/srv/paperless': {
|
||||
'home.paperless': 'rw,all_squash,anonuid=65534,anongid=65534,no_subtree_check',
|
||||
|
|
@ -174,9 +172,6 @@ nodes['home.nas'] = {
|
|||
'domain': 'jellyfin.home.kunbox.net',
|
||||
'ssl': '_.home.kunbox.net',
|
||||
},
|
||||
'navidrome': {
|
||||
'ssl': '_.home.kunbox.net',
|
||||
},
|
||||
},
|
||||
},
|
||||
'rsyslogd': {
|
||||
|
|
@ -197,7 +192,7 @@ nodes['home.nas'] = {
|
|||
'disks': {
|
||||
'/dev/nvme0',
|
||||
|
||||
# nas/timemachine disks
|
||||
# old nas disks
|
||||
'/dev/disk/by-id/ata-WDC_WD6003FFBX-68MU3N0_V8GE15GR',
|
||||
'/dev/disk/by-id/ata-WDC_WD6003FFBX-68MU3N0_V8HJ406R',
|
||||
'/dev/disk/by-id/ata-WDC_WD6003FFBX-68MU3N0_V8HJBTLR',
|
||||
|
|
@ -205,9 +200,10 @@ nodes['home.nas'] = {
|
|||
'/dev/disk/by-id/ata-WDC_WD6003FFBX-68MU3N0_V8J8ZKRR',
|
||||
'/dev/disk/by-id/ata-WDC_WD6003FFBX-68MU3N0_V9JS5UYL',
|
||||
|
||||
# ssdpool disks
|
||||
'/dev/disk/by-id/ata-INTEL_SSDSC2KB960G8_PHYF244001QU960CGN',
|
||||
'/dev/disk/by-id/ata-INTEL_SSDSC2KB960G8_PHYF244002AS960CGN',
|
||||
# encrypted disks
|
||||
'/dev/disk/by-id/ata-Samsung_SSD_870_QVO_8TB_S5SSNJ0X409404K',
|
||||
'/dev/disk/by-id/ata-Samsung_SSD_870_QVO_8TB_S5SSNJ0X409845F',
|
||||
'/dev/disk/by-id/ata-Samsung_SSD_870_QVO_8TB_S5SSNJ0X409870J',
|
||||
},
|
||||
},
|
||||
'systemd-networkd': {
|
||||
|
|
@ -237,7 +233,6 @@ nodes['home.nas'] = {
|
|||
'chown -R :nas /storage/nas/',
|
||||
r'find /storage/nas/ -type d -exec chmod 0775 {} \;',
|
||||
r'find /storage/nas/ -type f -exec chmod 0664 {} \;',
|
||||
'find /storage/nas/ -type f -name "._*" -delete',
|
||||
],
|
||||
'when': '*-*-* 02:00:00',
|
||||
},
|
||||
|
|
@ -263,20 +258,6 @@ nodes['home.nas'] = {
|
|||
'zfs_arc_max_gb': 8,
|
||||
},
|
||||
'pools': {
|
||||
'ssdpool': {
|
||||
'when_creating': {
|
||||
'config': [
|
||||
{
|
||||
'type': 'mirror',
|
||||
'devices': {
|
||||
'/dev/disk/by-id/ata-INTEL_SSDSC2KB960G8_PHYF244001QU960CGN',
|
||||
'/dev/disk/by-id/ata-INTEL_SSDSC2KB960G8_PHYF244002AS960CGN',
|
||||
},
|
||||
},
|
||||
],
|
||||
'ashift': 12,
|
||||
},
|
||||
},
|
||||
'tank': {
|
||||
'when_creating': {
|
||||
'config': [
|
||||
|
|
@ -295,46 +276,67 @@ nodes['home.nas'] = {
|
|||
'ashift': 12,
|
||||
},
|
||||
},
|
||||
'encrypted': {
|
||||
'when_creating': {
|
||||
'config': [
|
||||
{
|
||||
'type': 'raidz',
|
||||
'devices': {
|
||||
'/dev/mapper/sam-S5SSNJ0X409404K',
|
||||
'/dev/mapper/sam-S5SSNJ0X409845F',
|
||||
'/dev/mapper/sam-S5SSNJ0X409870J',
|
||||
},
|
||||
},
|
||||
],
|
||||
'ashift': 12,
|
||||
},
|
||||
'needs': {
|
||||
'action:dm-crypt_open_sam-S5SSNJ0X409404K',
|
||||
'action:dm-crypt_open_sam-S5SSNJ0X409845F',
|
||||
'action:dm-crypt_open_sam-S5SSNJ0X409870J',
|
||||
},
|
||||
# see comment in bundle:backup-server
|
||||
'unless': 'zpool import encrypted',
|
||||
},
|
||||
},
|
||||
'datasets': {
|
||||
'ssdpool': {
|
||||
'encrypted': {
|
||||
'primarycache': 'metadata',
|
||||
},
|
||||
'ssdpool/yate': {
|
||||
'mountpoint': '/opt/yate',
|
||||
},
|
||||
'ssdpool/download': {
|
||||
'mountpoint': '/mnt/download',
|
||||
'quota': '858993459200', # 800 GB
|
||||
},
|
||||
'ssdpool/paperless': {
|
||||
'mountpoint': '/srv/paperless',
|
||||
},
|
||||
'tank': {
|
||||
'primarycache': 'metadata',
|
||||
},
|
||||
'tank/nas': {
|
||||
'encrypted/nas': {
|
||||
'acltype': 'off',
|
||||
'atime': 'off',
|
||||
'compression': 'off',
|
||||
'mountpoint': '/storage/nas',
|
||||
},
|
||||
'tank': {
|
||||
'primarycache': 'metadata',
|
||||
},
|
||||
'tank/opt-yate': {
|
||||
'mountpoint': '/opt/yate',
|
||||
},
|
||||
'tank/download': {
|
||||
'mountpoint': '/storage/download',
|
||||
},
|
||||
'tank/paperless': {
|
||||
'mountpoint': '/srv/paperless',
|
||||
},
|
||||
},
|
||||
'snapshots': {
|
||||
'retain_per_dataset': {
|
||||
'tank/nas': {
|
||||
'encrypted/nas': {
|
||||
# juuuuuuuust to be sure.
|
||||
'daily': 14,
|
||||
'weekly': 6,
|
||||
'monthly': 12,
|
||||
},
|
||||
'ssdpool/download': {
|
||||
'tank/download': {
|
||||
'hourly': 48,
|
||||
'daily': 0,
|
||||
'weekly': 0,
|
||||
'monthly': 0,
|
||||
},
|
||||
'ssdpool/paperless': {
|
||||
'tank/paperless': {
|
||||
'daily': 14,
|
||||
'weekly': 6,
|
||||
'monthly': 24,
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ nodes['home.paperless'] = {
|
|||
},
|
||||
'paperless': {
|
||||
'domain': 'paperless.home.kunbox.net',
|
||||
'version': 'v2.17.1',
|
||||
'version': 'v2.14.7',
|
||||
'timezone': 'Europe/Berlin',
|
||||
},
|
||||
'postgresql': {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ nodes['htz-cloud.wireguard'] = {
|
|||
'172.19.137.0/24',
|
||||
'172.19.136.62/31',
|
||||
'172.19.136.64/31',
|
||||
'172.19.136.66/31',
|
||||
'192.168.100.0/24',
|
||||
},
|
||||
},
|
||||
|
|
@ -53,7 +52,6 @@ nodes['htz-cloud.wireguard'] = {
|
|||
'udp dport 1194 accept',
|
||||
'udp dport 51800 accept',
|
||||
'udp dport 51804 accept',
|
||||
'udp dport 51805 accept',
|
||||
|
||||
# wg.c3voc.de
|
||||
'udp dport 51801 ip saddr 185.106.84.42 accept',
|
||||
|
|
@ -127,13 +125,6 @@ nodes['htz-cloud.wireguard'] = {
|
|||
'my_ip': '172.19.136.66',
|
||||
'their_ip': '172.19.136.67',
|
||||
},
|
||||
'rottenraptor-vpn': {
|
||||
'endpoint': None,
|
||||
'exclude_from_monitoring': True,
|
||||
'my_port': 51805,
|
||||
'my_ip': '172.19.136.68',
|
||||
'their_ip': '172.19.136.69',
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -14,17 +14,17 @@ check_command = "sshmon"
|
|||
check_command = "sshmon"
|
||||
"vars.sshmon_command" = "CT480BX500SSD1_2314E6C5C6C8"
|
||||
|
||||
[metadata.icinga2_api.smartd.services."SMART STATUS ST20000NM007D-3DJ103_WVT0RNKF"]
|
||||
[metadata.icinga2_api.smartd.services."SMART STATUS ST18000NM0092-3CX103_ZVV0686W"]
|
||||
check_command = "sshmon"
|
||||
"vars.sshmon_command" = "ST20000NM007D-3DJ103_WVT0RNKF"
|
||||
"vars.sshmon_command" = "ST18000NM0092-3CX103_ZVV0686W"
|
||||
|
||||
[metadata.icinga2_api.smartd.services."SMART STATUS ST20000NM007D-3DJ103_WVT0V0NQ"]
|
||||
[metadata.icinga2_api.smartd.services."SMART STATUS ST18000NM0092-3CX103_ZVV06JV7"]
|
||||
check_command = "sshmon"
|
||||
"vars.sshmon_command" = "ST20000NM007D-3DJ103_WVT0V0NQ"
|
||||
"vars.sshmon_command" = "ST18000NM0092-3CX103_ZVV06JV7"
|
||||
|
||||
[metadata.icinga2_api.smartd.services."SMART STATUS ST20000NM007D-3DJ103_WVT0W64H"]
|
||||
[metadata.icinga2_api.smartd.services."SMART STATUS ST18000NM0092-3CX103_ZVV06SLR"]
|
||||
check_command = "sshmon"
|
||||
"vars.sshmon_command" = "ST20000NM007D-3DJ103_WVT0W64H"
|
||||
"vars.sshmon_command" = "ST18000NM0092-3CX103_ZVV06SLR"
|
||||
|
||||
[metadata.icinga2_api.smartd.services."SMART STATUS ST8000NM0045-1RL112_ZA1EYQWR"]
|
||||
check_command = "sshmon"
|
||||
|
|
|
|||
|
|
@ -18,11 +18,6 @@ ipmi_username = "Administrator"
|
|||
ipmi_password = "!bwpass:bw/rottenraptor-server/ipmi"
|
||||
ipmi_interface = "lanplus"
|
||||
|
||||
[metadata.apt.repos.tailscale]
|
||||
items = [
|
||||
"deb https://pkgs.tailscale.com/stable/debian {os_release} main",
|
||||
]
|
||||
|
||||
[metadata.docker-immich]
|
||||
enable_auto_album_share = true
|
||||
|
||||
|
|
@ -53,10 +48,6 @@ domain = "sso.rotten.city"
|
|||
[metadata.nginx.vhosts.immich]
|
||||
domain = "immich.rotten.city"
|
||||
|
||||
[metadata.nginx.vhosts.radio]
|
||||
domain = "eventradio.rotten.city"
|
||||
extras = true
|
||||
|
||||
[metadata.php]
|
||||
packages = [
|
||||
"xml",
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
hostname = "172.30.17.53"
|
||||
bundles = ["bird", "wireguard"]
|
||||
groups = ["debian-bookworm"]
|
||||
|
||||
[metadata]
|
||||
location = "rottenraptor"
|
||||
backups.exclude_from_backups = true
|
||||
icinga_options.exclude_from_monitoring = true
|
||||
|
||||
[metadata.bird]
|
||||
static_routes = [
|
||||
"172.30.17.0/24",
|
||||
]
|
||||
|
||||
[metadata.interfaces.ens18]
|
||||
ips = ["172.30.17.53/24"]
|
||||
gateway4 = "172.30.17.1"
|
||||
|
||||
[metadata.nftables.postrouting]
|
||||
"50-router" = [
|
||||
"oifname ens18 masquerade",
|
||||
]
|
||||
|
||||
[metadata.wireguard.peers."htz-cloud.wireguard"]
|
||||
my_port = 51804
|
||||
my_ip = "172.19.136.69"
|
||||
their_ip = "172.19.136.68"
|
||||
|
|
@ -61,7 +61,7 @@ nodes["htz-cloud.miniserver"] = {
|
|||
},
|
||||
"element-web": {
|
||||
"url": "chat.sophies-kitchen.eu",
|
||||
"version": "v1.11.105",
|
||||
"version": "v1.11.96",
|
||||
"config": {
|
||||
"default_server_config": {
|
||||
"m.homeserver": {
|
||||
|
|
@ -210,7 +210,7 @@ nodes["htz-cloud.miniserver"] = {
|
|||
},
|
||||
},
|
||||
"nodejs": {
|
||||
"version": 22,
|
||||
"version": 20,
|
||||
},
|
||||
"ntfy": {
|
||||
"domain": "ntfy.sophies-kitchen.eu",
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ sha1 = 'c5e513fb830f40bea33537ef0c649a3621bd443c'
|
|||
|
||||
[metadata.navidrome.config]
|
||||
MusicFolder = "/mnt/media/Musik"
|
||||
PasswordEncryptionKey = "!decrypt:encrypt$gAAAAABoRXLwSTeGRCvU-eVS-596B4UqjR6sC-AyB17JCLLEaGHDjJUnUXyn3dRKaLNoTCxKQkHIR4K0aAyQkPf7gVEwthZS4UoJCeQhvhFA9udtjSSAMt7E7sMnTFD8qCCoznqSRQzZ"
|
||||
|
||||
[metadata.nfs-client.mounts.media]
|
||||
mountpoint = '/mnt/media'
|
||||
|
|
|
|||
|
|
@ -2,13 +2,11 @@ nodes['sophie.vmhost'] = {
|
|||
'hostname': '172.19.164.2',
|
||||
'bundles': {
|
||||
'backup-client',
|
||||
'hetzner-dyndns',
|
||||
'lm-sensors',
|
||||
'mosquitto',
|
||||
'nfs-server',
|
||||
'mosquitto',
|
||||
'smartd',
|
||||
'vmhost',
|
||||
'wireguard',
|
||||
'zfs',
|
||||
},
|
||||
'groups': {
|
||||
|
|
@ -18,18 +16,11 @@ nodes['sophie.vmhost'] = {
|
|||
'apt': {
|
||||
'packages': {
|
||||
'irqbalance': {},
|
||||
'mosh': {},
|
||||
'borgbackup': {},
|
||||
},
|
||||
},
|
||||
'groups': {
|
||||
'nas': {},
|
||||
},
|
||||
'hetzner-dyndns': {
|
||||
'zone': 'sophies-kitchen.eu',
|
||||
'record': 'router.home',
|
||||
'api_key': vault.decrypt('encrypt$gAAAAABoABHrRTTyOAAFIsHK_g-bubDoNJidbAQ6_0VXyqfal8-wpVMuPPlrw-OtbI1AjNU6Rd1_gKTvwYtNYO9X6RuvuW3TCCH_eitpsoylVEQ0X6SDFNQAFfjkRlOgEiFl85oyTazl'),
|
||||
},
|
||||
'interfaces': {
|
||||
'br1': {
|
||||
'ips': {
|
||||
|
|
@ -71,25 +62,10 @@ nodes['sophie.vmhost'] = {
|
|||
'version': 4,
|
||||
'shares': {
|
||||
'/srv/nas': {
|
||||
'172.19.164.0/23': 'ro,all_squash,anonuid=65534,anongid=65534,no_subtree_check',
|
||||
'172.19.164.0/24': 'ro,all_squash,anonuid=65534,anongid=65534,no_subtree_check',
|
||||
},
|
||||
},
|
||||
},
|
||||
'nftables': {
|
||||
'forward': {
|
||||
'50-router': [
|
||||
'ct state { related, established } accept',
|
||||
'oifname br1 accept',
|
||||
],
|
||||
},
|
||||
'input': {
|
||||
'50-wireguard': [
|
||||
'udp dport 1194 accept',
|
||||
'udp dport 10348 accept',
|
||||
'udp dport 10349 accept',
|
||||
],
|
||||
},
|
||||
},
|
||||
'smartd': {
|
||||
'disks': {
|
||||
'/dev/nvme0',
|
||||
|
|
@ -99,12 +75,6 @@ nodes['sophie.vmhost'] = {
|
|||
'/dev/disk/by-id/ata-ST20000NM007D-3DJ103_ZVT7D6JP',
|
||||
},
|
||||
},
|
||||
'sysctl': {
|
||||
'options': {
|
||||
'net.ipv4.conf.all.forwarding': '1',
|
||||
'net.ipv6.conf.all.forwarding': '1',
|
||||
},
|
||||
},
|
||||
'systemd-networkd': {
|
||||
'bridges': {
|
||||
'br0': {
|
||||
|
|
@ -139,29 +109,6 @@ nodes['sophie.vmhost'] = {
|
|||
},
|
||||
},
|
||||
},
|
||||
'wireguard': {
|
||||
'snat_ip': '172.19.137.2',
|
||||
'peers': {
|
||||
'thinkpad': {
|
||||
'endpoint': None,
|
||||
'exclude_from_monitoring': True,
|
||||
'my_ip': '172.19.165.64',
|
||||
'my_port': 10348,
|
||||
'their_ip': '172.19.165.65',
|
||||
'psk': vault.decrypt('encrypt$gAAAAABoAUy3lAHfn7d9Jn4ppiPRr6LOReFGyGS4HzWC5ACHNipDFnGttnOHNji2DGIYVITzj3PosZs7PRn8BvXmwumEXNNP-G0nDucuiNNzUKuOCP4YWaF9-I1tnpmT_td3nqsCDajH'),
|
||||
'pubkey': vault.decrypt('encrypt$gAAAAABoAUxlf048ovJebqo0MlLiLHcuuTCSmnCzhxSZPrFMjRaFLW0CvC3GnVed_4n7CjjZ6ygrORSl8xyBM5hvbN0-JM_56ZZFpn1UVkizctjHjb1u2XtpGAe2nMAnq2Cdg5swgH9S'),
|
||||
},
|
||||
'smartphone': {
|
||||
'endpoint': None,
|
||||
'exclude_from_monitoring': True,
|
||||
'my_ip': '172.19.165.66',
|
||||
'my_port': 10349,
|
||||
'their_ip': '172.19.165.67',
|
||||
'psk': vault.decrypt('encrypt$gAAAAABoAUy3lAHfn7d9Jn4ppiPRr6LOReFGyGS4HzWC5ACHNipDFnGttnOHNji2DGIYVITzj3PosZs7PRn8BvXmwumEXNNP-G0nDucuiNNzUKuOCP4YWaF9-I1tnpmT_td3nqsCDajH'),
|
||||
'pubkey': vault.decrypt('encrypt$gAAAAABoAWD96YcEFsLzfOCzjS_4Hg7xX516OZ5RD_qFPSEZliaYSRMhY3uyNDtQ--e0dzEwdFHK_xGT3F7jQzYAvftH4iFtk9y3n3FNFVPxqsWckX4cJIX7ZZszbQCq8sfZZXGUR0C9'),
|
||||
},
|
||||
},
|
||||
},
|
||||
'zfs': {
|
||||
'pools': {
|
||||
'storage': {
|
||||
|
|
@ -186,12 +133,6 @@ nodes['sophie.vmhost'] = {
|
|||
}
|
||||
},
|
||||
"datasets": {
|
||||
'nas/ejgwthink': {
|
||||
'mountpoint': '/mnt/backups/ejgwthink',
|
||||
},
|
||||
'nas/ejgwdesk': {
|
||||
'mountpoint': '/mnt/backups/ejgwdesk',
|
||||
},
|
||||
"storage/libvirt": {
|
||||
"mountpoint": "/var/lib/libvirt",
|
||||
},
|
||||
|
|
|
|||
|
|
@ -25,15 +25,15 @@ nodes['voc.infobeamer-cms'] = {
|
|||
},
|
||||
'infobeamer-cms': {
|
||||
'domain': 'infobeamer.c3voc.de',
|
||||
'event_start_date': '2025-06-19',
|
||||
'event_duration_days': 4,
|
||||
'event_start_date': '2025-02-28',
|
||||
'event_duration_days': 3,
|
||||
'config': {
|
||||
'ADMIN_USERS': [],
|
||||
'NO_LIMIT_USERS': [],
|
||||
'HOSTED_API_KEY': vault.decrypt('encrypt$gAAAAABhxJPH2sIGMAibU2Us1HoCVlNfF0SQQnVl0eiod48Zu8webL_-xk3wDw3yXw1Hkglj-2usl-D3Yd095yTSq0vZMCv2fh-JWwSPdJewQ45x9Ai4vXVD4CNz5vuJBESKS9xQWXTc'),
|
||||
'INTERRUPT_KEY': vault.human_password_for('infobeamer-cms interrupt key 38c3', words=1),
|
||||
'SETUP_IDS': [
|
||||
262628,
|
||||
258552,
|
||||
],
|
||||
# 'EXTRA_ASSETS': [{
|
||||
# 'type': "image",
|
||||
|
|
@ -80,9 +80,9 @@ nodes['voc.infobeamer-cms'] = {
|
|||
},
|
||||
},
|
||||
'rooms': {
|
||||
'Medientheater': 34430, # s1
|
||||
'Vortragssaal': 37731, # s2
|
||||
'Kubus': 26610, # s3
|
||||
'Saal 1': 34430, # s1
|
||||
'Saal GLITCH': 37731, # s2
|
||||
'Saal ZIGZAG': 26610, # s3
|
||||
'Sendezentrum': 38641, # s4
|
||||
'Stage YELL': 38642, # s5
|
||||
'Stage HUFF': 35042, # s6
|
||||
|
|
|
|||
|
|
@ -1,78 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
if [[ -z "$1" ]] || [[ "$1" == '--help' ]]
|
||||
then
|
||||
echo "Usage: $0 <wildcard-domain>"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
set -e
|
||||
|
||||
domain=$1
|
||||
certalias="_.$1"
|
||||
|
||||
tmpdir=$(mktemp -d)
|
||||
echo "temp dir is $tmpdir"
|
||||
#trap 'cd /; rm -Rf "$tmpdir"' EXIT
|
||||
|
||||
export BW_REPO_PATH="${BW_REPO_PATH:-$PWD}"
|
||||
|
||||
|
||||
cd -- "$tmpdir"
|
||||
git clone https://github.com/dehydrated-io/dehydrated.git
|
||||
cd dehydrated
|
||||
git checkout "$(git describe --tags --abbrev=0)"
|
||||
|
||||
cat >config <<EOF
|
||||
BASEDIR=$tmpdir
|
||||
KEYSIZE=4096
|
||||
HOOK=$tmpdir/dehydrated/hook
|
||||
RENEW_DAYS=90
|
||||
CHALLENGETYPE=dns-01
|
||||
EOF
|
||||
|
||||
cat >hook <<"EOF"
|
||||
#!/usr/bin/env bash
|
||||
|
||||
if [[ "$1" == 'deploy_challenge' ]]
|
||||
then
|
||||
domain=$2
|
||||
token_value=$4
|
||||
|
||||
echo
|
||||
echo You must now provide this DNS record:
|
||||
echo "$(tput bold)_acme-challenge.$domain IN TXT $token_value$(tput sgr0)"
|
||||
echo
|
||||
echo "Hit ENTER once it's available."
|
||||
read
|
||||
fi
|
||||
EOF
|
||||
chmod +x hook
|
||||
|
||||
cat <<EOF
|
||||
|
||||
You will soon be asked to create several DNS records.
|
||||
$(tput bold)Please create all of them. The second one does NOT replace
|
||||
the first one.$(tput sgr0)
|
||||
|
||||
EOF
|
||||
|
||||
./dehydrated --register --accept-terms -f config
|
||||
./dehydrated -c -d "$domain" --alias "$certalias" -d "*.$domain" -f config
|
||||
|
||||
cd -- "$tmpdir"/certs/"$certalias"
|
||||
|
||||
echo
|
||||
echo Copying final files:
|
||||
echo
|
||||
bw_repo=$(${PYENV_ROOT}/versions/bw/bin/bw debug -c 'print(repo.path)')
|
||||
cd -- "$tmpdir"/certs/"$certalias"
|
||||
cp -v cert.pem "$bw_repo"/data/ssl/"$certalias".crt.pem
|
||||
cp -v chain.pem "$bw_repo"/data/ssl/"$certalias".crt_intermediate.pem
|
||||
|
||||
|
||||
echo "Encrypting private key via bw ..."
|
||||
${PYENV_ROOT}/versions/bw/bin/bw debug -c "repo.vault.encrypt_file('$tmpdir/certs/$certalias/privkey.pem', 'ssl/$certalias.key.pem.vault')"
|
||||
|
||||
echo
|
||||
echo "Certificate and key created."
|
||||
|
|
@ -34,7 +34,7 @@ QUERY_SITES = """{
|
|||
}"""
|
||||
|
||||
QUERY_DEVICES = """{
|
||||
device_list(filters: {site_id: "SITE_ID", tags: {name: {exact: "bundlewrap"}}}) {
|
||||
device_list(filters: {tag: "bundlewrap", site_id: "SITE_ID"}) {
|
||||
name
|
||||
id
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue