From e710ac5180ee01411e9b4a045b2ad5cd1675799f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sat, 4 May 2024 06:59:16 +0300
Subject: [PATCH] nuc graf nginx upd x2

---
 flake.lock                |  8 +++---
 hosts/intelnuc/system.nix | 56 +++++++++++++--------------------------
 2 files changed, 22 insertions(+), 42 deletions(-)

diff --git a/flake.lock b/flake.lock
index 98ad72a..17fc226 100644
--- a/flake.lock
+++ b/flake.lock
@@ -667,11 +667,11 @@
         "sops-nix": "sops-nix"
       },
       "locked": {
-        "lastModified": 1713901156,
-        "narHash": "sha256-VyDnKIsK7r/VNpqMbl8VlZrUaAgbkxX8Destq961Jkk=",
+        "lastModified": 1714793854,
+        "narHash": "sha256-1wajOrBuEuPUejrkwVfwTH+JS/vEwLfmWgZZv1iFx80=",
         "ref": "refs/heads/main",
-        "rev": "4c5ca35a5042bd3ed9653c353acb2d38440eaae1",
-        "revCount": 20,
+        "rev": "4f5717ae46a8d36b4be129184bb0822e9acd024a",
+        "revCount": 22,
         "type": "git",
         "url": "ssh://git@github.com/deltathetawastaken/secrets.git"
       },
diff --git a/hosts/intelnuc/system.nix b/hosts/intelnuc/system.nix
index cd2fa24..df70108 100644
--- a/hosts/intelnuc/system.nix
+++ b/hosts/intelnuc/system.nix
@@ -82,59 +82,39 @@
   services.nginx.virtualHosts."grafana" = {
     forceSSL = false;
     listen = [{port = 80;  addr="0.0.0.0"; ssl=false;}];
-    serverName = "graf1.local";
+    serverName = "graf1.local ${inputs.secrets.work.graf-url}";
     locations."/".extraConfig = ''
       proxy_set_header        Host $host;
       proxy_set_header        X-Real-IP $remote_addr;
-      proxy_pass ${inputs.secrets.work.graf-url};
+      proxy_pass https://${inputs.secrets.work.graf-url};
     '';
     locations."/api/live/ws".extraConfig = ''
       proxy_http_version 1.1;
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "upgrade";
-      proxy_pass ${inputs.secrets.work.graf-url};
+      proxy_pass https://${inputs.secrets.work.graf-url};
     '';
   };
-  # services.nginx.virtualHosts."grafana_first" = {
-  #   forceSSL = false;
-  #   listen = [{port = 80;  addr="0.0.0.0"; ssl=false;}];
-  #   serverName = "graf1.local";
-  #   locations."/".extraConfig = ''
-  #     proxy_set_header        Host $host;
-  #     proxy_set_header        X-Real-IP $remote_addr;
-  #     proxy_pass ${inputs.secrets.work.graf1};
-  #   '';
-  #   locations."/api/live/ws".extraConfig = ''
-  #     proxy_http_version 1.1;
-  #     proxy_set_header Upgrade $http_upgrade;
-  #     proxy_set_header Connection "upgrade";
-  #     proxy_pass ${inputs.secrets.work.graf1};
-  #   '';
-  # };
-  # services.nginx.virtualHosts."grafana_second" = {
-  #   forceSSL = false;
-  #   listen = [{port = 80;  addr="0.0.0.0"; ssl=false;}];
-  #   serverName = "graf2.local";
-  #   locations."/".extraConfig = ''
-  #     proxy_set_header        Host $host;
-  #     proxy_set_header        X-Real-IP $remote_addr;
-  #     proxy_pass ${inputs.secrets.work.graf2};
-  #   '';
-  #   locations."/api/live/ws".extraConfig = ''
-  #     proxy_http_version 1.1;
-  #     proxy_set_header Upgrade $http_upgrade;
-  #     proxy_set_header Connection "upgrade";
-  #     proxy_pass ${inputs.secrets.work.graf2};
-  #   '';
-  # };
-  services.nginx.virtualHosts."kibana" = {
+
+  services.nginx.virtualHosts."keycloak" = {
     forceSSL = false;
     listen = [{port = 80;  addr="0.0.0.0"; ssl=false;}];
-    serverName = "kibana.local";
+    serverName = "${inputs.secrets.work.keycloak}";
     locations."/".extraConfig = ''
       proxy_set_header        Host $host;
       proxy_set_header        X-Real-IP $remote_addr;
-      proxy_pass ${inputs.secrets.work.kibana};
+      proxy_pass https://${inputs.secrets.work.keycloak};
+    '';
+  };
+
+  services.nginx.virtualHosts."kibana" = {
+    forceSSL = false;
+    listen = [{port = 80;  addr="0.0.0.0"; ssl=false;}];
+    serverName = "kibana.local ${inputs.secrets.work.kibana}";
+    locations."/".extraConfig = ''
+      proxy_set_header        Host $host;
+      proxy_set_header        X-Real-IP $remote_addr;
+      proxy_pass https://${inputs.secrets.work.kibana};
     '';
   };
   services.nginx.virtualHosts."zabbix" = {