From 94be93929518155c431b61d5d49f9accf3d3f190 Mon Sep 17 00:00:00 2001
From: mc-fucker <dev@mc-fucker.cool>
Date: Tue, 31 Jan 2023 11:29:05 +0100
Subject: [PATCH] made zabbix use vars.nix

---
 modules/vars.nix          |  3 ++-
 modules/zabbix-agent.nix  |  2 +-
 modules/zabbix-server.nix | 28 +++++++++++-----------------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/modules/vars.nix b/modules/vars.nix
index 30b4779..bb2aa53 100644
--- a/modules/vars.nix
+++ b/modules/vars.nix
@@ -6,8 +6,9 @@
 
   podman = {
     extraOptions = [
-      "--dns=100.100.100.100"
       "-l=io.containers.autoupdate=registry"
+      "--dns=100.100.100.100"
+      "--dns-search=mc-fucker.vpn.mc-fucker.cool"
     ];
     hostIP = "10.88.0.1";
   };
diff --git a/modules/zabbix-agent.nix b/modules/zabbix-agent.nix
index ec59445..a1dafe3 100644
--- a/modules/zabbix-agent.nix
+++ b/modules/zabbix-agent.nix
@@ -6,7 +6,7 @@ in
 
   services.zabbixAgent = {
     enable = true;
-    server = "mc4";
+    server = "mc4,10.88.1.0";
     #package = pkgs.zabbix.agent2;
     package = (pkgs.callPackages ../packages/zabbix/agent2.nix {}).${version};
     settings = {
diff --git a/modules/zabbix-server.nix b/modules/zabbix-server.nix
index 871ecd2..22d05ee 100644
--- a/modules/zabbix-server.nix
+++ b/modules/zabbix-server.nix
@@ -1,11 +1,10 @@
 { pkgs, lib, ... }:
 let
-  db = "zabbix";
-  db_host = "10.88.0.1";
-  version = "latest";
-  port = "8999";
-  domain = "zbx.mc-fucker.cool";
-  podman_dns = "--dns=100.100.100.100";
+  cfg = import ./vars.nix;
+  db = cfg.zabbix.db;
+  db_host = cfg.podman.hostIP;
+  port = cfg.zabbix.port;
+  domain = cfg.zabbix.domain;
   server_ip = "10.88.1.0";
   web_ip = "10.88.1.1";
 in
@@ -30,31 +29,26 @@ in
   };
 
   virtualisation.oci-containers.containers.zabbix-server = {
-    image = "zabbix/zabbix-server-pgsql:alpine-6.2-latest";
+    image = "docker.io/zabbix/zabbix-server-pgsql:alpine-6.2-latest";
     environment = {
       DB_SERVER_HOST = db_host;
       POSTGRES_USER = db;
     };
     environmentFiles = [ /etc/nixos/keys/zabbix-env ];
-    extraOptions = [
-      podman_dns
-      "--ip=${server_ip}"
-    ];
+    extraOptions = cfg.podman.extraOptions ++ [ "--ip=${server_ip}" ];
   };
 
   virtualisation.oci-containers.containers.zabbix-web = {
-    image = "zabbix/zabbix-web-nginx-pgsql:alpine-6.2-latest";
+    image = "docker.io/zabbix/zabbix-web-nginx-pgsql:alpine-6.2-latest";
     environment = {
       DB_SERVER_HOST = db_host;
       POSTGRES_USER = db;
       ZBX_SERVER_HOST = server_ip;
+      ZBX_SERVER_NAME = "Superbly Managed Networks and Hosting";
       PHP_TZ = "Europe/Berlin";
     };
     environmentFiles = [ /etc/nixos/keys/zabbix-env ];
-    extraOptions = [
-      podman_dns
-      "--ip=${web_ip}"
-    ];
+    extraOptions = cfg.podman.extraOptions ++ [ "--ip=${web_ip}" ];
     ports = [ "${port}:8080" ];
   };
 
@@ -70,7 +64,7 @@ in
     '';
   };
 
-  networking.firewall.interfaces.podman0.allowedTCPPorts = [ 5432 ];
+  networking.firewall.interfaces.podman0.allowedTCPPorts = [ 5432 10050 ];
 }
 
 # vim: set et ts=2 sw=2 ai: