bundles/backup/files/backup_path_via_zfs

@@ -45,7 +45,7 @@ fi
 if [[ "$?" == "0" ]]
 then
   zfs bookmark "$source_dataset@$new_bookmark" "$source_dataset#$new_bookmark"
-  zfs destroy "$source_dataset@$new_bookmark" # keep snapshots?
+  #zfs destroy "$source_dataset@$new_bookmark" # keep snapshots?
   echo "SUCCESS"
 else
   zfs destroy "$source_dataset@$new_bookmark"

bundles/grafana/metadata.py

@@ -55,20 +55,6 @@ defaults = {
 }
 
 
-@metadata_reactor.provides(
-    'grafana/config/server/domain',
-)
-def domain(metadata):
-    return {
-        'grafana': {
-            'config': {
-                'server': {
-                    'domain': metadata.get('grafana/hostname'),
-                },
-            },
-        },    
-    }
-
 @metadata_reactor.provides(
     'grafana/datasources',
 )
@@ -129,7 +115,10 @@ def nginx(metadata):
         'nginx': {
             'vhosts': {
                 metadata.get('grafana/hostname'): {
-                    'content': 'grafana/vhost.conf',
+                    'content': 'nginx/proxy_pass.conf',
+                    'context': {
+                        'target': 'http://127.0.0.1:8300',
+                    }
                 },
             },
         },

data/grafana/vhost.conf

@@ -1,28 +0,0 @@
-map $http_upgrade $connection_upgrade {
-  default upgrade;
-  '' close;
-}
-
-server {
-  listen 443 ssl http2;
-  listen [::]:443 ssl http2;
-  server_name ${server_name};
-  
-  ssl_certificate /var/lib/dehydrated/certs/${server_name}/fullchain.pem;
-  ssl_certificate_key /var/lib/dehydrated/certs/${server_name}/privkey.pem;
-
-  location / {
-    proxy_set_header Host $http_host;
-    proxy_pass http://127.0.0.1:8300/;
-  }
-
-  # Proxy Grafana Live WebSocket connections.
-  location /api/live {
-    rewrite  ^/(.*)  /$1 break;
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection $connection_upgrade;
-    proxy_set_header Host $http_host;
-    proxy_pass http://127.0.0.1:8300/;
-  }
-}