From bb478430b903ac7c881f16a42d7135a436dcbec4 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 27 Aug 2023 09:38:06 +0200 Subject: [PATCH] migrate ntfy from rx300 to carlene --- nodes/carlene.toml | 10 ++++++++++ nodes/rx300.py | 9 --------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/nodes/carlene.toml b/nodes/carlene.toml index c25268b..923e5b9 100644 --- a/nodes/carlene.toml +++ b/nodes/carlene.toml @@ -13,6 +13,7 @@ bundles = [ "miniflux", "netbox", "nodejs", + "ntfy", "redis", "smartd", "check-mail-received", @@ -112,6 +113,15 @@ admins.kunsi = "hostmaster@kunbox.net" [metadata.nginx.vhosts.'gaenseblum.eu'.webroot_config] owner = "skye" + +[metadata.ntfy] +domain = "ntfy.franzi.business" +ratelimit-exempt-hosts = [ + "carlene", + "ovh.icinga2", + "rx300", +] + [metadata.postgresql] version = 15 diff --git a/nodes/rx300.py b/nodes/rx300.py index d97e944..c7f07be 100644 --- a/nodes/rx300.py +++ b/nodes/rx300.py @@ -16,7 +16,6 @@ nodes['rx300'] = { 'matrix-dimension', 'minecraft', 'nodejs', - 'ntfy', 'oidentd', 'php', 'postfixadmin', @@ -131,7 +130,6 @@ nodes['rx300'] = { 'vhosts': { 'jenkins-ci': {'ssl': '_.franzi.business'}, 'matrix-dimension': {'ssl': '_.franzi.business'}, - 'ntfy': {'ssl': '_.franzi.business'}, 'radicale': {'ssl': '_.franzi.business'}, 'daskritzelt-redirect': { 'domain': 'die-brontosaurier-waren-es.org', @@ -241,13 +239,6 @@ nodes['rx300'] = { }, 'worker_processes': 8, }, - 'ntfy': { - 'domain': 'ntfy.franzi.business', - 'ratelimit-exempt-hosts': { - 'ovh.icinga2', - 'rx300', - }, - }, 'oidentd': { 'allows': { 'kunsi': {