From 6e23f84a398091d34ed3990a408abe8745fdfce3 Mon Sep 17 00:00:00 2001
From: Sophie Schiller <sophie.schiller01@gmail.com>
Date: Wed, 19 Oct 2022 15:38:10 +0200
Subject: [PATCH] bundles/ntfy various fixes

---
 bundles/ntfy/files/server.yml    |  2 +-
 bundles/ntfy/metadata.py         |  2 +-
 data/apt/files/gpg-keys/ntfy.asc | 30 ++++++++++++++++++++++++++++++
 nodes/htz-cloud/miniserver.py    |  2 +-
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 data/apt/files/gpg-keys/ntfy.asc

diff --git a/bundles/ntfy/files/server.yml b/bundles/ntfy/files/server.yml
index a8ce98a..305e4b2 100644
--- a/bundles/ntfy/files/server.yml
+++ b/bundles/ntfy/files/server.yml
@@ -11,7 +11,7 @@
 # - iOS push notifications for self-hosted servers (to calculate the Firebase poll_request topic)
 # - Matrix Push Gateway (to validate that the pushkey is correct)
 #
-base-url: "${metadata.get['ntfy/baseurl']}"
+base-url: "https://${node.metadata.get('ntfy/domain', 'ntfy')}"
 
 # Listen address for the HTTP & HTTPS web server. If "listen-https" is set, you must also
 # set "key-file" and "cert-file". Format: [<ip>]:<port>, e.g. "1.2.3.4:8080".
diff --git a/bundles/ntfy/metadata.py b/bundles/ntfy/metadata.py
index 0ec6bfc..f54336f 100644
--- a/bundles/ntfy/metadata.py
+++ b/bundles/ntfy/metadata.py
@@ -69,7 +69,7 @@ def nginx(metadata):
 
     vhosts = {
         'ntfy': {
-            'domain': metadata.get('ntfy/baseurl'),
+            'domain': metadata.get('ntfy/domain'),
             'locations': locations,
             'website_check_path': '/',
             'website_check_string': 'ntfy',
diff --git a/data/apt/files/gpg-keys/ntfy.asc b/data/apt/files/gpg-keys/ntfy.asc
new file mode 100644
index 0000000..1332be5
--- /dev/null
+++ b/data/apt/files/gpg-keys/ntfy.asc
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQENBF/s8c4BCADYjQMKxdvlx4UxNim0go6J/OL7DuTmoQkkTDtOoBFhQMe3xpkc
+tS1v+Hio1odIoT+fXOzgLJ7VGw5Cr3LCoGfpopHMEWnFWBo8HvNxjKCvmVC6PLux
+LJFWvhIB2UsBQVAsLcSViIpkZMr1oyY6c8Vk1Xih1FwWsygapQnAAGYXoBoTpgtX
+PAFKd5h85hzEv62SM88PdJn3Q8cfi11H0yWQVfOUKVqN6rfjXJMufNsOooXA6/VN
+wT0ysyKkq5hPZ56olb41BxlLHNJRksVtvZnldTLebJ8dKUFwp/Y0cQRPSo+yuOg2
+bZsyhYGoFnN4J5QYsszd2zLxZCL37rs8ArbtABEBAAG0LFBoaWxpcHAgQy4gSGVj
+a2VsIDxwaGlsaXBwLmhlY2tlbEBnbWFpbC5jb20+iQE4BBMBAgAiBQJf7PHOAhsD
+BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAdW47fskduU/M4CADOOdoF/VJT
+iPLeL4wr8ZYLV1rsFQ9ieNWhaKThUntVEDZWaJ+2qrzqhmUlLbNfS1XHm0Yzz+7U
+x2Mxcw1PXW/g/RxdhtVdQGQK4g5E3zRR1jdp6CoTc46gMnRYrDksC3C3ZwiTtRaY
+RDnkqGwBqhmnix/khYsnyrtbTi5khKkXLjrairfO4QIptRNVY2yRmzrF8vfTRDP2
+SVybD7+xTb5jwFcgvNJdKhOA0NNm4YFnPn7Jx22lNzGVvbht4Ll1watWJxhKN/co
+UeW5u3EpRpzxaaXQ5wsGAYRgm7/z9/kdFPk4XPGFbEcZd5ujO3VlGc8xQ/X7MaiB
+YPI8DzLy+IYHuQENBF/s8c4BCADVDmrGRXkwBxO/GsUXhtDZlPHYGpZkFUapziwU
+Zqrd2w/Bl/9dgkEnclayAa5d72Htw8gQCglRmd2Sb5Z500+KvvcbGxmkyhMPWEUQ
+aF8j/UJJ0/Ij9rfTcjRWRpolMkq2vFI3S+lu9TLahQuml84Uj3beLnX5kH/7EQh3
+ReeDh9VHMXAqZ3UP3vyXYtavO8NqTH9ytqppRALDAopYv/QZI+1jegiR1E+oUhqy
+ADQwrQRLtkxb/UwjLFfeeji5pK3A7l8WkQcBIISAcEHKC4ETfEEA8RPVupf4K884
+w0n5bC2HGXQbUCc0vmEOWViS279VYDsnaeaJSWwexqHopQbPABEBAAGJAR8EGAEC
+AAkFAl/s8c4CGwwACgkQHVuO37JHblMZTQgAso3rvTf00VLJOwQvS9QRnvuOPJVP
+d/w0Lfoo4SL1yPpDUcc3tTdGtbOY4wUsJlGaMYVVseXy6W/gJmORjutAVDEou2CP
+g7BYl+HGAZCgESvWc9Dn4nx2MvKGJG8GDtWxgsCWRm2lSTgRU4H390saA9iibz7m
+eJOI5yzrL6ZdBK9avXLldnsXn667nbyhkxgZUaEXkhcRm/Zh9fw6vaJ2PR9UzLQm
+SotJqLlV9yZP6usmiQ8NF0o3MsFuDVk0Ae7XvGtKTBuMMZUSwy9BMudSLsoFMd53
+5Obby3ETwi4QUamDlz3StJQhBhTiFSYY+9nvGW5VsLYpGVGaXlAElk4KcA==
+=ztKz
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/nodes/htz-cloud/miniserver.py b/nodes/htz-cloud/miniserver.py
index 49a59f4..492777f 100644
--- a/nodes/htz-cloud/miniserver.py
+++ b/nodes/htz-cloud/miniserver.py
@@ -220,7 +220,7 @@ nodes['htz-cloud.miniserver'] = {
             },
         },
         'ntfy': {
-            'baseurl': 'https://ntfy.sophies-kitchen.eu',
+            'domain': 'ntfy.sophies-kitchen.eu',
         },
         'postgresql': {
             'version': '11',