unbound: Install trust anchor in /var/lib/unbound

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/unbound b/config/rootfiles/packages/unbound
index dad3b74db56b0ad0d7688a1435c395d76a81912e..f23ac80256a4baa3e8564916e7a8315015ff0a17 100644 (file)
--- a/config/rootfiles/packages/unbound
+++ b/config/rootfiles/packages/unbound
@@ -65,3 +65,5 @@ usr/sbin/unbound-zone
 #usr/share/man/man8/unbound-control-setup.8
 #usr/share/man/man8/unbound-control.8
 #usr/share/man/man8/unbound.8
+var/lib/unbound
+var/lib/unbound/root.key

diff --git a/config/unbound/root.key b/config/unbound/root.key
index fb540e3f9349c976a0f659a870d5bca65bd11912..0c36abea2abeb98979c3af16d5d196e92792237b 100644 (file)
--- a/config/unbound/root.key
+++ b/config/unbound/root.key
@@ -1,9 +1 @@
-; autotrust trust anchor file
-;;id: . 1
-;;last_queried: 1467576595 ;;Sun Jul  3 22:09:55 2016
-;;last_success: 1467576595 ;;Sun Jul  3 22:09:55 2016
-;;next_probe_time: 1467616562 ;;Mon Jul  4 09:16:02 2016
-;;query_failed: 0
-;;query_interval: 43200
-;;retry_time: 8640
-.      172800  IN      DNSKEY  257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0= ;{id = 19036 (ksk), size = 2048b} ;;state=2 [  VALID  ] ;;count=0 ;;lastchange=1467575383 ;;Sun Jul  3 21:49:43 2016
+.      172800  IN      DNSKEY  257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0= ;{id = 19036 (ksk), size = 2048b}

diff --git a/lfs/unbound b/lfs/unbound
index ac350b92a428856b2c3b2bad0a24c6cb3f687f15..35b5b7999488559e2c21d50a52496a8ef92ea131 100644 (file)
--- a/lfs/unbound
+++ b/lfs/unbound
@@ -74,7 +74,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                ./configure \
                        --prefix=/usr \
                        --sysconfdir=/etc \
-                       --with-pidfile=/var/run/unbound.pid
+                       --with-pidfile=/var/run/unbound.pid \
+                       --with-rootkey-file=/var/lib/unbound/root.key \
                        --disable-static \
                        --with-libevent
        cd $(DIR_APP) && make $(MAKETUNING)
@@ -84,6 +85,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        mv -v /etc/unbound/unbound.conf /etc/unbound/unbound_org.conf
        install -v -m 644 $(DIR_SRC)/config/unbound/*.conf /etc/unbound/
        install -v -m 644 $(DIR_SRC)/config/unbound/root.hints /etc/unbound/
-       install -v -m 644 $(DIR_SRC)/config/unbound/root.key /etc/unbound/
+
+       # Install key
+       -mkdir -pv /var/lib/unbound
+       install -v -m 644 $(DIR_SRC)/config/unbound/root.key \
+               /var/lib/unbound/root.key
+       chown -Rv nobody.nobody /var/lib/unbound
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)