diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2019-10-27 21:04:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-27 21:04:49 +0200 |
| commit | 5e8a504705e19d9f7cf32e163f1ce98f71a41efa (patch) | |
| tree | 6648130529baf0d9e305f980ab76fff6c5d6e474 /net | |
| parent | facf36d41063660face92b3ab7cdcf00a80dcd63 (diff) | |
| parent | 2baab77b77c3db5cb8bb61e5697373e5b8e9ac58 (diff) | |
Merge pull request #10366 from wfleurant/ygg-init-uci
yggdrasil: uci firewall Section name and cover both IP versions
Diffstat (limited to 'net')
| -rw-r--r-- | net/yggdrasil/Makefile | 2 | ||||
| -rw-r--r-- | net/yggdrasil/files/yggdrasil.defaults | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/net/yggdrasil/Makefile b/net/yggdrasil/Makefile index 5234af1b6..6e268d310 100644 --- a/net/yggdrasil/Makefile +++ b/net/yggdrasil/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=yggdrasil PKG_VERSION:=0.3.11 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/yggdrasil-network/yggdrasil-go/tar.gz/v$(PKG_VERSION)? diff --git a/net/yggdrasil/files/yggdrasil.defaults b/net/yggdrasil/files/yggdrasil.defaults index 368750013..d5076cf6d 100644 --- a/net/yggdrasil/files/yggdrasil.defaults +++ b/net/yggdrasil/files/yggdrasil.defaults @@ -41,14 +41,13 @@ EOF # create the firewall zone uci -q batch <<-EOF >/dev/null - add firewall zone - set firewall.@zone[-1].name=yggdrasil - add_list firewall.@zone[-1].network=yggdrasil - set firewall.@zone[-1].input=REJECT - set firewall.@zone[-1].output=ACCEPT - set firewall.@zone[-1].forward=REJECT - set firewall.@zone[-1].conntrack=1 - set firewall.@zone[-1].family=ipv6 + set firewall.yggdrasil=zone + set firewall.yggdrasil.name=yggdrasil + add_list firewall.yggdrasil.network=yggdrasil + set firewall.yggdrasil.input=REJECT + set firewall.yggdrasil.output=ACCEPT + set firewall.yggdrasil.forward=REJECT + set firewall.yggdrasil.conntrack=1 EOF # allow ICMP from yggdrasil zone, e.g. ping6 |