remove deepserver and wg-deep

ALinkbetweenNets · Dec 16, 2024 · 768bb49 · 768bb49
1 parent fa18f79
commit 768bb49
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 331 deletions.
diff --git a/home-manager/profiles/common.nix b/home-manager/profiles/common.nix
@@ -19,7 +19,6 @@ with lib; {
       enable = true;
       forwardAgent = true;
       matchBlocks = {
-        "deepserver" = { port = 2522; };
         "nc" = { port = 2522; };
         "sn" = { port = 2522; };
         "dn" = { port = 2522; };

diff --git a/machines/deepserver/configuration.nix b/machines/deepserver/configuration.nix
diff --git a/machines/deepserver/disk-config.nix b/machines/deepserver/disk-config.nix
diff --git a/machines/deepserver/hardware-configuration.nix b/machines/deepserver/hardware-configuration.nix
diff --git a/machines/dn/configuration.nix b/machines/dn/configuration.nix
@@ -15,7 +15,6 @@
     nvidia.enable = true;
     secrets = "/home/l/.keys";
     wireguard.enable = true;
-    # wg-deep.enable = true;
     # wg-link.enable = true;
     xserver.enable = true;
     eth = "enp111s0";

diff --git a/machines/fn/configuration.nix b/machines/fn/configuration.nix
@@ -27,7 +27,6 @@
     systemd-boot.enable = true;
     #secrets = "/home/l/.keys";
     #wireguard.enable = true;
-    #wg-deep.enable = true;
     # wg-link.enable = true;
     domain = "fn.local";
     service-ip = "127.0.0.1";

diff --git a/machines/xn/configuration.nix b/machines/xn/configuration.nix
@@ -27,7 +27,6 @@
     systemd-boot.enable = true;
     #secrets = "/home/l/.keys";
     #wireguard.enable = true;
-    #wg-deep.enable = true;
     # wg-link.enable = true;
     domain = "xn.local";
     service-ip = "127.0.0.1";

diff --git a/modules/common/common.nix b/modules/common/common.nix
@@ -8,10 +8,6 @@ in {
       ssh = {
         startAgent = lib.mkDefault false;
         # agentTimeout = "1h";
-        extraConfig = ''
-          Host deepserver
-            Port 2522
-        '';
         knownHosts = {
           dn = {
             hostNames = [ "dn.monitor-banfish.ts.net" ];

diff --git a/modules/services/fail2ban.nix b/modules/services/fail2ban.nix
@@ -17,8 +17,7 @@ in {
         "100.87.16.37"
         "100.77.249.162"
         "100.123.21.2"
-      ] ++ lib.optionals (config.networking.hostName == "deepserver")
-        [ "10.0.1.0/24" ];
+      ];
       bantime = "24h"; # Set bantime to one day
       bantime-increment = {
         enable = true; # Enable increment of bantime after each violation

diff --git a/modules/services/wg-deep.nix b/modules/services/wg-deep.nix
diff --git a/modules/wireguard/wg-deep.nix b/modules/wireguard/wg-deep.nix
diff --git a/modules/wireguard/wg-link.nix b/modules/wireguard/wg-link.nix
@@ -21,9 +21,6 @@ in {
     #     10.0.1.1 element.linkserver.org
     #     10.0.1.1 outline.linkserver.org
     #   '';
-    services.dnsmasq.extraConfig = ''
-      interface = wg-deep
-    '';
     networking = {
       firewall = {
         allowedUDPPorts = [ 51821 ];