diff --git a/data/powerdns/files/bind-zones/franzi.business b/data/powerdns/files/bind-zones/franzi.business index 97c9e98..74f52c5 100644 --- a/data/powerdns/files/bind-zones/franzi.business +++ b/data/powerdns/files/bind-zones/franzi.business @@ -9,10 +9,7 @@ $ORIGIN franzi.business. IN TXT "v=spf1 mx ~all" chat IN CNAME rx300.kunbox.net. - -dimension IN A 94.130.52.224 -dimension IN AAAA 2a01:4f8:10b:2a5f::2 - +dimension IN CNAME rx300.kunbox.net. git IN CNAME rx300.kunbox.net. jenkins IN CNAME rx300.kunbox.net. matrix IN CNAME rx300.kunbox.net. diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py index 9ea8a2e..0945115 100644 --- a/nodes/htz/ex42-1048908.py +++ b/nodes/htz/ex42-1048908.py @@ -112,17 +112,6 @@ nodes['htz.ex42-1048908'] = { }, }, }, - 'dimension.franzi.business': { - 'ssl': '_.franzi.business', - 'extras': True, - 'do_not_set_content_security_headers': True, - 'max_body_size': '50M', - 'locations': { - '/': { - 'target': 'http://127.0.0.1:8184', - }, - }, - }, 'git.kunsmann.eu': { 'locations': { '/': { diff --git a/nodes/rx300.py b/nodes/rx300.py index a8bf619..79414f2 100644 --- a/nodes/rx300.py +++ b/nodes/rx300.py @@ -13,6 +13,7 @@ nodes['rx300'] = { 'gitea', 'jenkins-ci', 'lm-sensors', + 'matrix-dimension', 'matrix-media-repo', 'matrix-synapse', 'mautrix-telegram', @@ -187,6 +188,22 @@ nodes['rx300'] = { }, 'upload_max_mb': 500, }, + 'matrix-dimension': { + 'url': 'dimension.franzi.business', + 'version': 'master', # doesn't have releases yet + 'homeserver': { + 'name': 'franzi.business', + 'clientServerUrl': 'https://matrix.franzi.business', + 'accessToken': vault.decrypt('encrypt$gAAAAABg-wBmGbAy-Ou1mkG2w5UyoqWmWYzDr4ZavyUQdmG_VtrUSmwHjx-qcBGIz_7NniD3zKm9GGvzRZItDu5zYiojcudYr74TkWJKhdDrgFbcWlfJJ_m3bWzrSORaTYzBGRckp2Vz_8xHgDk1W03vpT6mdIPMDzjuINssIcPs0YDth25W942tMfPA2csvLADY50qVRMJpdBOVIWba55o0g6-mAAQLOz6Ld4cCvYqZsqXsxjT8JUytJv_uSG4zgCS_aX20JlAyJWpJgT8FQF5HzIbsko_-Z9-TwtY7yllJp5Ri3n0WaDaWoMmUfhLvkMJeymmOc32A4WJBAePQ_2F-_oUDE7t97A-m3ZiMVAEefDnH5MkoiQEJTfHrJsXRkdBT_BnJlY1CoAuXpRYDdvbVDwN_qZHHHtqsno437l9S6GgDK_-sKBiojYkYsfHcJCdSEqeFGuxT'), + }, + 'admins': [ + '@kunsi:franzi.business', + ], + 'telegram': { + # same as for mautrix-telegram + 'botToken': vault.decrypt('encrypt$gAAAAABfVK51ErJ6gfsOOkbRxSHDnVYmf7EihAQf7Uwj9og3TlAw64WRsA6ZVEgTSvOdLB3SMKZ-cTEhwkCOpbymq-_WLhes-hZALhN-H_oXHaxTQErJ0lARynKmjM-4ZhoGlUWlfh4Q'), + }, + }, 'matrix-synapse': { 'server_name': 'franzi.business', 'baseurl': 'matrix.franzi.business', @@ -221,6 +238,7 @@ nodes['rx300'] = { 'telegram': { 'api_id': vault.decrypt('encrypt$gAAAAABfVK5SmDDru-UQxitkE5VhPArnUBhaRbAqQPvAW2Fh3fd1XDrWxa3Qn4BSnJAPNWglH5wil_SXUMcIm95FMhPe8dVeMQ=='), 'api_token': vault.decrypt('encrypt$gAAAAABfVK5jHuUly1xr9Iku362k7oF4ZYRhLGzNJh3aJpiNrLfAy_DJpTwucx4FV_g45dyQF5boqG2rgdDfwsJN_Ab95es6T4SPGiXIxJOBlvIln1Torwh16pXKchhUTn_PQ077Ll1W'), + # same as for matrix-dimension 'bot_token': vault.decrypt('encrypt$gAAAAABfVK51ErJ6gfsOOkbRxSHDnVYmf7EihAQf7Uwj9og3TlAw64WRsA6ZVEgTSvOdLB3SMKZ-cTEhwkCOpbymq-_WLhes-hZALhN-H_oXHaxTQErJ0lARynKmjM-4ZhoGlUWlfh4Q'), }, }, @@ -261,6 +279,7 @@ nodes['rx300'] = { 'element-web': {'ssl': '_.franzi.business'}, 'gitea': {'ssl': '_.franzi.business'}, 'jenkins-ci': {'ssl': '_.franzi.business'}, + 'matrix-dimension': {'ssl': '_.franzi.business'}, 'matrix-synapse': {'ssl': '_.franzi.business'}, 'miniflux': {'ssl': '_.franzi.business'}, 'radicale': {'ssl': '_.franzi.business'},