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

wip

Browse source
This commit is contained in:
mwiegand 2021-10-20 23:47:22 +02:00
parent e184259c37
commit ea494b10e3
3 changed files with 198 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
bundles/redis/items.py
View file

@ -1,5 +1,53 @@
directories = { directories = {
'/etc/redis': {
'purge': True,
'needs': [
'pkg_apt:redis-server',
],
},
'/var/lib/redis': { '/var/lib/redis': {
'owner': 'redis', 'owner': 'redis',
'purge': True,
'needs': [
'pkg_apt:redis-server',
],
}, },
} }
files = {
'/etc/systemd/system/redis.service': {
'delete': True,
'needs': [
'pkg_apt:redis-server',
],
},
}
svc_systemd = {
'redis': {
'running': False,
'enabled': False,
'needs': [
'pkg_apt:redis-server',
],
},
}
for name, conf in node.metadata.get('redis').items():
files[f'/etc/redis/{name}.conf'] = {
'content': '\n'.join(
f'{key} {value}' for key, value in sorted(conf.items())
),
'owner': 'redis',
'triggers': [
f'svc_systemd:redis-{name}:restart'
],
}
svc_systemd[f'redis-{name}'] = {
'needs': [
'svc_systemd:redis',
f'file:/etc/redis/{name}.conf',
],
}

145
bundles/redis/metadata.py
View file

@ -8,7 +8,10 @@ defaults = {
'paths': { 'paths': {
'/var/lib/redis', '/var/lib/redis',
}, },
} },
'redis': {
'server': {},
},
} }
if node.has_bundle('zfs'): if node.has_bundle('zfs'):
@ -23,3 +26,143 @@ if node.has_bundle('zfs'):
}, },
}, },
} }
@metadata_reactor.provides(
'redis',
)
def config(metadata):
redis = {}
for name, conf in metadata.get('redis').items():
redis[name] = {
'bind': '127.0.0.1 ::1',
'protected-mode': 'yes',
'port': '6379',
'tcp-backlog': '511',
'unixsocket': f'/var/run/redis/redis-{name}.sock',
'unixsocketperm': '700',
'timeout': '0',
'tcp-keepalive': '300',
'daemonize': 'yes',
'supervised': 'no',
'pidfile': f'/var/run/redis/redis-{name}.pid',
'loglevel': 'notice',
'logfile': f'/var/log/redis/redis-{name}.log',
'databases': '16',
'always-show-logo': 'yes',
'save': '900 1',
'save': '300 10',
'save': '60 10000',
'stop-writes-on-bgsave-error': 'yes',
'rdbcompression': 'yes',
'rdbchecksum': 'yes',
'dbfilename': f'{name}.rdb',
'dir': '/var/lib/redis',
'replica-serve-stale-data': 'yes',
'replica-read-only': 'yes',
'repl-diskless-sync': 'no',
'repl-diskless-sync-delay': '5',
'repl-disable-tcp-nodelay': 'no',
'replica-priority': '100',
'lazyfree-lazy-eviction': 'no',
'lazyfree-lazy-expire': 'no',
'lazyfree-lazy-server-del': 'no',
'replica-lazy-flush': 'no',
'appendonly': 'no',
'appendfilename': '"appendonly.aof"',
'appendfsync': 'everysec',
'no-appendfsync-on-rewrite': 'no',
'auto-aof-rewrite-percentage': '100',
'auto-aof-rewrite-min-size': '64mb',
'aof-load-truncated': 'yes',
'aof-use-rdb-preamble': 'yes',
'lua-time-limit': '5000',
'slowlog-log-slower-than': '10000',
'slowlog-max-len': '128',
'latency-monitor-threshold': '0',
'notify-keyspace-events': '""',
'hash-max-ziplist-entries': '512',
'hash-max-ziplist-value': '64',
'list-max-ziplist-size': '-2',
'list-compress-depth': '0',
'set-max-intset-entries': '512',
'zset-max-ziplist-entries': '128',
'zset-max-ziplist-value': '64',
'hll-sparse-max-bytes': '3000',
'stream-node-max-bytes': '4096',
'stream-node-max-entries': '100',
'activerehashing': 'yes',
'client-output-buffer-limit': 'normal 0 0 0',
'client-output-buffer-limit': 'replica 256mb 64mb 60',
'client-output-buffer-limit': 'pubsub 32mb 8mb 60',
'hz': '10',
'dynamic-hz': 'yes',
'aof-rewrite-incremental-fsync': 'yes',
'rdb-save-incremental-fsync': 'yes',
}
return {
'redis': redis,
}
@metadata_reactor.provides(
'systemd/units',
)
def units(metadata):
units = {}
for name, conf in metadata.get('redis').items():
units[f'redis-{name}.service'] = {
'Unit': {
'Description': f'redis {name}',
'After': 'network.target',
},
'Service': {
'Type': 'notify',
'ExecStart': f'/usr/bin/redis-server /etc/redis/{name}.conf --supervised systemd --daemonize no',
'PIDFile': f'/run/redis/redis-{name}.pid',
'TimeoutStopSec': '0',
'Restart': 'always',
'User': 'redis',
'Group': 'redis',
'RuntimeDirectory': f'redis',
'RuntimeDirectoryMode': '2755',
'UMask': '007',
'PrivateTmp': 'yes',
'LimitNOFILE': '65535',
'PrivateDevices': 'yes',
'ProtectHome': 'yes',
'ReadOnlyDirectories': '/',
'ReadWritePaths': [
'-/var/lib/redis',
'-/var/log/redis',
'-/var/run/redis',
],
'NoNewPrivileges': 'true',
'CapabilityBoundingSet': 'CAP_SETGID CAP_SETUID CAP_SYS_RESOURCE',
'MemoryDenyWriteExecute': 'true',
'ProtectKernelModules': 'true',
'ProtectKernelTunables': 'true',
'ProtectControlGroups': 'true',
'RestrictRealtime': 'true',
'RestrictNamespaces': 'true',
'RestrictAddressFamilies': 'AF_INET AF_INET6 AF_UNIX',
'ProtectSystem': 'true',
'ReadWriteDirectories': '-/etc/redis',
},
'Install': {
'WantedBy': {'multi-user.target'},
'Alias': f'redis-{name}.service',
},
}
return {
'systemd': {
'units': units,
}
}

6
nodes/netcup.secondary.py
View file

@ -7,6 +7,7 @@
], ],
'bundles': [ 'bundles': [
'wireguard', 'wireguard',
'redis',
], ],
'metadata': { 'metadata': {
'id': '890848b2-a900-4f74-ad5b-b811fbb4f0bc', 'id': '890848b2-a900-4f74-ad5b-b811fbb4f0bc',
@ -27,6 +28,11 @@
'master_node': 'htz.mails', 'master_node': 'htz.mails',
'hostname': 'second.resolver.name', 'hostname': 'second.resolver.name',
}, },
'redis': {
'nextcloud': {
'port': '6380',
},
},
# 'postfix': { # 'postfix': {
# 'master_node': 'htz.mails', # 'master_node': 'htz.mails',
# 'hostname': 'mail2.sublimity.de', # 'hostname': 'mail2.sublimity.de',