fix firewall issues with oracle

apps/loadkey.nix

@@ -1,4 +1,4 @@
-{ globals, pkgs, ... }: {
+{ pkgs, ... }: {
 
   type = "app";
 

hosts/oracle/default.nix

@@ -27,7 +27,6 @@ nixpkgs.lib.nixosSystem {
     ../common.nix
     ../../modules/nixos
     ../../modules/hardware/server.nix
-    ../../modules/services/oracle.nix
     ../../modules/services/sshd.nix
     ../../modules/services/calibre.nix
     ../../modules/services/jellyfin.nix

modules/services/caddy.nix

@@ -25,6 +25,9 @@ in {
 
     };
 
+    networking.firewall.allowedTCPPorts = [ 80 443 ];
+    networking.firewall.allowedUDPPorts = [ 443 ];
+
   };
 
 }

modules/services/calibre.nix

@@ -37,8 +37,6 @@ in {
       }];
     }];
 
-    networking.firewall.interfaces.calibre = { allowedTCPPorts = [ 80 443 ]; };
-
     # Create directory and set permissions
     system.activationScripts.calibreLibrary.text = ''
       if [ ! -d "${libraryPath}" ]; then

modules/services/oracle.nix

@@ -1,9 +0,0 @@
-{ pkgs, ... }: {
-
-  # Needs to be run at boot for Oracle firewall
-  systemd.services.openIpTables = {
-    script = "${pkgs.iptables}/bin/iptables -I INPUT -j ACCEPT";
-    wantedBy = [ "multi-user.target" ];
-  };
-
-}