From b565d5c88261da6ce604dd27cd75784539b4d2bd Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Fri, 23 Jul 2021 07:58:50 +0200 Subject: [PATCH] move matrix stuff to rx300 --- .../homeserver_signing.key.vault | 0 .../powerdns/files/bind-zones/franzi.business | 4 +- nodes/htz/ex42-1048908.py | 77 ------------------- nodes/rx300.py | 75 ++++++++++++++++++ 4 files changed, 76 insertions(+), 80 deletions(-) rename data/matrix-synapse/{htz.ex42-1048908 => rx300}/homeserver_signing.key.vault (100%) diff --git a/data/matrix-synapse/htz.ex42-1048908/homeserver_signing.key.vault b/data/matrix-synapse/rx300/homeserver_signing.key.vault similarity index 100% rename from data/matrix-synapse/htz.ex42-1048908/homeserver_signing.key.vault rename to data/matrix-synapse/rx300/homeserver_signing.key.vault diff --git a/data/powerdns/files/bind-zones/franzi.business b/data/powerdns/files/bind-zones/franzi.business index 6322690..6a40424 100644 --- a/data/powerdns/files/bind-zones/franzi.business +++ b/data/powerdns/files/bind-zones/franzi.business @@ -15,9 +15,7 @@ dimension IN AAAA 2a01:4f8:10b:2a5f::2 git IN CNAME rx300.kunbox.net. jenkins IN CNAME rx300.kunbox.net. - -matrix IN A 94.130.52.224 -matrix IN AAAA 2a01:4f8:10b:2a5f::2 +matrix IN CNAME rx300.kunbox.net. mta-sts IN A 94.130.52.224 mta-sts IN AAAA 2a01:4f8:10b:2a5f::2 diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py index 3c01d6f..2be737e 100644 --- a/nodes/htz/ex42-1048908.py +++ b/nodes/htz/ex42-1048908.py @@ -2,11 +2,6 @@ nodes['htz.ex42-1048908'] = { 'bundles': { # to be migrated to rx300 'dovecot', - 'matrix-media-repo', - 'matrix-synapse', - 'mautrix-telegram', - 'mautrix-whatsapp', - 'mx-puppet-discord', 'oidentd', 'postfixadmin', 'redis', @@ -117,75 +112,6 @@ nodes['htz.ex42-1048908'] = { 'en_DK.UTF-8', }, }, - 'matrix-media-repo': { - 'version': 'v1.2.8', - 'homeservers': { - 'franzi.business': { - 'domain': 'http://[::1]:20080/', - 'api': 'synapse', - }, - }, - 'admins': { - '@kunsi:franzi.business', - }, - 'upload_max_mb': 500, - }, - 'matrix-synapse': { - 'server_name': 'franzi.business', - 'baseurl': 'matrix.franzi.business', - 'admin_contact': 'mailto:hostmaster@kunbox.net', - 'trusted_key_servers': { - 'matrix.org', - 'finallycoffee.eu', - 'nyantec.com', - }, - 'additional_client_config': { - 'im.vector.riot.jitsi': { - 'preferredDomain': 'meet.ffmuc.net', - }, - }, - }, - 'mautrix-telegram': { - 'version': 'v0.10.0', - 'homeserver': { - 'domain': 'franzi.business', - 'url': 'https://matrix.franzi.business', - }, - 'provisioning': { - 'enabled': True, - 'shared_secret': vault.decrypt('encrypt$gAAAAABfVKflEMAi07C_QGP8cy97hF-4gGPym0oF6p4WSMdAveTpx-hFsZd2s7v9ubw99yIsyKx0dHOJI0UND7hV1rKZdvjy4Qa642abZ2wwW7SWTqvuP_qVtrf6-klc2QKTzeD9c_LVsyZ2dqz_JxRPq3MRXgkubZuWOZ6FmFlAlteTffoGfWE='), - }, - 'permissions': { - "'*'": 'relaybot', - 'nyantec.com': 'full', - 'franzi.business': 'full', - "'@kunsi:franzi.business'": 'admin', - }, - 'telegram': { - 'api_id': vault.decrypt('encrypt$gAAAAABfVK5SmDDru-UQxitkE5VhPArnUBhaRbAqQPvAW2Fh3fd1XDrWxa3Qn4BSnJAPNWglH5wil_SXUMcIm95FMhPe8dVeMQ=='), - 'api_token': vault.decrypt('encrypt$gAAAAABfVK5jHuUly1xr9Iku362k7oF4ZYRhLGzNJh3aJpiNrLfAy_DJpTwucx4FV_g45dyQF5boqG2rgdDfwsJN_Ab95es6T4SPGiXIxJOBlvIln1Torwh16pXKchhUTn_PQ077Ll1W'), - 'bot_token': vault.decrypt('encrypt$gAAAAABfVK51ErJ6gfsOOkbRxSHDnVYmf7EihAQf7Uwj9og3TlAw64WRsA6ZVEgTSvOdLB3SMKZ-cTEhwkCOpbymq-_WLhes-hZALhN-H_oXHaxTQErJ0lARynKmjM-4ZhoGlUWlfh4Q'), - }, - }, - 'mautrix-whatsapp': { - 'version': 'v0.1.7', - 'homeserver': { - 'domain': 'franzi.business', - 'url': 'https://matrix.franzi.business', - }, - 'permissions': { - "'@kunsi:franzi.business'": 100, - }, - }, - 'mx-puppet-discord': { - 'homeserver': { - 'domain': 'franzi.business', - 'url': 'https://matrix.franzi.business', - }, - 'allowed-users': { - '@.*:franzi\\\\.business', - }, - }, 'nftables': { 'rules': { 'input': { @@ -251,9 +177,6 @@ nodes['htz.ex42-1048908'] = { }, }, }, - 'matrix-synapse': { - 'ssl': '_.franzi.business', - }, 'mta-sts': { 'domain': 'mta-sts.mx0.kunbox.net', 'domain_aliases': { diff --git a/nodes/rx300.py b/nodes/rx300.py index 369a8e9..b040962 100644 --- a/nodes/rx300.py +++ b/nodes/rx300.py @@ -13,7 +13,12 @@ nodes['rx300'] = { 'gitea', 'jenkins-ci', 'lm-sensors', + 'matrix-media-repo', + 'matrix-synapse', + 'mautrix-telegram', + 'mautrix-whatsapp', 'miniflux', + 'mx-puppet-discord', 'nodejs', 'php', #'postfixadmin', @@ -166,14 +171,84 @@ nodes['rx300'] = { # 'part.of.the.trans-agenda.eu': set(), # }, }, + 'matrix-media-repo': { + 'version': 'v1.2.8', + 'homeservers': { + 'franzi.business': { + 'domain': 'http://[::1]:20080/', + 'api': 'synapse', + }, + }, + 'admins': { + '@kunsi:franzi.business', + }, + 'upload_max_mb': 500, + }, + 'matrix-synapse': { + 'server_name': 'franzi.business', + 'baseurl': 'matrix.franzi.business', + 'admin_contact': 'mailto:hostmaster@kunbox.net', + 'trusted_key_servers': { + 'matrix.org', + 'finallycoffee.eu', + 'nyantec.com', + }, + 'additional_client_config': { + 'im.vector.riot.jitsi': { + 'preferredDomain': 'meet.ffmuc.net', + }, + }, + }, + 'mautrix-telegram': { + 'version': 'v0.10.0', + 'homeserver': { + 'domain': 'franzi.business', + 'url': 'https://matrix.franzi.business', + }, + 'provisioning': { + 'enabled': True, + 'shared_secret': vault.decrypt('encrypt$gAAAAABfVKflEMAi07C_QGP8cy97hF-4gGPym0oF6p4WSMdAveTpx-hFsZd2s7v9ubw99yIsyKx0dHOJI0UND7hV1rKZdvjy4Qa642abZ2wwW7SWTqvuP_qVtrf6-klc2QKTzeD9c_LVsyZ2dqz_JxRPq3MRXgkubZuWOZ6FmFlAlteTffoGfWE='), + }, + 'permissions': { + "'*'": 'relaybot', + 'nyantec.com': 'full', + 'franzi.business': 'full', + "'@kunsi:franzi.business'": 'admin', + }, + 'telegram': { + 'api_id': vault.decrypt('encrypt$gAAAAABfVK5SmDDru-UQxitkE5VhPArnUBhaRbAqQPvAW2Fh3fd1XDrWxa3Qn4BSnJAPNWglH5wil_SXUMcIm95FMhPe8dVeMQ=='), + 'api_token': vault.decrypt('encrypt$gAAAAABfVK5jHuUly1xr9Iku362k7oF4ZYRhLGzNJh3aJpiNrLfAy_DJpTwucx4FV_g45dyQF5boqG2rgdDfwsJN_Ab95es6T4SPGiXIxJOBlvIln1Torwh16pXKchhUTn_PQ077Ll1W'), + 'bot_token': vault.decrypt('encrypt$gAAAAABfVK51ErJ6gfsOOkbRxSHDnVYmf7EihAQf7Uwj9og3TlAw64WRsA6ZVEgTSvOdLB3SMKZ-cTEhwkCOpbymq-_WLhes-hZALhN-H_oXHaxTQErJ0lARynKmjM-4ZhoGlUWlfh4Q'), + }, + }, + 'mautrix-whatsapp': { + 'version': 'v0.1.7', + 'homeserver': { + 'domain': 'franzi.business', + 'url': 'https://matrix.franzi.business', + }, + 'permissions': { + "'@kunsi:franzi.business'": 100, + }, + }, 'miniflux': { 'domain': 'rss.franzi.business', }, + 'mx-puppet-discord': { + 'homeserver': { + 'domain': 'franzi.business', + 'url': 'https://matrix.franzi.business', + }, + 'allowed-users': { + '@.*:franzi\\\\.business', + }, + }, 'nginx': { 'vhosts': { 'element-web': {'ssl': '_.franzi.business'}, 'gitea': {'ssl': '_.franzi.business'}, 'jenkins-ci': {'ssl': '_.franzi.business'}, + 'matrix-synapse': {'ssl': '_.franzi.business'}, 'miniflux': {'ssl': '_.franzi.business'}, 'travelynx': {'ssl': '_.franzi.business'}, 'daskritzelt-redirect': {