From d9f6c0aa6bb662dd59850676e49190a4c4889e16 Mon Sep 17 00:00:00 2001 From: Christof Schulze Date: Wed, 25 Oct 2017 02:20:50 +0200 Subject: [PATCH] gluon-core: move rule client_dns from gluon-mesh_batman-adv to gluon-core --- package/gluon-core/luasrc/lib/gluon/upgrade/820-dns-config | 6 ++---- .../gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/820-dns-config b/package/gluon-core/luasrc/lib/gluon/upgrade/820-dns-config index 08c6e48e..19c7e627 100755 --- a/package/gluon-core/luasrc/lib/gluon/upgrade/820-dns-config +++ b/package/gluon-core/luasrc/lib/gluon/upgrade/820-dns-config @@ -14,17 +14,15 @@ uci:set('dhcp', dnsmasq, 'localservice', false) uci:set('dhcp', dnsmasq, 'server', dns.servers) uci:set('dhcp', dnsmasq, 'cachesize', dns.cacheentries) +uci:delete('firewall', 'rule', 'client_dns') if dns.servers then -- allow inbound traffic for dns from client zone - uci:section('firewall', 'rule', 'clientdns', { - name = 'clientdns', + uci:section('firewall', 'rule', 'client_dns', { src = 'local_client', dest_port = '53', proto = 'tcpudp', target = 'ACCEPT', }) -else - uci:delete('firewall', 'rule', 'clientdns') end if next_node.name and next_node.ip4 then diff --git a/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge b/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge index cc3df8d9..5ab08795 100755 --- a/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge +++ b/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge @@ -42,7 +42,6 @@ local networks = uci:get_list('firewall', 'drop', 'network') util.remove_from_set(networks, 'client') uci:set_list('firewall', 'drop', 'network', networks) -uci:delete('firewall', 'client_dns') uci:delete('firewall', 'local_node_dns') uci:save('firewall')