refactor: remove unused MAC address entry from dnsmasq configuration, update gitea-vm to include network settings, enhance grafana-monitor with internet connectivity check, and clean up web module imports

hosts/fw/modules/dnsmasq.nix

@@ -70,7 +70,6 @@
         "24:df:a7:b1:1b:74,${config.networkPrefix}.96.101,rmproplus-b1-1b-74"
         
         "1a:c4:04:6e:29:bd,${config.networkPrefix}.97.2,omada"
-        "02:00:00:00:00:03,${config.networkPrefix}.97.5,web-02"
         "02:00:00:00:00:04,${config.networkPrefix}.97.6,matrix"
         "ea:db:d4:c1:18:ba,${config.networkPrefix}.97.50,git"
         "c2:4f:64:dd:13:0c,${config.networkPrefix}.97.20,home-assistant"

hosts/fw/modules/gitea-vm.nix

@@ -1,4 +1,4 @@
-{ lib, nixpkgs, pkgs, ... }: let
+{ config, lib, nixpkgs, pkgs, ... }: let
   # hostname = "git-02";
   # json = pkgs.formats.json { };
   runners = ["git-runner-1" "git-runner-2"];
@@ -38,6 +38,13 @@ in {
         ];
       };
 
+      systemd.network.networks."10-lan" = {
+        matchConfig.PermanentMACAddress = "02:00:00:00:00:0${toString idx}";
+        address = [ "${config.networkPrefix}.97.5${toString idx}/24" ];
+        gateway = [ "${config.networkPrefix}.97.1" ];
+        dns = [ "${config.networkPrefix}.97.1" ];
+      };
+
       networking.hostName = runner;
 
       virtualisation.podman.enable = true;

hosts/fw/modules/grafana-monitor.nix

@@ -46,6 +46,16 @@ let
     fi
     PUSHOVER_USER_KEY=$(cat "''${PUSHOVER_USER_KEY_FILE}")
 
+# Internet connectivity check
+    INTERNET_CHECK_URL="https://1.1.1.1" # Using a reliable IP to bypass potential DNS issues for the check itself
+    echo "Performing internet connectivity check to ''${INTERNET_CHECK_URL}..."
+    if ! ${pkgs.curl}/bin/curl --head --silent --fail --connect-timeout 3 --max-time 5 "''${INTERNET_CHECK_URL}" > /dev/null 2>&1; then
+      echo "Internet connectivity check failed. Cannot reach ''${INTERNET_CHECK_URL}. Skipping Grafana check and exiting successfully."
+      exit 0
+    else
+      echo "Internet connectivity check successful. Proceeding with Grafana check."
+    fi
+    echo "" # Add a blank line for readability before Grafana check logs
     echo "Checking Grafana at ''${GRAFANA_URL}..."
     ACTUAL_HTTP_CODE="000" # Default if curl doesn't provide one
     CURL_ERROR_MESSAGE=""

hosts/fw/modules/web/default.nix

@@ -52,7 +52,6 @@ in {
           ../network-prefix.nix
           ../../utils/modules/sops.nix
           ../../utils/modules/lego/lego.nix
-          ../../modules/tinder-api.nix
           # ../../utils/modules/borgbackup.nix
 
           ./zammad.nix