shorewall: remove configs on losurdo

diff --git a/servers/losurdo/acme/autogeree.net.nix b/servers/losurdo/acme/autogeree.net.nix
index ae67d971b196c8268a59bd0bfec66991786b416e..7a54d09cbe386b888e1753ba3b5499d593ed1b81 100644 (file)
--- a/servers/losurdo/acme/autogeree.net.nix
+++ b/servers/losurdo/acme/autogeree.net.nix
@@ -9,14 +9,6 @@ in
 systemd.services."acme-${domain}".after = [
   "unbound.service"
 ];
-services.shorewall.configs.rules = ''
-  # for lego to update ACME DNS-01 challenge
-  DNS(ACCEPT) $FW net:${servers.mermet.ipv4} 
-  # for lego to check DNS propagation on ns6.gandi.net
-  DNS(ACCEPT) $FW net:217.70.177.40 {user=${users.root.name}}
-  # for lego to check DNS propagation on ns0.muarf.org
-  DNS(ACCEPT) $FW net:78.192.65.63 {user=${users.root.name}}
-'';
 networking.nftables.ruleset = ''
   # for lego to update ACME DNS-01 challenge
   add rule inet filter fw2net ip daddr ${servers.mermet.ipv4} tcp dport 53 counter accept comment "DNS"

diff --git a/servers/losurdo/acme/sourcephile.fr.nix b/servers/losurdo/acme/sourcephile.fr.nix
index d6092305c1315a8c93144b15f525732cbf0d46ec..37d7454f602f4bc2166337fcfaf77a57b66961ed 100644 (file)
--- a/servers/losurdo/acme/sourcephile.fr.nix
+++ b/servers/losurdo/acme/sourcephile.fr.nix
@@ -9,12 +9,6 @@ in
 systemd.services."acme-${domain}".after = [
   "unbound.service"
 ];
-services.shorewall.configs.rules = ''
-  # for lego to update ACME DNS-01 challenge
-  DNS(ACCEPT) $FW net:${servers.mermet.ipv4} 
-  # for lego to check DNS propagation on ns6.gandi.net
-  DNS(ACCEPT) $FW net:217.70.177.40 {user=${users.root.name}}
-'';
 networking.nftables.ruleset = ''
   # for lego to update ACME DNS-01 challenge
   add rule inet filter fw2net tcp dport 53 ip daddr ${servers.mermet.ipv4} counter accept comment "DNS"

diff --git a/servers/losurdo/postgresql.nix b/servers/losurdo/postgresql.nix
index b27d1c063d6cf429070f639987178df56fbdc1b9..4645ebff6419429a330b3700345013de8d8ffad2 100644 (file)
--- a/servers/losurdo/postgresql.nix
+++ b/servers/losurdo/postgresql.nix
@@ -8,9 +8,6 @@ in
 imports = [
   postgresql/openconcerto.nix
 ];
-services.shorewall.configs.rules = ''
-  PostgreSQL(ACCEPT) net $FW {rate=s:2/min:3}
-'';
 networking.nftables.ruleset = ''
   add rule inet filter net2fw tcp dport 5432 counter accept comment "PostgreSQL"
 '';