diff --git a/optional/adp-dns-client.json b/optional/adp-dns-client.json index 31b03722c6ec423a93badb132777809f16e5c632..282d16de59f12f054bade4cdb89518911887cb21 100644 --- a/optional/adp-dns-client.json +++ b/optional/adp-dns-client.json @@ -1,4 +1,4 @@ { "description": "DNS client", - "filter": [ { "in": "_fw", "out": "wan", "service": "dns" } ] + "filter": [ { "in": "_fw", "out": "adp-wan", "service": "dns" } ] } diff --git a/optional/adp-http-client.json b/optional/adp-http-client.json index be73f92aa022b51a95b1c6325accf4e144396927..8d94b470c64eddb0cf4e71359bf8c6c2f55e88ba 100644 --- a/optional/adp-http-client.json +++ b/optional/adp-http-client.json @@ -1,4 +1,4 @@ { "description": "HTTP client", - "filter": [ { "in": "_fw", "out": "wan", "service": "http" } ] + "filter": [ { "in": "_fw", "out": "adp-wan", "service": "http" } ] } diff --git a/optional/adp-ntp-client.json b/optional/adp-ntp-client.json index b73bff1e89ce5336d560912ee70bd06a853db3d8..199714e97803107dcb4233ecd0a5f0475e87054a 100644 --- a/optional/adp-ntp-client.json +++ b/optional/adp-ntp-client.json @@ -1,4 +1,4 @@ { "description": "NTP client", - "filter": [ { "in": "_fw", "out": "wan", "service": "ntp" } ] + "filter": [ { "in": "_fw", "out": "adp-wan", "service": "ntp" } ] } diff --git a/optional/adp-ping.json b/optional/adp-ping.json index 5ba7ee846a7f24d591c4ed842f9f927a8d7d3a13..80b9ee757f6cc5374febfde925c2e14924fdb111 100644 --- a/optional/adp-ping.json +++ b/optional/adp-ping.json @@ -2,7 +2,7 @@ "description": "Allow ICMP echo request", "after": "adp-router", "filter": [ - { "in": "wan", "service": "ping", "flow-limit": 3 }, + { "in": "adp-wan", "service": "ping", "flow-limit": 3 }, { "service": "ping" } ] } diff --git a/optional/adp-router.json b/optional/adp-router.json index e5ad24800292fca045d1f77f2bdd4a19950407e9..64b8c4ca1755da257bfcd64077361f6660be9b93 100644 --- a/optional/adp-router.json +++ b/optional/adp-router.json @@ -1,15 +1,17 @@ { "description": "Router", "zone": { - "lan": { "iface": "$adp_lan_ifaces", "addr": "$adp_lan_addrs" } + "adp-lan": { + "iface": "$adp_lan_ifaces", "addr": "$adp_lan_addrs" + } }, "filter": [ { - "in": "wan", + "in": "adp-wan", "dest": "$adp_lan_private_addrs", "action": "drop" } ], - "policy": [ { "in": "lan", "out": "wan" } ], - "snat": [ { "out": "wan", "src": "$adp_lan_private_addrs" } ] + "policy": [ { "in": "adp-lan", "out": "adp-wan" } ], + "snat": [ { "out": "adp-wan", "src": "$adp_lan_private_addrs" } ] } diff --git a/optional/adp-ssh-server.json b/optional/adp-ssh-server.json index 4eb7b3a3117c13e5000a0228e55ebf4603d664f0..50a916bdbf3060e41efccfdd57b6bda8b7949344 100644 --- a/optional/adp-ssh-server.json +++ b/optional/adp-ssh-server.json @@ -2,7 +2,7 @@ "description": "SSH server", "filter": [ { - "in": "wan", + "in": "adp-wan", "out": "_fw", "service": "ssh", "conn-limit": { "count": 1, "interval": 10 }