fmt: removed some duplicates

applications/gitlab.nix

@@ -99,11 +99,7 @@
     ];
 
     networking.firewall.allowedTCPPorts = [
-      80
-      443
-
       # for git
-      22
       2222
     ];
 

applications/ldap.nix

@@ -83,10 +83,6 @@ Gonna use a priper nixos module for this
 
     # firewall on teh computer itself
     networking.firewall.allowedTCPPorts = [
-      80
-      443
-
-      # for ldap
       389
       636
     ];

applications/ulfm.nix

@@ -47,8 +47,6 @@
     age.secrets.ulfm.file = ../secrets/stream_ulfm.age;
 
     networking.firewall.allowedTCPPorts = [
-      80
-      443
       8000
     ];
 

machines/_base.nix

@@ -4,6 +4,12 @@
   imports = [
     (modulesPath + "/virtualisation/proxmox-lxc.nix")
 
+    # every sever may need the firewall config stuff
+    ../applications/firewall.nix
+
+    # every sever needs to have a dns record
+    ../applications/dns.nix
+
     # every server needs teh ldap client for admins
     ../applications/ldap_client.nix
   ];

machines/agentjones.nix

@@ -19,9 +19,6 @@ let
 
 in {
   imports = [
-    # applications for this particular server
-    ../applications/firewall.nix
-    ../applications/dns.nix
     ./hardware/RM001.nix
   ];
 

machines/galatea.nix

@@ -19,10 +19,6 @@ let
   hostname  = "${name}.skynet.ie";
 in {
   imports = [
-    # general stuff for config
-    ../applications/dns.nix
-
-    # specific to tis server
     ../applications/ulfm.nix
   ];
 

machines/glados.nix

@@ -21,9 +21,6 @@ let
 
 in {
   imports = [
-    ../applications/dns.nix
-
-    # applications for this particular server
     ../applications/gitlab.nix
   ];
 

machines/kitt.nix

@@ -21,11 +21,6 @@ let
 
 in {
   imports = [
-     # required imports
-     ../applications/firewall.nix
-     ../applications/dns.nix
-
-    # whats running on teh server
     ../applications/ldap.nix
   ];
 

machines/optimus.nix

@@ -20,8 +20,6 @@ let
 
 in {
   imports = [
-    # applications for this particular server
-    ../applications/dns.nix
     ../applications/games.nix
   ];
 

machines/vendetta.nix

@@ -24,10 +24,6 @@ in {
   imports = [
     # the physical hardware for this
     ./hardware/RM002.nix
-
-    # applications for this particular server
-    ../applications/firewall.nix
-    ../applications/dns.nix
   ];
 
   deployment = {

machines/vigil.nix

@@ -21,7 +21,7 @@ let
   ns = "ns2";
 in {
   imports = [
-    ../applications/dns.nix
+
   ];
 
   deployment = {