From 5f0ba20622b571ebe9090a440d05e79f12d98049 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Wed, 2 Aug 2023 16:38:32 +0200 Subject: [PATCH] move forgejo from rx300 to carlene --- nodes/carlene.toml | 12 ++++++++++++ nodes/rx300.py | 45 --------------------------------------------- 2 files changed, 12 insertions(+), 45 deletions(-) diff --git a/nodes/carlene.toml b/nodes/carlene.toml index afb7722..590a7ff 100644 --- a/nodes/carlene.toml +++ b/nodes/carlene.toml @@ -5,6 +5,7 @@ groups = [ ] bundles = [ "element-web", + "forgejo", "matrix-media-repo", "matrix-synapse", "mautrix-telegram", @@ -34,6 +35,17 @@ brand = "franzi.business" defaultCountryCode = "DE" jitsi.preferredDomain = "meet.ffmuc.net" +[metadata.forgejo] +url = "https://codeberg.org/attachments/48524ed4-efdc-4ac5-8b68-f7d5c77d7672" +sha1= "5a7f987b5e95c547cc83c2a000b3cd2dfe4e64a6" +domain = "git.franzi.business" +enable_git_hooks = true +install_ssh_key = true +internal_token = "!decrypt:encrypt$gAAAAABfPncYwCX-NdBr9LdxLyGqmjRJqhmwMnWsdZy6kVOWdKrScW78xaqbJ1tpL1J4qa2hcZ7TQj3l-2mkyJNJOenGzU3TsI-gYMj9vC4m8Bhur5zboxjD4dQXaJbD1WSyHJ9sPJYsWP3Gjg6I19xeq9xMlAI6xaS9vOfuoI8nZnnQPx1NjfQEj03Jxf8a0-3F20sfICst1xRa5K48bpq1PFkK_oRojg==" +lfs_secret_key = "!decrypt:encrypt$gAAAAABfPnd1vgNDt86-91YhviQw8Z0djSp4f_tBt76klDv-ZcwxP1ryJzqJ7qnfaTe_6DYCfc82gEzvVDsyBlCoAkGpt1AI2_LCKetuSCnDPjtGvwdQl3A53lFEdG2UJl1uUiR7f8Vr" +oauth_secret_key = "!decrypt:encrypt$gAAAAABfPnbfTISbldhS0WyxVKBHVVoOMcar7Kxmh1kkmiUGd-RzbbnNzzhEER_owjttPQcACPfGKZ6WklaSsXjLq8km4P6A9QmPbC06GmHbc91m0odCb1KiY7SZeUD35PiRiGSq50dz" +security_secret_key = "!decrypt:encrypt$gAAAAABfPnc-R7pkDj4pQgHDb6pzlNYNJgiWdeBFsX7IsHSnCtNPbZxCdtSL8cHtQzVO1KbSxS7zCwssmgiR8Kj54Z-koD-FQbjpbKWoIPw8SsyeqBVlZhIeEzhw_1t7_7ZTvv1O8AePdNYel9JJb_TaAZ8Vx46ZfsEPy8zaaHrqOekHC6RAnB4=" + [metadata.interfaces.eno2] ips = [ "193.135.9.29/24", diff --git a/nodes/rx300.py b/nodes/rx300.py index f6214f9..4a15b0c 100644 --- a/nodes/rx300.py +++ b/nodes/rx300.py @@ -9,7 +9,6 @@ nodes['rx300'] = { 'bundles': { 'check-mail-received', 'dovecot', - 'gitea', 'ipmitool', 'jenkins-ci', 'jugendhackt_tools', @@ -96,49 +95,6 @@ nodes['rx300'] = { 'imap_pass': bwpass.attr('t-online.de/franzi.kunsmann@t-online.de', 'imap'), }, }, - 'gitea': { - 'url': 'https://codeberg.org/attachments/8aac5e74-a26b-44c9-83b8-267f114af958', - 'sha1': '4dda6dd09e75e38e4f564bd8249d8fc3dc4a334a', - 'domain': 'git.franzi.business', - 'email_domain_blocklist': { - 'aol.com', - 'bamibi.com', - 'beezom.buzz', - 'block521.com', - 'cloud-mail.top', - 'comcast.net', - 'cox.net', - 'cupbest.com', - 'dakcans.com', - 'fitshot.xyz', - 'gmail.co', - 'gmail.com', - 'grabmail.club', - 'hbehs.com', - 'hotmail.com', - 'msn.com', - 'nycexercise.com', - 'oceore.com', - 'popcornfly.com', - 'qqhow.com', - 'runqx.com', - 'spicethainj.com', - 'spruzme.com', - 'syswift.com', - 'tagbert.com', - 'teleg.eu', - 'tempinbox.xyz', - 'verizon.net', - 'vusra.com', - 'yahoo.com', - }, - 'enable_git_hooks': True, - 'install_ssh_key': True, - 'internal_token': vault.decrypt('encrypt$gAAAAABfPncYwCX-NdBr9LdxLyGqmjRJqhmwMnWsdZy6kVOWdKrScW78xaqbJ1tpL1J4qa2hcZ7TQj3l-2mkyJNJOenGzU3TsI-gYMj9vC4m8Bhur5zboxjD4dQXaJbD1WSyHJ9sPJYsWP3Gjg6I19xeq9xMlAI6xaS9vOfuoI8nZnnQPx1NjfQEj03Jxf8a0-3F20sfICst1xRa5K48bpq1PFkK_oRojg=='), - 'lfs_secret_key': vault.decrypt('encrypt$gAAAAABfPnd1vgNDt86-91YhviQw8Z0djSp4f_tBt76klDv-ZcwxP1ryJzqJ7qnfaTe_6DYCfc82gEzvVDsyBlCoAkGpt1AI2_LCKetuSCnDPjtGvwdQl3A53lFEdG2UJl1uUiR7f8Vr'), - 'oauth_secret_key': vault.decrypt('encrypt$gAAAAABfPnbfTISbldhS0WyxVKBHVVoOMcar7Kxmh1kkmiUGd-RzbbnNzzhEER_owjttPQcACPfGKZ6WklaSsXjLq8km4P6A9QmPbC06GmHbc91m0odCb1KiY7SZeUD35PiRiGSq50dz'), - 'security_secret_key': vault.decrypt('encrypt$gAAAAABfPnc-R7pkDj4pQgHDb6pzlNYNJgiWdeBFsX7IsHSnCtNPbZxCdtSL8cHtQzVO1KbSxS7zCwssmgiR8Kj54Z-koD-FQbjpbKWoIPw8SsyeqBVlZhIeEzhw_1t7_7ZTvv1O8AePdNYel9JJb_TaAZ8Vx46ZfsEPy8zaaHrqOekHC6RAnB4='), - }, 'icinga_options': { 'pretty_name': 'franzi.business', }, @@ -233,7 +189,6 @@ nodes['rx300'] = { 'Encryption': 'https://franzi.business/gpg_hi-kunsmann.eu.asc', }, 'vhosts': { - 'forgejo': {'ssl': '_.franzi.business'}, 'jenkins-ci': {'ssl': '_.franzi.business'}, 'matrix-dimension': {'ssl': '_.franzi.business'}, 'miniflux': {'ssl': '_.franzi.business'},