From b04a207262b20d37afc708927b7dcb1f2598a1ba Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 11 Apr 2021 18:20:16 +0200 Subject: [PATCH] nodes/htz.ex42-1048908: add some blocked email domains --- bundles/gitea/files/app.ini | 1 + bundles/gitea/metadata.py | 1 + nodes/htz/ex42-1048908.py | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/bundles/gitea/files/app.ini b/bundles/gitea/files/app.ini index da1c881..fe6b1e0 100644 --- a/bundles/gitea/files/app.ini +++ b/bundles/gitea/files/app.ini @@ -63,6 +63,7 @@ DEFAULT_KEEP_EMAIL_PRIVATE = true DEFAULT_ALLOW_CREATE_ORGANIZATION = false DEFAULT_ENABLE_TIMETRACKING = true NO_REPLY_ADDRESS = noreply.${domain} +EMAIL_DOMAIN_BLOCKLIST = ${','.join(sorted(email_domain_blocklist))} [mailer] ENABLED = true diff --git a/bundles/gitea/metadata.py b/bundles/gitea/metadata.py index 79c10c1..6c61d78 100644 --- a/bundles/gitea/metadata.py +++ b/bundles/gitea/metadata.py @@ -15,6 +15,7 @@ defaults = { 'security_secret_key': repo.vault.password_for('{} gitea security_secret_key'.format(node.name)), 'oauth_secret_key': repo.vault.password_for('{} gitea oauth_secret_key'.format(node.name)), 'internal_token': repo.vault.password_for('{} gitea internal_token'.format(node.name)), + 'email_domain_blocklist': set(), }, 'icinga2_api': { 'gitea': { diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py index 69ea474..23349fc 100644 --- a/nodes/htz/ex42-1048908.py +++ b/nodes/htz/ex42-1048908.py @@ -117,6 +117,10 @@ nodes['htz.ex42-1048908'] = { 'version': '1.14.0', 'sha256': 'f3c67ff8644b8ba7947d69a31fbae95f879f181a6038c0737740771075bada24', 'domain': 'git.kunsmann.eu', + 'email_domain_blocklist': { + 'gmail.com', + 'yahoo.com', + }, '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'),