X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Funbound;h=9c8589367d2f8b8979ca4ed01c2bf1f04095d9c3;hp=35b5b7999488559e2c21d50a52496a8ef92ea131;hb=5fba8a0b1ebcb29340e225707193c0147c4cb64a;hpb=76f5c54236fdb2714fbb6d890a7b079d5aa4f9fc

diff --git a/lfs/unbound b/lfs/unbound
index 35b5b79994..9c8589367d 100644
--- a/lfs/unbound
+++ b/lfs/unbound
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -80,11 +80,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 			--with-libevent
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	# add ipfire config
-	mkdir -pv /etc/unbound/blocklists
-	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 configuration
+	install -v -m 644 $(DIR_SRC)/config/unbound/unbound.conf \
+		/etc/unbound/unbound.conf
+	touch /etc/unbound/{dhcp-leases,forward}.conf
+	-mkdir -pv /etc/unbound/local.d
+
+	# Install root hints
+	install -v -m 644 $(DIR_SRC)/config/unbound/root.hints \
+		/etc/unbound/root.hints
+
+	# Install DHCP leases bridge
+	install -v -m 755 $(DIR_SRC)/config/unbound/unbound-dhcp-leases-bridge \
+		/usr/sbin/unbound-dhcp-leases-bridge
 
 	# Install key
 	-mkdir -pv /var/lib/unbound
@@ -92,5 +101,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		/var/lib/unbound/root.key
 	chown -Rv nobody.nobody /var/lib/unbound
 
+	# Ship ICANN's certificates to validate DNS trust anchors
+	install -v -m 644 $(DIR_SRC)/config/unbound/icannbundle.pem \
+		/etc/unbound/icannbundle.pem
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)