diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2018-08-13 16:51:51 +0300 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2018-08-13 17:13:36 +0300 |
| commit | 3c6e171d7641f56364afc8358bb1bcf13d5f4eb7 (patch) | |
| tree | 375b1ee6d7d61512028f068c21d67d0b71b3d9f6 | |
| parent | 0cf11c060028215078dd85cb1f09597680f87dcf (diff) | |
| download | awall-3c6e171d7641f56364afc8358bb1bcf13d5f4eb7.tar.bz2 awall-3c6e171d7641f56364afc8358bb1bcf13d5f4eb7.tar.xz | |
adp: variable naming convention
| -rw-r--r-- | optional/adp-dhcp.json | 4 | ||||
| -rw-r--r-- | optional/adp-router.json | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/optional/adp-dhcp.json b/optional/adp-dhcp.json index 94548d1..7411c24 100644 --- a/optional/adp-dhcp.json +++ b/optional/adp-dhcp.json @@ -1,7 +1,7 @@ { "description": "Allow DHCP", "filter": [ - { "in": "$DHCP_ZONES", "out": "_fw", "service": "dhcp" }, - { "in": "_fw", "out": "$DHCP_ZONES", "service": "dhcp" } + { "in": "$adp_dhcp_zones", "out": "_fw", "service": "dhcp" }, + { "in": "_fw", "out": "$adp_dhcp_zones", "service": "dhcp" } ] } diff --git a/optional/adp-router.json b/optional/adp-router.json index 37404dd..e5ad248 100644 --- a/optional/adp-router.json +++ b/optional/adp-router.json @@ -1,9 +1,15 @@ { "description": "Router", - "zone": { "lan": { "iface": "$LAN_IFACES", "addr": "$LAN_ADDRS" } }, + "zone": { + "lan": { "iface": "$adp_lan_ifaces", "addr": "$adp_lan_addrs" } + }, "filter": [ - { "in": "wan", "dest": "$LAN_PRIVATE_ADDRS", "action": "drop" } + { + "in": "wan", + "dest": "$adp_lan_private_addrs", + "action": "drop" + } ], "policy": [ { "in": "lan", "out": "wan" } ], - "snat": [ { "out": "wan", "src": "$LAN_PRIVATE_ADDRS" } ] + "snat": [ { "out": "wan", "src": "$adp_lan_private_addrs" } ] } |