bundles/ntfy various fixes

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".

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',