Commit a402f781 authored by Michal Hrusecky's avatar Michal Hrusecky 🦎

Merge branch 'unbound-control-fix' of gitlab.labs.nic.cz:turris/turris-os-packages into HEAD

parents 5f453860 b303ff96
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=resolver-conf
PKG_VERSION:=0.0.1
PKG_RELEASE:=11
PKG_RELEASE:=12
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
......
......@@ -12,10 +12,13 @@ get_kresd_dd() {
}
# convert resolver.kresd.dynamic_domain => resolver.common.dynamic_domain
# and set config for unbound-control
dd_val=$(uci get resolver.common.dynamic_domains)
if [ $? -eq 1 ] && [ ! -f /etc/resolver/dd_converted ]; then
echo uci set resolver.common.dynamic_domains=$(get_kresd_dd)
uci set resolver.common.dynamic_domains=$(get_kresd_dd)
uci set resolver.unbound_remote_control.control_enable='yes'
uci set resolver.unbound_remote_control.control_use_cert='no'
uci commit resolver
touch /etc/resolver/dd_converted
else
......
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=resolver-debug
PKG_VERSION:=0.0.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
......@@ -26,7 +26,6 @@ define Package/resolver-debug
CATEGORY:=Network
SUBMENU:=IP Addresses and Names
TITLE:=Resolver debug utils
DEPENDS:=+unbound-control
endef
define Package/$(PKG_NAME)/description
......
......@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=unbound
PKG_VERSION:=1.6.4
PKG_RELEASE:=4
PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.unbound.net/downloads
......@@ -65,15 +65,6 @@ define Package/unbound-anchor/description
This package contains the Unbound anchor utility.
endef
define Package/unbound-control
$(call Package/unbound/Default)
SECTION:=net
CATEGORY:=Network
SUBMENU:=IP Addresses and Names
TITLE+= (control utility)
DEPENDS+= +unbound
endef
define Package/unbound-control/description
This package contains the Unbound control utility.
endef
......@@ -140,6 +131,8 @@ define Package/unbound/install
$(PKG_INSTALL_DIR)/usr/sbin/unbound \
$(PKG_INSTALL_DIR)/usr/sbin/unbound-checkconf \
$(1)/usr/sbin/
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/unbound-control $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/unbound
$(INSTALL_CONF) ./files/named.cache $(1)/etc/unbound/
$(INSTALL_DIR) $(1)/etc/init.d
......@@ -202,7 +195,6 @@ endef
$(eval $(call BuildPackage,unbound))
$(eval $(call BuildPackage,unbound-anchor))
$(eval $(call BuildPackage,unbound-control))
$(eval $(call BuildPackage,unbound-control-setup))
$(eval $(call BuildPackage,unbound-host))
$(eval $(call BuildPackage,libunbound))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment