From 5a6366feec68047e4974f6fef04b7ccb389bfca6 Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kj@orbekk.com>
Date: Mon, 8 Mar 2021 22:09:17 -0500
Subject: add grafana.orbekk.com

---
 config/web-server.nix          | 40 ----------------------------------------
 data/dns/db.orbekk.shared.zone |  2 +-
 machines/firelink.nix          |  2 +-
 modules/monitoring.nix         | 15 ++++++++++++---
 4 files changed, 14 insertions(+), 45 deletions(-)

diff --git a/config/web-server.nix b/config/web-server.nix
index 064472b..9cb9130 100644
--- a/config/web-server.nix
+++ b/config/web-server.nix
@@ -116,17 +116,6 @@
 	          autoindex on;
 	        '';
         };
-        locations."/stats/" = {
-          alias = "/var/lib/stats/out/";
-          extraConfig = "autoindex on;";
-        };
-        locations."/munin/" = {
-          alias = "/var/www/munin/";
-          extraConfig = "autoindex on;";
-        };
-	locations."/mpd" = {
-          proxyPass = "http://${mpd_loc.address}:${toString mpd_loc.port}/";
-	};
         locations."/dav" = {
           root = "/storage/srv/kj.orbekk.com";
           extraConfig = ''
@@ -140,39 +129,10 @@
             autoindex on;
           '';
         };
-        #locations."/systemd" = {
-        #  proxyPass = "http://10.0.20.15:11105/";
-        #};
-        #locations."/hledger" = {
-        #  extraConfig = ''return 302 /hledger/;'';
-        #};
-        # locations."/hledger/" = {
-        #   proxyPass = "http://localhost:5000/";
-        #   extraConfig = ''
-        #     auth_basic "hledger";
-        #     auth_basic_user_file /opt/site/hledger-htpasswd;
-        #   '';
-        # };
-        #locations."/_matrix" = {
-        #  proxyPass = "http://10.0.20.15:11102";
-        #};
       };
-      #"ympd.orbekk.com" = template // {
-      #  locations."/" = {
-      #    proxyPass = "http://${mpdweb_loc.address}:${toString mpdweb_loc.port}/";
-      #  };
-      #};
       "git.orbekk.com" = template // {
         locations."/".proxyPass = "http://localhost:11103";
       };
-      # "hydra.orbekk.com" = template // {
-      #   locations."/" = {
-      #     proxyPass = "http://10.0.20.2:11101";
-      #   };
-      # };
-      # "kufieta.net" = template // {
-      #   locations."/".proxyPass = "http://10.0.20.13:8080";
-      # };
       "journal.orbekk.com" = template // {
         locations."/".proxyPass = "http://localhost:${toString pjournal_loc.port}";
       };
diff --git a/data/dns/db.orbekk.shared.zone b/data/dns/db.orbekk.shared.zone
index 373c935..9c97771 100644
--- a/data/dns/db.orbekk.shared.zone
+++ b/data/dns/db.orbekk.shared.zone
@@ -26,8 +26,8 @@ wifi        IN  CNAME   dragon.dynamic.orbekk.com.
 git         IN  CNAME   dragon.dynamic.orbekk.com.
 hydra       IN  CNAME   dragon.dynamic.orbekk.com.
 kj          IN  CNAME   dragon.dynamic.orbekk.com.
-ympd        IN  CNAME   dragon.dynamic.orbekk.com.
 journal     IN  CNAME   dragon.dynamic.orbekk.com.
+grafana     IN  CNAME   dragon.dynamic.orbekk.com.
 
 raigh       IN AAAA 2001:67c:29f4:1008:216:3eff:fe33:4512
 
diff --git a/machines/firelink.nix b/machines/firelink.nix
index ca35fc9..38dfb33 100644
--- a/machines/firelink.nix
+++ b/machines/firelink.nix
@@ -24,7 +24,7 @@ in
 {
   orbekk.gaming.enable = true;
   orbekk.desktop.enable = true;
-  orbekk.monitoring.enable = true;
+  orbekk.monitoring-server.enable = true;
   orbekk.simple-firewall.allowedTCPPorts = [ 4713 ];
 
   environment.systemPackages = with pkgs; [
diff --git a/modules/monitoring.nix b/modules/monitoring.nix
index 72adaa9..6ef34e7 100644
--- a/modules/monitoring.nix
+++ b/modules/monitoring.nix
@@ -1,11 +1,11 @@
 { config, lib, pkgs, ... }:
 let
-  cfg = config.orbekk.monitoring;
+  cfg = config.orbekk.monitoring-server;
   aliases = import ../data/aliases.nix;
 in
 {
   options = {
-    orbekk.monitoring = {
+    orbekk.monitoring-server = {
       enable = lib.mkEnableOption "Enable monitoring server";
       grafana-port = lib.mkOption {
         type = lib.types.int;
@@ -13,7 +13,7 @@ in
       };
       grafana-domain = lib.mkOption {
         type = lib.types.str;
-        default = "stats.orbekk.com";
+        default = "grafana.orbekk.com";
       };
       prometheus-port = lib.mkOption {
         type = lib.types.int;
@@ -70,5 +70,14 @@ in
         };
       };
     };
+
+    # services.nginx.virtualHosts.${cfg.grafana-domain} = {
+    #   locations."/" = {
+    #     enableACME = true;
+    #     forceSSL = true;
+    #     proxyPass = "http://127.0.0.1:${toString cfg.grafana-port}";
+    #     proxyWebsockets = true;
+    #   };
+    # };
   };
 }
-- 
cgit v1.2.3