diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py index 2be737e..9faefdb 100644 --- a/nodes/htz/ex42-1048908.py +++ b/nodes/htz/ex42-1048908.py @@ -57,18 +57,6 @@ nodes['htz.ex42-1048908'] = { 'deb http://deb.debian.org/debian {os_release}-backports main', }, }, - 'weechat': { - 'items': { - 'deb https://weechat.org/debian {os_release} main', - }, - }, - }, - }, - 'backup-client': { - 'pre-hooks': { - 'kunsi-weechat': \ - 'echo \'core.weechat */layout store\' >> /home/kunsi/.weechat/weechat_fifo\n' \ - 'echo \'core.weechat */save\' >> /home/kunsi/.weechat/weechat_fifo\n', }, }, 'backups': { @@ -87,25 +75,6 @@ nodes['htz.ex42-1048908'] = { 'icinga_options': { 'pretty_name': 'kunsmann.eu', }, - 'letsencrypt': { - 'concat_and_deploy': { - 'kunsi-weechat': { - 'match_domain': 'part.of.the.trans-agenda.eu', - 'target': '/home/kunsi/.weechat/ssl/relay.pem', - 'chown': 'kunsi:kunsi', - 'chmod': '0440', - 'commands': [ - 'echo \'core.weechat */relay sslcertkey\' >> /home/kunsi/.weechat/weechat_fifo' - ], - }, - }, - 'domains': { - 'matrix.franzi.business': { - 'franzi.business', - }, - 'part.of.the.trans-agenda.eu': set(), - }, - }, 'locale': { 'installed': { # legacy @@ -115,10 +84,6 @@ nodes['htz.ex42-1048908'] = { 'nftables': { 'rules': { 'input': { - 'kunsi-weechat': [ - 'udp dport { 60000-61000 } accept', - 'tcp dport 9001 accept', - ], 'libvirt': [ 'tcp dport 53 iif virbr0 accept', 'udp dport 53 iif virbr0 accept', diff --git a/nodes/rx300.py b/nodes/rx300.py index 11558fc..16b41ea 100644 --- a/nodes/rx300.py +++ b/nodes/rx300.py @@ -86,9 +86,9 @@ nodes['rx300'] = { }, 'backup-client': { 'pre-hooks': { -# 'kunsi-weechat': \ -# 'echo \'core.weechat */layout store\' >> /home/kunsi/.weechat/weechat_fifo\n' \ -# 'echo \'core.weechat */save\' >> /home/kunsi/.weechat/weechat_fifo\n', + 'kunsi-weechat': \ + 'echo \'core.weechat */layout store\' >> /home/kunsi/.weechat/weechat_fifo\n' \ + 'echo \'core.weechat */save\' >> /home/kunsi/.weechat/weechat_fifo\n', }, }, 'backups': { @@ -156,20 +156,20 @@ nodes['rx300'] = { 'domain': 'jenkins.franzi.business', }, 'letsencrypt': { -# 'concat_and_deploy': { -# 'kunsi-weechat': { -# 'match_domain': 'part.of.the.trans-agenda.eu', -# 'target': '/home/kunsi/.weechat/ssl/relay.pem', -# 'chown': 'kunsi:kunsi', -# 'chmod': '0440', -# 'commands': [ -# 'echo \'core.weechat */relay sslcertkey\' >> /home/kunsi/.weechat/weechat_fifo' -# ], -# }, -# }, -# 'domains': { -# 'part.of.the.trans-agenda.eu': set(), -# }, + 'concat_and_deploy': { + 'kunsi-weechat': { + 'match_domain': 'rx300.kunbox.net', + 'target': '/home/kunsi/.weechat/ssl/relay.pem', + 'chown': 'kunsi:kunsi', + 'chmod': '0440', + 'commands': [ + 'echo \'core.weechat */relay sslcertkey\' >> /home/kunsi/.weechat/weechat_fifo' + ], + }, + }, + 'domains': { + 'rx300.kunbox.net': set(), + }, }, 'matrix-media-repo': { 'version': 'v1.2.8', @@ -243,6 +243,16 @@ nodes['rx300'] = { '@.*:franzi\\\\.business', }, }, + 'nftables': { + 'rules': { + 'input': { + 'kunsi-weechat': [ + 'udp dport { 60000-61000 } accept', + 'tcp dport 9001 accept', + ], + }, + }, + }, 'nginx': { 'vhosts': { 'element-web': {'ssl': '_.franzi.business'},