diff --git a/cgroupfs-mount/Makefile b/cgroupfs-mount/Makefile
deleted file mode 100644
index cffb48f07..000000000
--- a/cgroupfs-mount/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=cgroupfs-mount
-PKG_RELEASE:=2
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/tianon/$(PKG_NAME)
-PKG_SOURCE_VERSION:=0549428171605eae3097a3e21bf7664845eac9e8
-PKG_SOURCE_DATE:=2020-06-26
-PKG_MIRROR_HASH:=skip
-
-PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/cgroupfs-mount/config
-	config CGROUPFS_MOUNT_KERNEL_CGROUPS
-		bool "Enable kernel cgroups support"
-		depends on PACKAGE_cgroupfs-mount
-		default y if ( DOCKER_KERNEL_OPTIONS || LXC_KERNEL_OPTIONS )
-		select KERNEL_CGROUPS
-endef
-
-define Package/cgroupfs-mount
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=cgroup mount scripts
-  DEPENDS:=+mount-utils
-  MENU:=1
-endef
-
-define Package/cgroupfs-mount/description
-Simple scripts to properly mount the cgroupfs hierarchy, especially structured for Debian packaging
-endef
-
-Build/Compile=# Nothing to compile, just install the scripts
-
-define Package/cgroupfs-mount/install
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/cgroupfs-mount $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/cgroupfs-umount $(1)/usr/bin/
-
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/cgroupfs-mount.init $(1)/etc/init.d/cgroupfs-mount
-endef
-
-$(eval $(call BuildPackage,cgroupfs-mount))
diff --git a/cgroupfs-mount/files/cgroupfs-mount.init b/cgroupfs-mount/files/cgroupfs-mount.init
deleted file mode 100755
index 0d6b68dc3..000000000
--- a/cgroupfs-mount/files/cgroupfs-mount.init
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=01
-
-boot() {
-	# Procd mounts non-hierarchical cgroupfs so unmount first before cgroupfs-mount
-	if mountpoint -q /sys/fs/cgroup; then
-		umount /sys/fs/cgroup/
-	fi
-
-	cgroupfs-mount
-}
diff --git a/coremark/Makefile b/coremark/Makefile
deleted file mode 100644
index 368d86958..000000000
--- a/coremark/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# Copyright (C) 2018 Lim Guo Wei
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=coremark
-PKG_SOURCE_DATE:=2020-12-17
-PKG_SOURCE_VERSION:=5e0f662ce709f1af8d272bd8d3960034603d3850
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/eembc/coremark/tar.gz/$(PKG_SOURCE_VERSION)?
-PKG_HASH:=skip
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION)
-
-PKG_MAINTAINER:=Lim Guo Wei <limguowei@gmail.com>
-PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILES:=LICENSE.md
-
-PKG_USE_MIPS16:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/coremark
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=CoreMark Embedded Microprocessor Benchmark
-  URL:=https://github.com/eembc/coremark
-endef
-
-define Package/coremark/description
-  Embedded Microprocessor Benchmark
-endef
-
-DIR_ARCH:=linux$(if $(CONFIG_ARCH_64BIT),64)
-
-define Package/coremark/config
-	config COREMARK_OPTIMIZE_O3
-		bool "Use all optimizations (-O3)"
-		depends on PACKAGE_coremark
-		default y
-		help
-			This enables additional optmizations using the -O3 compilation flag.
-
-	config COREMARK_ENABLE_MULTITHREADING
-		bool "Enable multithreading support"
-		depends on PACKAGE_coremark
-		default n
-		help
-			This enables multithreading support
-
-	config COREMARK_NUMBER_OF_THREADS
-		int "Number of threads"
-		depends on COREMARK_ENABLE_MULTITHREADING
-		default 2
-		help
-			Number of threads to run in parallel
-endef
-
-TARGET_CFLAGS += -flto
-
-ifeq ($(CONFIG_COREMARK_OPTIMIZE_O3),y)
-	TARGET_CFLAGS := $(filter-out -O%,$(TARGET_CFLAGS)) -O3
-endif
-
-ifeq ($(CONFIG_COREMARK_ENABLE_MULTITHREADING),y)
-	EXTRA_CFLAGS := -DMULTITHREAD=$(CONFIG_COREMARK_NUMBER_OF_THREADS) -DUSE_PTHREAD
-endif
-
-define Build/Compile
-	$(SED) 's|EXE = .exe|EXE =|' $(PKG_BUILD_DIR)/$(DIR_ARCH)/core_portme.mak
-	mkdir $(PKG_BUILD_DIR)/$(ARCH)
-	$(CP) -r $(PKG_BUILD_DIR)/$(DIR_ARCH)/* $(PKG_BUILD_DIR)/$(ARCH)
-	$(MAKE) -C $(PKG_BUILD_DIR) PORT_DIR=$(ARCH) $(MAKE_FLAGS) \
-		PORT_CFLAGS="$(TARGET_CFLAGS)" XCFLAGS="$(EXTRA_CFLAGS)" compile
-endef
-
-define Package/coremark/install
-	$(INSTALL_DIR) $(1)/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/coremark $(1)/bin/
-endef
-
-$(eval $(call BuildPackage,coremark))
diff --git a/ddns-scripts/Makefile b/ddns-scripts/Makefile
deleted file mode 100644
index c2044d9c8..000000000
--- a/ddns-scripts/Makefile
+++ /dev/null
@@ -1,438 +0,0 @@
-#
-# Copyright (C) 2008-2018 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ddns-scripts
-PKG_VERSION:=2.8.2
-PKG_RELEASE:=12
-
-PKG_LICENSE:=GPL-2.0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ddns-scripts/Default
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=IP Addresses and Names
-  PKGARCH:=all
-endef
-
-
-define Package/ddns-scripts
-  $(call Package/ddns-scripts/Default)
-  TITLE:=Dynamic DNS Client scripts (with IPv6 support)
-  DEPENDS:=+ddns-scripts-services
-endef
-
-define Package/ddns-scripts/description
-  Dynamic DNS Client scripts (with IPv6 support)
-  A highly configurable set of scripts for doing dynamic dns updates.
-  - IPv6 support
-  - DNS server support
-  - Glue Record support (require BIND host or KNOT host)
-  - DNS requests via TCP
-  - Proxy server support
-  - log file support
-  - support to run once
-  Version: $(PKG_VERSION)-$(PKG_RELEASE)
-  Info   : https://openwrt.org/docs/guide-user/services/ddns/client
-endef
-
-define Package/ddns-scripts/conffiles
-/etc/config/ddns
-endef
-
-
-define Package/ddns-scripts-services
-  $(call Package/ddns-scripts/Default)
-  TITLE:=Common ddns providers
-endef
-
-define Package/ddns-scripts-services/description
-  Dynamic DNS Client definitions for supported services
-endef
-
-
-define Package/ddns-scripts-cloudflare
-  $(call Package/ddns-scripts/Default)
-  TITLE:=Extension for cloudflare.com API v4
-  DEPENDS:=ddns-scripts +curl
-endef
-
-define Package/ddns-scripts-cloudflare/description
-  Dynamic DNS Client scripts extension for cloudflare.com API v4 (require curl)
-endef
-
-
-define Package/ddns-scripts-freedns
-  $(call Package/ddns-scripts/Default)
-  TITLE:=Extension for freedns.42.pl
-  DEPENDS:=ddns-scripts +curl
-endef
-
-define Package/ddns-scripts-freedns/description
-  Dynamic DNS Client scripts extension for "freedns.42.pl".
-endef
-
-
-define Package/ddns-scripts-godaddy
-  $(call Package/ddns-scripts/Default)
-  TITLE:=Extension for godaddy.com API v1
-  DEPENDS:=ddns-scripts +curl
-endef
-
-define Package/ddns-scripts-godaddy/description
-  Dynamic DNS Client scripts extension for "godaddy.com API v1".
-endef
-
-
-define Package/ddns-scripts-digitalocean
-  $(call Package/ddns-scripts/Default)
-  TITLE:=Extention for digitalocean.com API v2
-  DEPENDS:=ddns-scripts +curl
-endef
-
-define Package/ddns-scripts-digitalocean/description
-  Dynamic DNS Client scripts extension for "digitalocean.com API v2".
-  The script directly updates a DNS record using the DO API.
-  It requires:
-  "option dns_server" to be set to the server to be used by nsupdate.
-  "option domain" the dns domain to update the record for (eg. A-record: home.<example.com>)
-  "option username" the dns record name to update (eg. A-record: <home>.example.com)
-  "option param_opt" the id of the dns record to update (check using chrome inspector in the DO dns tab)
-  "option password" the api token generated in the DO panel
-endef
-
-
-define Package/ddns-scripts-noip
-  $(call Package/ddns-scripts/Default)
-  TITLE:=Extension for no-ip.com
-  DEPENDS:=ddns-scripts
-endef
-
-define Package/ddns-scripts-noip/description
-  Dynamic DNS Client scripts extension for "no-ip.com".
-endef
-
-
-define Package/ddns-scripts-nsupdate
-  $(call Package/ddns-scripts/Default)
-  TITLE:=Extension for using bind nsupdate.
-  DEPENDS:=ddns-scripts +bind-client
-endef
-
-define Package/ddns-scripts-nsupdate/description
-  Dynamic DNS Client scripts extension for direct updates using bind nsupdate
-  The script directly updates a PowerDNS (or maybe bind server) via nsupdate
-  from bind-client package.
-  It requires:
-  "option dns_server" to be set to the server to be used by nsupdate.
-  "option username" should be set to the key name and
-  "option password" to the base64 encoded shared secret.
-endef
-
-
-define Package/ddns-scripts-route53
-  $(call Package/ddns-scripts/Default)
-  TITLE:=Extension for route53 API v1
-  DEPENDS:=ddns-scripts +curl +openssl-util
-endef
-
-define Package/ddns-scripts-route53/description
-  Dynamic DNS Client scripts extension for Amazon AWS "route53 API v1".
-  Note: You must also install ca-certificate or ca-bundle.
-  It requires:
-  "option username" to be a valid AWS access key id
-  "option password" to be the matching AWS secret key id
-  "option domain" to contain the hosted zone ID
-endef
-
-
-define Package/ddns-scripts-cnkuai
-  $(call Package/ddns-scripts/Default)
-  TITLE:=CnKuai API
-  DEPENDS:=ddns-scripts +curl +giflib-utils
-endef
-
-define Package/ddns-scripts-cnkuai/description
-  Dynamic DNS Client scripts extension for "cnkuai.cn".
-  It requires:
-  "option username" to be a valid CnKuai control panel id
-  "option password" to be the matching CnKuai control panel password
-  "option domain" to contain the domain
-endef
-
-
-define Package/ddns-scripts-gandi
-  $(call Package/ddns-scripts/Default)
-  TITLE:=Gandi API
-  DEPENDS:=ddns-scripts +curl
-endef
-
-define Package/ddns-scripts-gandi/description
-  Dynamic DNS Client scripts extension for "gandi.net".
-  It requires:
-  "option username" to be a valid subdomain for gandi.net
-  "option password" to be a valid API key for ganid.net
-endef
-
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-
-define Package/ddns-scripts/install
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(INSTALL_DATA) ./files/etc/hotplug.d/iface/ddns \
-		$(1)/etc/hotplug.d/iface/95-ddns
-
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/etc/init.d/ddns \
-		$(1)/etc/init.d/ddns
-
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/etc/config/ddns \
-		$(1)/etc/config/ddns
-
-	$(INSTALL_DIR) $(1)/usr/share/ddns
-	echo "$(PKG_VERSION)-$(PKG_RELEASE)" > $(1)/usr/share/ddns/version
-
-	$(INSTALL_DIR) $(1)/usr/lib/ddns
-	$(INSTALL_DATA) ./files/usr/lib/ddns/dynamic_dns_functions.sh \
-		$(1)/usr/lib/ddns
-	$(INSTALL_BIN) ./files/usr/lib/ddns/dynamic_dns_lucihelper.sh \
-		$(1)/usr/lib/ddns
-	$(INSTALL_BIN) ./files/usr/lib/ddns/dynamic_dns_updater.sh \
-		$(1)/usr/lib/ddns
-
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) ./files/usr/bin/ddns.sh \
-		$(1)/usr/bin/ddns
-endef
-
-define Package/ddns-scripts/postinst
-#!/bin/sh
-if [ -z "$${IPKG_INSTROOT}" ]; then
-	/etc/init.d/ddns enabled
-	/etc/init.d/ddns start
-fi
-exit 0
-endef
-
-define Package/ddns-scripts/prerm
-#!/bin/sh
-if [ -n "$${IPKG_INSTROOT}" ]; then
-	/etc/init.d/ddns stop
-	/etc/init.d/ddns disable
-fi
-exit 0
-endef
-
-
-define Package/ddns-scripts-services/install
-	$(INSTALL_DIR) $(1)/usr/share/ddns/default
-	$(INSTALL_DATA) ./files/usr/share/ddns/default/* \
-		$(1)/usr/share/ddns/default
-
-	# Remove special services
-	rm $(1)/usr/share/ddns/default/cloudflare.com-v4.json
-	rm $(1)/usr/share/ddns/default/freedns.42.pl.json
-	rm $(1)/usr/share/ddns/default/godaddy.com-v1.json
-	rm $(1)/usr/share/ddns/default/digitalocean.com-v2.json
-	rm $(1)/usr/share/ddns/default/no-ip.com.json
-	rm $(1)/usr/share/ddns/default/bind-nsupdate.json
-	rm $(1)/usr/share/ddns/default/route53-v1.json
-	rm $(1)/usr/share/ddns/default/cnkuai.cn.json
-	rm $(1)/usr/share/ddns/default/gandi.net.json
-endef
-
-
-define Package/ddns-scripts-cloudflare/install
-	$(INSTALL_DIR) $(1)/usr/lib/ddns
-	$(INSTALL_BIN) ./files/usr/lib/ddns/update_cloudflare_com_v4.sh \
-		$(1)/usr/lib/ddns
-
-	$(INSTALL_DIR) $(1)/usr/share/ddns/default
-	$(INSTALL_DATA) ./files/usr/share/ddns/default/cloudflare.com-v4.json \
-		$(1)/usr/share/ddns/default/
-endef
-
-define Package/ddns-scripts-cloudflare/prerm
-#!/bin/sh
-if [ -z "$${IPKG_INSTROOT}" ]; then
-	/etc/init.d/ddns stop
-fi
-exit 0
-endef
-
-
-define Package/ddns-scripts-freedns/install
-	$(INSTALL_DIR) $(1)/usr/lib/ddns
-	$(INSTALL_BIN) ./files/usr/lib/ddns/update_freedns_42_pl.sh \
-		$(1)/usr/lib/ddns
-
-	$(INSTALL_DIR) $(1)/usr/share/ddns/default
-	$(INSTALL_DATA) ./files/usr/share/ddns/default/freedns.42.pl.json \
-		$(1)/usr/share/ddns/default
-endef
-
-define Package/ddns-scripts-freedns/prerm
-#!/bin/sh
-if [ -z "$${IPKG_INSTROOT}" ]; then
-	/etc/init.d/ddns stop
-fi
-exit 0
-endef
-
-
-define Package/ddns-scripts-godaddy/install
-	$(INSTALL_DIR) $(1)/usr/lib/ddns
-	$(INSTALL_BIN) ./files/usr/lib/ddns/update_godaddy_com_v1.sh \
-		$(1)/usr/lib/ddns
-
-	$(INSTALL_DIR) $(1)/usr/share/ddns/default
-	$(INSTALL_DATA) ./files/usr/share/ddns/default/godaddy.com-v1.json \
-		$(1)/usr/share/ddns/default
-endef
-
-define Package/ddns-scripts-godaddy/prerm
-#!/bin/sh
-if [ -z "$${IPKG_INSTROOT}" ]; then
-	/etc/init.d/ddns stop
-fi
-exit 0
-endef
-
-
-define Package/ddns-scripts-digitalocean/install
-	$(INSTALL_DIR) $(1)/usr/lib/ddns
-	$(INSTALL_BIN) ./files/usr/lib/ddns/update_digitalocean_com_v2.sh \
-		$(1)/usr/lib/ddns
-
-	$(INSTALL_DIR) $(1)/usr/share/ddns/default
-	$(INSTALL_DATA) ./files/usr/share/ddns/default/digitalocean.com-v2.json \
-		$(1)/usr/share/ddns/default
-endef
-
-define Package/ddns-scripts-digitalocean/prerm
-#!/bin/sh
-if [ -z "$${IPKG_INSTROOT}" ]; then
-	/etc/init.d/ddns stop
-fi
-exit 0
-endef
-
-
-define Package/ddns-scripts-noip/install
-	$(INSTALL_DIR) $(1)/usr/lib/ddns
-	$(INSTALL_BIN) ./files/usr/lib/ddns/update_no-ip_com.sh \
-		$(1)/usr/lib/ddns
-
-	$(INSTALL_DIR) $(1)/usr/share/ddns/default
-	$(INSTALL_DATA) ./files/usr/share/ddns/default/no-ip.com.json \
-		$(1)/usr/share/ddns/default
-endef
-
-define Package/ddns-scripts-noip/prerm
-#!/bin/sh
-if [ -z "$${IPKG_INSTROOT}" ]; then
-	/etc/init.d/ddns stop
-fi
-exit 0
-endef
-
-
-define Package/ddns-scripts-nsupdate/install
-	$(INSTALL_DIR) $(1)/usr/lib/ddns
-	$(INSTALL_BIN) ./files/usr/lib/ddns/update_nsupdate.sh \
-		$(1)/usr/lib/ddns
-
-	$(INSTALL_DIR) $(1)/usr/share/ddns/default
-	$(INSTALL_DATA) ./files/usr/share/ddns/default/bind-nsupdate.json \
-		$(1)/usr/share/ddns/default
-endef
-
-define Package/ddns-scripts-nsupdate/prerm
-#!/bin/sh
-if [ -z "$${IPKG_INSTROOT}" ]; then
-	/etc/init.d/ddns stop
-fi
-exit 0
-endef
-
-
-define Package/ddns-scripts-route53/install
-	$(INSTALL_DIR) $(1)/usr/lib/ddns
-	$(INSTALL_BIN) ./files/usr/lib/ddns/update_route53_v1.sh \
-		$(1)/usr/lib/ddns
-
-	$(INSTALL_DIR) $(1)/usr/share/ddns/default
-	$(INSTALL_DATA) ./files/usr/share/ddns/default/route53-v1.json \
-		$(1)/usr/share/ddns/default
-endef
-
-define Package/ddns-scripts-route53/prerm
-#!/bin/sh
-if [ -z "$${IPKG_INSTROOT}" ]; then
-	/etc/init.d/ddns stop
-fi
-exit 0
-endef
-
-
-define Package/ddns-scripts-cnkuai/install
-	$(INSTALL_DIR) $(1)/usr/lib/ddns
-	$(INSTALL_BIN) ./files/usr/lib/ddns/update_cnkuai_cn.sh \
-		$(1)/usr/lib/ddns
-
-	$(INSTALL_DIR) $(1)/usr/share/ddns/default
-	$(INSTALL_DATA) ./files/usr/share/ddns/default/cnkuai.cn.json \
-		$(1)/usr/share/ddns/default
-endef
-
-define Package/ddns-scripts-cnkuai/prerm
-#!/bin/sh
-if [ -z "$${IPKG_INSTROOT}" ]; then
-	/etc/init.d/ddns stop
-fi
-exit 0
-endef
-
-
-define Package/ddns-scripts-gandi/install
-	$(INSTALL_DIR) $(1)/usr/lib/ddns
-	$(INSTALL_BIN) ./files/usr/lib/ddns/update_gandi_net.sh \
-		$(1)/usr/lib/ddns
-
-	$(INSTALL_DIR) $(1)/usr/share/ddns/default
-	$(INSTALL_DATA) ./files/usr/share/ddns/default/gandi.net.json \
-		$(1)/usr/share/ddns/default
-endef
-
-define Package/ddns-scripts-gandi/prerm
-#!/bin/sh
-if [ -z "$${IPKG_INSTROOT}" ]; then
-	/etc/init.d/ddns stop
-fi
-exit 0
-endef
-
-
-$(eval $(call BuildPackage,ddns-scripts))
-$(eval $(call BuildPackage,ddns-scripts-services))
-$(eval $(call BuildPackage,ddns-scripts-cloudflare))
-$(eval $(call BuildPackage,ddns-scripts-freedns))
-$(eval $(call BuildPackage,ddns-scripts-godaddy))
-$(eval $(call BuildPackage,ddns-scripts-digitalocean))
-$(eval $(call BuildPackage,ddns-scripts-noip))
-$(eval $(call BuildPackage,ddns-scripts-nsupdate))
-$(eval $(call BuildPackage,ddns-scripts-route53))
-$(eval $(call BuildPackage,ddns-scripts-cnkuai))
-$(eval $(call BuildPackage,ddns-scripts-gandi))
diff --git a/ddns-scripts/files/etc/config/ddns b/ddns-scripts/files/etc/config/ddns
deleted file mode 100644
index b45855f0d..000000000
--- a/ddns-scripts/files/etc/config/ddns
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Please read https://openwrt.org/docs/guide-user/base-system/ddns
-#
-config ddns "global"
-	option ddns_dateformat "%F %R"
-#	option ddns_rundir "/var/run/ddns"
-#	option ddns_logdir "/var/log/ddns"
-	option ddns_loglines "250"
-	option upd_privateip "0"
-
-
-config service "myddns_ipv4"
-	option service_name	"dyndns.org"
-	option lookup_host	"yourhost.example.com"
-	option domain		"yourhost.example.com"
-	option username		"your_username"
-	option password		"your_password"
-	option interface	"wan"
-	option ip_source	"network"
-	option ip_network	"wan"
-
-config service "myddns_ipv6"
-	option update_url	"http://[USERNAME]:[PASSWORD]@your.provider.net/nic/update?hostname=[DOMAIN]&myip=[IP]"
-	option lookup_host	"yourhost.example.com"
-	option domain		"yourhost.example.com"
-	option username		"your_username"
-	option password		"your_password"
-	option use_ipv6		"1"
-	option interface	"wan6"
-	option ip_source	"network"
-	option ip_network	"wan6"
-
diff --git a/ddns-scripts/files/etc/hotplug.d/iface/ddns b/ddns-scripts/files/etc/hotplug.d/iface/ddns
deleted file mode 100644
index 9ef172deb..000000000
--- a/ddns-scripts/files/etc/hotplug.d/iface/ddns
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# there are other ACTIONs like ifupdate we don't need
-case "$ACTION" in
-	ifup)					# OpenWrt is giving a network not phys. Interface
-		/etc/init.d/ddns enabled && /usr/lib/ddns/dynamic_dns_updater.sh -n "$INTERFACE" -- start
-		;;
-	ifdown)
-		/usr/lib/ddns/dynamic_dns_updater.sh -n "$INTERFACE" -- stop
-		;;
-esac
diff --git a/ddns-scripts/files/etc/init.d/ddns b/ddns-scripts/files/etc/init.d/ddns
deleted file mode 100644
index 5da360178..000000000
--- a/ddns-scripts/files/etc/init.d/ddns
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh /etc/rc.common
-START=95
-STOP=10
-
-
-reload() {
-	/usr/lib/ddns/dynamic_dns_updater.sh -- reload
-	return 0
-}
-
-restart() {
-	/usr/lib/ddns/dynamic_dns_updater.sh -- stop
-	sleep 1	# give time to shutdown
-	/usr/lib/ddns/dynamic_dns_updater.sh -- start
-}
-
-start() {
-	/usr/lib/ddns/dynamic_dns_updater.sh -- start
-}
-
-stop() {
-	/usr/lib/ddns/dynamic_dns_updater.sh -- stop
-	return 0
-}
diff --git a/ddns-scripts/files/usr/bin/ddns.sh b/ddns-scripts/files/usr/bin/ddns.sh
deleted file mode 100644
index 921465f7e..000000000
--- a/ddns-scripts/files/usr/bin/ddns.sh
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2020 TDT AG <development@tdt.de>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See https://www.gnu.org/licenses/gpl-2.0.txt for more information.
-#
-
-. /lib/functions.sh
-
-DDNS_PACKAGE_DIR="/usr/share/ddns"
-URL="https://raw.githubusercontent.com/openwrt/packages/master/net/ddns-scripts/files"
-
-usage() {
-	local code="$1"
-	local msg="$2"
-
-	echo "$msg"
-	echo ""
-	echo "Usage: $(basename "$0") <command> <action> <service>"
-	echo ""
-	echo "Supported ddns <command>:"
-	echo "  service:  Command for custom ddns service providers"
-	echo ""
-	echo "Supported ddns 'service' command <action>:"
-	echo "  update:             Update local custom ddns service list"
-	echo "  list-available:     List all available custom service providers"
-	echo "  list-installed:     List all installed custom service providers"
-	echo "  install <service>:  Install custom service provider"
-	echo "  remove <service>:   Remove custom service provider"
-	echo "  purge:              Remove local custom ddns services"
-
-	exit "$code"
-}
-
-action_update() {
-	local cacert
-
-	config_load ddns
-	config_get url global 'url' "${URL}${DDNS_PACKAGE_DIR}"
-	config_get cacert global 'cacert' "IGNORE"
-	url="${url}/list"
-
-	mkdir -p "${DDNS_PACKAGE_DIR}"
-
-	if [ "$cacert" = "IGNORE" ]; then
-		uclient-fetch \
-			--no-check-certificate \
-			"$url" \
-			-O "${DDNS_PACKAGE_DIR}/list"
-	elif [ -f "$cacert" ]; then
-		uclient-fetch \
-			--ca-certificate="${cacert}" \
-			"$url" \
-			-O "${DDNS_PACKAGE_DIR}/list"
-	elif [ -n "$cacert" ]; then
-		echo "Certification file not found ($cacert)"
-		exit 5
-	fi
-}
-
-action_list_available() {
-	if [ -f "${DDNS_PACKAGE_DIR}/list" ]; then
-		cat "${DDNS_PACKAGE_DIR}/list"
-	else
-		echo "No custom service list file found. Please download first"
-		exit 3
-	fi
-}
-
-action_list_installed() {
-	if [ -d "${DDNS_PACKAGE_DIR}/custom" ]; then
-		ls "${DDNS_PACKAGE_DIR}/custom"
-	else
-		echo "No custom services installed"
-		exit 4
-	fi
-}
-
-action_install() {
-	local service="$1"
-
-	local url cacert
-
-	config_load ddns
-	config_get url global 'url' "${URL}${DDNS_PACKAGE_DIR}/default"
-	config_get cacert global 'cacert' "IGNORE"
-	url="${url}/${service}.json"
-
-	if [ -z "$service" ]; then
-		usage "4" "No custom service specified"
-	fi
-
-	mkdir -p "${DDNS_PACKAGE_DIR}/custom"
-
-	if [ "$cacert" = "IGNORE" ]; then
-		uclient-fetch \
-			--no-check-certificate \
-			"${url}" \
-			-O "${DDNS_PACKAGE_DIR}/custom/${service}.json"
-	elif [ -f "$cacert" ]; then
-		uclient-fetch \
-			--ca-certifcate="${cacert}" \
-			"${url}" \
-			-O "${DDNS_PACKAGE_DIR}/custom/${service}.json"
-	elif [ -n "$cacert" ]; then
-		echo "Certification file not found ($cacert)"
-		exit 5
-	fi
-}
-
-action_remove() {
-	local service="$1"
-	if [ -z "$service" ]; then
-		usage "4" "No custom service specified"
-	fi
-
-	rm "${DDNS_PACKAGE_DIR}/custom/${service}.json"
-}
-
-action_purge() {
-	rm -rf "${DDNS_PACKAGE_DIR}/custom"
-	rm -rf "${DDNS_PACKAGE_DIR}/list"
-}
-
-sub_service() {
-	local action="$1"
-	local service="$2"
-
-	case "$action" in
-		update)
-			action_update
-			;;
-		list-available)
-			action_list_available
-			;;
-		list-installed)
-			action_list_installed
-			;;
-		purge)
-			action_purge
-			;;
-		install)
-			action_install "$service"
-			;;
-		remove)
-			action_remove "$service"
-			;;
-		*)
-			usage "2" "Action not supported"
-			;;
-	esac
-}
-
-main() {
-	local cmd="$1"
-	local action="$2"
-	local service="$3"
-
-	[ "$#" -eq 0 ] && usage "1"
-
-	case "${cmd}" in
-		service)
-			sub_service "${action}" "${service}"
-			;;
-		*)
-			usage "1" "Command not supported"
-			;;
-	esac
-}
-
-main "$@"
diff --git a/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh b/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh
deleted file mode 100644
index f36d11ca7..000000000
--- a/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh
+++ /dev/null
@@ -1,1396 +0,0 @@
-#!/bin/sh
-# /usr/lib/ddns/dynamic_dns_functions.sh
-#
-#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
-# Original written by Eric Paul Bishop, January 2008
-# (Loosely) based on the script on the one posted by exobyte in the forums here:
-# http://forum.openwrt.org/viewtopic.php?id=14040
-# extended and partial rewritten
-#.2014-2018 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-#
-# function timeout
-# copied from http://www.ict.griffith.edu.au/anthony/software/timeout.sh
-# @author Anthony Thyssen  6 April 2011
-#
-# variables in small chars are read from /etc/config/ddns
-# variables in big chars are defined inside these scripts as global vars
-# variables in big chars beginning with "__" are local defined inside functions only
-# set -vx  	#script debugger
-
-. /lib/functions.sh
-. /lib/functions/network.sh
-
-# GLOBAL VARIABLES #
-if [ -f "/usr/share/ddns/version" ]; then
-	VERSION="$(cat "/usr/share/ddns/version")"
-else
-	VERSION="unknown"
-fi
-SECTION_ID=""		# hold config's section name
-VERBOSE=0		# default mode is log to console, but easily changed with parameter
-MYPROG=$(basename $0)	# my program call name
-
-LOGFILE=""		# logfile - all files are set in dynamic_dns_updater.sh
-PIDFILE=""		# pid file
-UPDFILE=""		# store UPTIME of last update
-DATFILE=""		# save stdout data of WGet and other external programs called
-ERRFILE=""		# save stderr output of WGet and other external programs called
-IPFILE=""		# store registered IP for read by LuCI status
-TLDFILE=/usr/share/public_suffix_list.dat.gz	# TLD file used by split_FQDN
-
-CHECK_SECONDS=0		# calculated seconds out of given
-FORCE_SECONDS=0		# interval and unit
-RETRY_SECONDS=0		# in configuration
-
-LAST_TIME=0		# holds the uptime of last successful update
-CURR_TIME=0		# holds the current uptime
-NEXT_TIME=0		# calculated time for next FORCED update
-EPOCH_TIME=0		# seconds since 1.1.1970 00:00:00
-
-REGISTERED_IP=""	# holds the IP read from DNS
-LOCAL_IP=""		# holds the local IP read from the box
-
-URL_USER=""		# url encoded $username from config file
-URL_PASS=""		# url encoded $password from config file
-URL_PENC=""		# url encoded $param_enc from config file
-
-UPD_ANSWER=""		# Answer given by service on success
-
-ERR_LAST=0		# used to save $? return code of program and function calls
-ERR_UPDATE=0		# error counter on different local and registered ip
-
-PID_SLEEP=0		# ProcessID of current background "sleep"
-
-# regular expression to detect IPv4 / IPv6
-# IPv4       0-9   1-3x "." 0-9  1-3x "." 0-9  1-3x "." 0-9  1-3x
-IPV4_REGEX="[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}"
-# IPv6       ( ( 0-9a-f  1-4char ":") min 1x) ( ( 0-9a-f  1-4char   )optional) ( (":" 0-9a-f 1-4char  ) min 1x)
-IPV6_REGEX="\(\([0-9A-Fa-f]\{1,4\}:\)\{1,\}\)\(\([0-9A-Fa-f]\{1,4\}\)\{0,1\}\)\(\(:[0-9A-Fa-f]\{1,4\}\)\{1,\}\)"
-
-# characters that are dangerous to pass to a shell command line
-SHELL_ESCAPE="[\"\'\`\$\!();><{}?|\[\]\*\\\\]"
-
-# dns character set. "-" must be the last character
-DNS_CHARSET="[@a-zA-Z0-9._-]"
-
-# domains can have * for wildcard. "-" must be the last character
-DNS_CHARSET_DOMAIN="[@a-zA-Z0-9._*-]"
-
-# detect if called by ddns-lucihelper.sh script, disable retrys (empty variable == false)
-LUCI_HELPER=$(printf %s "$MYPROG" | grep -i "luci")
-
-# Name Server Lookup Programs
-BIND_HOST=$(command -v host)
-KNOT_HOST=$(command -v khost)
-DRILL=$(command -v drill)
-HOSTIP=$(command -v hostip)
-NSLOOKUP=$(command -v nslookup)
-
-# Transfer Programs
-WGET=$(command -v wget)
-$WGET -V 2>/dev/null | grep -F -q +https && WGET_SSL=$WGET
-
-CURL=$(command -v curl)
-# CURL_SSL not empty then SSL support available
-CURL_SSL=$($CURL -V 2>/dev/null | grep -F "https")
-# CURL_PROXY not empty then Proxy support available
-CURL_PROXY=$(find /lib /usr/lib -name libcurl.so* -exec strings {} 2>/dev/null \; | grep -im1 "all_proxy")
-
-UCLIENT_FETCH=$(command -v uclient-fetch)
-
-# Global configuration settings
-# allow NON-public IP's
-upd_privateip=$(uci -q get ddns.global.upd_privateip) || upd_privateip=0
-
-# directory to store run information to.
-ddns_rundir=$(uci -q get ddns.global.ddns_rundir) || ddns_rundir="/var/run/ddns"
-[ -d $ddns_rundir ] || mkdir -p -m755 $ddns_rundir
-
-# directory to store log files
-ddns_logdir=$(uci -q get ddns.global.ddns_logdir) || ddns_logdir="/var/log/ddns"
-[ -d $ddns_logdir ] || mkdir -p -m755 $ddns_logdir
-
-# number of lines to before rotate logfile
-ddns_loglines=$(uci -q get ddns.global.ddns_loglines) || ddns_loglines=250
-ddns_loglines=$((ddns_loglines + 1))	# correct sed handling
-
-# format to show date information in log and luci-app-ddns default ISO 8601 format
-ddns_dateformat=$(uci -q get ddns.global.ddns_dateformat) || ddns_dateformat="%F %R"
-DATE_PROG="date +'$ddns_dateformat'"
-
-# USE_CURL if GNU Wget and cURL installed normally Wget is used by do_transfer()
-# to change this use global option use_curl '1'
-USE_CURL=$(uci -q get ddns.global.use_curl) || USE_CURL=0	# read config
-[ -n "$CURL" ] || USE_CURL=0					# check for cURL
-
-# loads all options for a given package and section
-# also, sets all_option_variables to a list of the variable names
-# $1 = ddns, $2 = SECTION_ID
-load_all_config_options()
-{
-	local __PKGNAME="$1"
-	local __SECTIONID="$2"
-	local __VAR
-	local __ALL_OPTION_VARIABLES=""
-
-	# this callback loads all the variables in the __SECTIONID section when we do
-	# config_load. We need to redefine the option_cb for different sections
-	# so that the active one isn't still active after we're done with it.  For reference
-	# the $1 variable is the name of the option and $2 is the name of the section
-	config_cb()
-	{
-		if [ ."$2" = ."$__SECTIONID" ]; then
-			option_cb()
-			{
-				__ALL_OPTION_VARIABLES="$__ALL_OPTION_VARIABLES $1"
-			}
-		else
-			option_cb() { return 0; }
-		fi
-	}
-
-	config_load "$__PKGNAME"
-
-	# Given SECTION_ID not found so no data, so return 1
-	[ -z "$__ALL_OPTION_VARIABLES" ] && return 1
-
-	for __VAR in $__ALL_OPTION_VARIABLES
-	do
-		config_get "$__VAR" "$__SECTIONID" "$__VAR"
-	done
-	return 0
-}
-
-# read's all service sections from ddns config
-# $1 = Name of variable to store
-load_all_service_sections() {
-	local __DATA=""
-	config_cb()
-	{
-		# only look for section type "service", ignore everything else
-		[ "$1" = "service" ] && __DATA="$__DATA $2"
-	}
-	config_load "ddns"
-
-	eval "$1=\"$__DATA\""
-	return
-}
-
-# starts updater script for all given sections or only for the one given
-# $1 = interface (Optional: when given only scripts are started
-# configured for that interface)
-# used by /etc/hotplug.d/iface/95-ddns on IFUP
-# and by /etc/init.d/ddns start
-start_daemon_for_all_ddns_sections()
-{
-	local __EVENTIF="$1"
-	local __SECTIONS=""
-	local __SECTIONID=""
-	local __IFACE=""
-
-	load_all_service_sections __SECTIONS
-	for __SECTIONID in $__SECTIONS; do
-		config_get __IFACE "$__SECTIONID" interface "wan"
-		[ -z "$__EVENTIF" -o "$__IFACE" = "$__EVENTIF" ] || continue
-		if [ $VERBOSE -eq 0 ]; then	# start in background
-			/usr/lib/ddns/dynamic_dns_updater.sh -v 0 -S "$__SECTIONID" -- start &
-		else
-			/usr/lib/ddns/dynamic_dns_updater.sh -v "$VERBOSE" -S "$__SECTIONID" -- start
-		fi
-	done
-}
-
-# stop sections process incl. childs (sleeps)
-# $1 = section
-stop_section_processes() {
-	local __PID=0
-	local __PIDFILE="$ddns_rundir/$1.pid"
-	[ $# -ne 1 ] && write_log 12 "Error calling 'stop_section_processes()' - wrong number of parameters"
-
-	[ -e "$__PIDFILE" ] && {
-		__PID=$(cat $__PIDFILE)
-		ps | grep "^[\t ]*$__PID" >/dev/null 2>&1 && kill $__PID || __PID=0	# terminate it
-	}
-	[ $__PID -eq 0 ] # report if process was running
-}
-
-# stop updater script for all defines sections or only for one given
-# $1 = interface (optional)
-# used by /etc/hotplug.d/iface/95-ddns on 'ifdown'
-# and by /etc/init.d/ddns stop
-# needed because we also need to kill "sleep" child processes
-stop_daemon_for_all_ddns_sections() {
-	local __EVENTIF="$1"
-	local __SECTIONS=""
-	local __SECTIONID=""
-	local __IFACE=""
-
-	load_all_service_sections __SECTIONS
-	for __SECTIONID in $__SECTIONS;	do
-		config_get __IFACE "$__SECTIONID" interface "wan"
-		[ -z "$__EVENTIF" -o "$__IFACE" = "$__EVENTIF" ] || continue
-		stop_section_processes "$__SECTIONID"
-	done
-}
-
-# reports to console, logfile, syslog
-# $1	loglevel 7 == Debug to 0 == EMERG
-#	value +10 will exit the scripts
-# $2..n	text to report
-write_log() {
-	local __LEVEL __EXIT __CMD __MSG __MSE
-	local __TIME=$(date +%H%M%S)
-	[ $1 -ge 10 ] && {
-		__LEVEL=$(($1-10))
-		__EXIT=1
-	} || {
-		__LEVEL=$1
-		__EXIT=0
-	}
-	shift	# remove loglevel
-	[ $__EXIT -eq 0 ] && __MSG="$*" || __MSG="$* - TERMINATE"
-	case $__LEVEL in		# create log message and command depending on loglevel
-		0)	__CMD="logger -p user.emerg -t ddns-scripts[$$] $SECTION_ID: $__MSG"
-			__MSG=" $__TIME EMERG : $__MSG" ;;
-		1)	__CMD="logger -p user.alert -t ddns-scripts[$$] $SECTION_ID: $__MSG"
-			__MSG=" $__TIME ALERT : $__MSG" ;;
-		2)	__CMD="logger -p user.crit -t ddns-scripts[$$] $SECTION_ID: $__MSG"
-			__MSG=" $__TIME  CRIT : $__MSG" ;;
-		3)	__CMD="logger -p user.err -t ddns-scripts[$$] $SECTION_ID: $__MSG"
-			__MSG=" $__TIME ERROR : $__MSG" ;;
-		4)	__CMD="logger -p user.warn -t ddns-scripts[$$] $SECTION_ID: $__MSG"
-			__MSG=" $__TIME  WARN : $__MSG" ;;
-		5)	__CMD="logger -p user.notice -t ddns-scripts[$$] $SECTION_ID: $__MSG"
-			__MSG=" $__TIME  note : $__MSG" ;;
-		6)	__CMD="logger -p user.info -t ddns-scripts[$$] $SECTION_ID: $__MSG"
-			__MSG=" $__TIME  info : $__MSG" ;;
-		7)	__MSG=" $__TIME       : $__MSG";;
-		*) 	return;;
-	esac
-
-	# verbose echo
-	[ $VERBOSE -gt 0 -o $__EXIT -gt 0 ] && echo -e "$__MSG"
-	# write to logfile
-	if [ ${use_logfile:-1} -eq 1 -o $VERBOSE -gt 1 ]; then
-		if [ -n "$password" ]; then
-			# url encode __MSG, password already done
-			urlencode __MSE "$__MSG"
-			# replace encoded password inside encoded message
-			# and url decode (newline was encoded as %00)
-			__MSG=$( echo -e "$__MSE" \
-				| sed -e "s/$URL_PASS/***PW***/g" \
-				| sed -e "s/+/ /g; s/%00/\n/g; s/%/\\\\x/g" | xargs -0 printf "%b" )
-		fi
-		printf "%s\n" "$__MSG" >> $LOGFILE
-		# VERBOSE > 1 then NO loop so NO truncate log to $ddns_loglines lines
-		[ $VERBOSE -gt 1 ] || sed -i -e :a -e '$q;N;'$ddns_loglines',$D;ba' $LOGFILE
-	fi
-	[ -n "$LUCI_HELPER" ] && return	# nothing else todo when running LuCI helper script
-	[ $__LEVEL -eq 7 ] && return	# no syslog for debug messages
-	__CMD=$(echo -e "$__CMD" | tr -d '\n' | tr '\t' '     ')        # remove \n \t chars
-	[ $__EXIT  -eq 1 ] && {
-		eval '$__CMD'	# force syslog before exit
-		exit 1
-	}
-	[ $use_syslog -eq 0 ] && return
-	[ $((use_syslog + __LEVEL)) -le 7 ] && eval '$__CMD'
-
-	return
-}
-
-# replace all special chars to their %hex value
-# used for USERNAME and PASSWORD in update_url
-# unchanged: "-"(minus) "_"(underscore) "."(dot) "~"(tilde)
-# to verify: "'"(single quote) '"'(double quote)	# because shell delimiter
-#            "$"(Dollar)				# because used as variable output
-# tested with the following string stored via Luci Application as password / username
-# A B!"#AA$1BB%&'()*+,-./:;<=>?@[\]^_`{|}~	without problems at Dollar or quotes
-urlencode() {
-	# $1	Name of Variable to store encoded string to
-	# $2	string to encode
-	local __ENC
-
-	[ $# -ne 2 ] && write_log 12 "Error calling 'urlencode()' - wrong number of parameters"
-
-	__ENC="$(awk -v str="$2" 'BEGIN{ORS="";for(i=32;i<=127;i++)lookup[sprintf("%c",i)]=i
-		for(k=1;k<=length(str);++k){enc=substr(str,k,1);if(enc!~"[-_.~a-zA-Z0-9]")enc=sprintf("%%%02x", lookup[enc]);print enc}}')"
-
-	eval "$1=\"$__ENC\""	# transfer back to variable
-	return 0
-}
-
-# extract url or script for given DDNS Provider from
-# $1	Name of the provider
-# $2	Provider directory
-# $3	Name of Variable to store url to
-# $4	Name of Variable to store script to
-# $5	Name of Variable to store service answer to
-get_service_data() {
-	local provider="$1"
-	shift
-	local dir="$1"
-	shift
-
-	. /usr/share/libubox/jshn.sh
-	local name data url answer script
-
-	[ $# -ne 3 ] && write_log 12 "Error calling 'get_service_data()' - wrong number of parameters"
-
-	[ -f "${dir}/${provider}.json" ] || {
-		eval "$1=\"\""
-		eval "$2=\"\""
-		eval "$3=\"\""
-		return 1
-	}
-
-	json_load_file "${dir}/${provider}.json"
-	json_get_var name "name"
-	if [ "$use_ipv6" -eq "1" ]; then
-		json_select "ipv6"
-	else
-		json_select "ipv4"
-	fi
-	json_get_var data "url"
-	json_get_var answer "answer"
-	json_select ".."
-	json_cleanup
-
-	# check if URL or SCRIPT is given
-	url=$(echo "$data" | grep "^http")
-	[ -z "$url" ] && script="/usr/lib/ddns/${data}"
-
-	eval "$1=\"$url\""
-	eval "$2=\"$script\""
-	eval "$3=\"$answer\""
-	return 0
-}
-
-# Calculate seconds from interval and unit
-# $1	Name of Variable to store result in
-# $2	Number and
-# $3	Unit of time interval
-get_seconds() {
-	[ $# -ne 3 ] && write_log 12 "Error calling 'get_seconds()' - wrong number of parameters"
-	case "$3" in
-		"days" )	eval "$1=$(( $2 * 86400 ))";;
-		"hours" )	eval "$1=$(( $2 * 3600 ))";;
-		"minutes" )	eval "$1=$(( $2 * 60 ))";;
-		* )		eval "$1=$2";;
-	esac
-	return 0
-}
-
-timeout() {
-	#.copied from http://www.ict.griffith.edu.au/anthony/software/timeout.sh
-	# only did the following changes
-	#	- commented out "#!/bin/bash" and usage section
-	#	- replace exit by return for usage as function
-	#	- some reformatting
-	#
-	# timeout [-SIG] time [--] command args...
-	#
-	# Run the given command until completion, but kill it if it runs too long.
-	# Specifically designed to exit immediately (no sleep interval) and clean up
-	# nicely without messages or leaving any extra processes when finished.
-	#
-	# Example use
-	#    timeout 5 countdown
-	#
-	# Based on notes in my "Shell Script Hints", section "Command Timeout"
-	#   http://www.ict.griffith.edu.au/~anthony/info/shell/script.hints
-	#
-	# This script uses a lot of tricks to terminate both the background command,
-	# the timeout script, and even the sleep process.  It also includes trap
-	# commands to prevent sub-shells reporting expected "Termination Errors".
-	#
-	# It took years of occasional trials, errors and testing to get a pure bash
-	# timeout command working as well as this does.
-	#
-	#.Anthony Thyssen     6 April 2011
-	#
-#	PROGNAME=$(type $0 | awk '{print $3}')	# search for executable on path
-#	PROGDIR=$(dirname $PROGNAME)		# extract directory of program
-#	PROGNAME=$(basename $PROGNAME)		# base name of program
-
-	# output the script comments as docs
-#	Usage() {
-#		echo >&2 "$PROGNAME:" "$@"
-#		sed >&2 -n '/^###/q; /^#/!q; s/^#//; s/^ //; 3s/^/Usage: /; 2,$ p' "$PROGDIR/$PROGNAME"
-#		exit 10;
-#	}
-
-	SIG=-TERM
-
-	while [ $# -gt 0 ]; do
-		case "$1" in
-			--)
-				# forced end of user options
-				shift;
-				break ;;
-#			-\?|--help|--doc*)
-#				Usage ;;
-			[0-9]*)
-				TIMEOUT="$1" ;;
-			-*)
-				SIG="$1" ;;
-			*)
-				# unforced  end of user options
-				break ;;
-		esac
-		shift	# next option
-	done
-
-	# run main command in backgrounds and get its pid
-	"$@" &
-	command_pid=$!
-
-	# timeout sub-process abort countdown after ABORT seconds! also backgrounded
-	sleep_pid=0
-	(
-		# cleanup sleep process
-		trap 'kill -TERM $sleep_pid; return 1' 1 2 3 15
-		# sleep timeout period in background
-		sleep $TIMEOUT &
-		sleep_pid=$!
-		wait $sleep_pid
-		# Abort the command
-		kill $SIG $command_pid >/dev/null 2>&1
-		return 1
-	) &
-	timeout_pid=$!
-
-	# Wait for main command to finished or be timed out
-	wait $command_pid
-	status=$?
-
-	# Clean up timeout sub-shell - if it is still running!
-	kill $timeout_pid 2>/dev/null
-	wait $timeout_pid 2>/dev/null
-
-	# Uncomment to check if a LONG sleep still running (no sleep should be)
-	# sleep 1
-	# echo "-----------"
-	# /bin/ps j  # uncomment to show if abort "sleep" is still sleeping
-
-	return $status
-}
-
-# sanitize a variable
-# $1	variable name
-# $2	allowed shell pattern
-# $3	disallowed shell pattern
-sanitize_variable() {
-	local __VAR=$1
-	eval __VALUE=\$$__VAR
-	local __ALLOWED=$2
-	local __REJECT=$3
-
-	# removing all allowed should give empty string
-	if [ -n "$__ALLOWED" ]; then
-		[ -z "${__VALUE//$__ALLOWED}" ] || write_log 12 "sanitize on $__VAR found characters outside allowed subset"
-	fi
-
-	# removing rejected pattern should give the same string as the input
-	if [ -n "$__REJECT" ]; then
-		[ "$__VALUE" = "${__VALUE//$__REJECT}" ] || write_log 12 "sanitize on $__VAR found rejected characters"
-	fi
-}
-
-# verify given host and port is connectable
-# $1	Host/IP to verify
-# $2	Port to verify
-verify_host_port() {
-	local __HOST=$1
-	local __PORT=$2
-	local __NC=$(command -v nc)
-	local __NCEXT=$($(command -v nc) --help 2>&1 | grep "\-w" 2>/dev/null)	# busybox nc compiled with extensions
-	local __IP __IPV4 __IPV6 __RUNPROG __PROG __ERR
-	# return codes
-	# 1	system specific error
-	# 2	nslookup/host error
-	# 3	nc (netcat) error
-	# 4	unmatched IP version
-
-	[ $# -ne 2 ] && write_log 12 "Error calling 'verify_host_port()' - wrong number of parameters"
-
-	# check if ip or FQDN was given
-	__IPV4=$(echo $__HOST | grep -m 1 -o "$IPV4_REGEX$")	# do not detect ip in 0.0.0.0.example.com
-	__IPV6=$(echo $__HOST | grep -m 1 -o "$IPV6_REGEX")
-	# if FQDN given get IP address
-	[ -z "$__IPV4" -a -z "$__IPV6" ] && {
-		if [ -n "$BIND_HOST" ]; then	# use BIND host if installed
-			__PROG="BIND host"
-			__RUNPROG="$BIND_HOST $__HOST >$DATFILE 2>$ERRFILE"
-		elif [ -n "$KNOT_HOST" ]; then	# use Knot host if installed
-			__PROG="Knot host"
-			__RUNPROG="$KNOT_HOST $__HOST >$DATFILE 2>$ERRFILE"
-		elif [ -n "$DRILL" ]; then	# use drill if installed
-			__PROG="drill"
-			__RUNPROG="$DRILL -V0 $__HOST A >$DATFILE 2>$ERRFILE"			# IPv4
-			__RUNPROG="$__RUNPROG; $DRILL -V0 $__HOST AAAA >>$DATFILE 2>>$ERRFILE"	# IPv6
-		elif [ -n "$HOSTIP" ]; then	# use hostip if installed
-			__PROG="hostip"
-			__RUNPROG="$HOSTIP $__HOST >$DATFILE 2>$ERRFILE"			# IPv4
-			__RUNPROG="$__RUNPROG; $HOSTIP -6 $__HOST >>$DATFILE 2>>$ERRFILE"	# IPv6
-		else	# use BusyBox nslookup
-			__PROG="BusyBox nslookup"
-			__RUNPROG="$NSLOOKUP $__HOST >$DATFILE 2>$ERRFILE"
-		fi
-		write_log 7 "#> $__RUNPROG"
-		eval $__RUNPROG
-		__ERR=$?
-		# command error
-		[ $__ERR -gt 0 ] && {
-			write_log 3 "DNS Resolver Error - $__PROG Error '$__ERR'"
-			write_log 7 "$(cat $ERRFILE)"
-			return 2
-		}
-		# extract IP address
-		if [ -n "$BIND_HOST" -o -n "$KNOT_HOST" ]; then	# use BIND host or Knot host if installed
-			__IPV4="$(awk -F "address " '/has address/ {print $2; exit}' "$DATFILE")"
-			__IPV6="$(awk -F "address " '/has IPv6/ {print $2; exit}' "$DATFILE")"
-		elif [ -n "$DRILL" ]; then	# use drill if installed
-			__IPV4="$(awk '/^'"$__HOST"'/ {print $5}' "$DATFILE" | grep -m 1 -o "$IPV4_REGEX")"
-			__IPV6="$(awk '/^'"$__HOST"'/ {print $5}' "$DATFILE" | grep -m 1 -o "$IPV6_REGEX")"
-		elif [ -n "$HOSTIP" ]; then	# use hostip if installed
-			__IPV4="$(grep -m 1 -o "$IPV4_REGEX" "$DATFILE")"
-			__IPV6="$(grep -m 1 -o "$IPV6_REGEX" "$DATFILE")"
-		else	# use BusyBox nslookup
-			__IPV4="$(sed -ne "/^Name:/,\$ { s/^Address[0-9 ]\{0,\}: \($IPV4_REGEX\).*$/\\1/p }" "$DATFILE")"
-			__IPV6="$(sed -ne "/^Name:/,\$ { s/^Address[0-9 ]\{0,\}: \($IPV6_REGEX\).*$/\\1/p }" "$DATFILE")"
-		fi
-	}
-
-	# check IP version if forced
-	if [ $force_ipversion -ne 0 ]; then
-		__ERR=0
-		[ $use_ipv6 -eq 0 -a -z "$__IPV4" ] && __ERR=4
-		[ $use_ipv6 -eq 1 -a -z "$__IPV6" ] && __ERR=6
-		[ $__ERR -gt 0 ] && {
-			[ -n "$LUCI_HELPER" ] && return 4
-			write_log 14 "Verify host Error '4' - Forced IP Version IPv$__ERR don't match"
-		}
-	fi
-
-	# verify nc command
-	# busybox nc compiled without -l option "NO OPT l!" -> critical error
-	$__NC --help 2>&1 | grep -i "NO OPT l!" >/dev/null 2>&1 && \
-		write_log 12 "Busybox nc (netcat) compiled without '-l' option, error 'NO OPT l!'"
-	# busybox nc compiled with extensions
-	$__NC --help 2>&1 | grep "\-w" >/dev/null 2>&1 && __NCEXT="TRUE"
-
-	# connectivity test
-	# run busybox nc to HOST PORT
-	# busybox might be compiled with "FEATURE_PREFER_IPV4_ADDRESS=n"
-	# then nc will try to connect via IPv6 if there is any IPv6 available on any host interface
-	# not worrying, if there is an IPv6 wan address
-	# so if not "force_ipversion" to use_ipv6 then connect test via ipv4, if available
-	[ $force_ipversion -ne 0 -a $use_ipv6 -ne 0 -o -z "$__IPV4" ] && __IP=$__IPV6 || __IP=$__IPV4
-
-	if [ -n "$__NCEXT" ]; then	# BusyBox nc compiled with extensions (timeout support)
-		__RUNPROG="$__NC -w 1 $__IP $__PORT </dev/null >$DATFILE 2>$ERRFILE"
-		write_log 7 "#> $__RUNPROG"
-		eval $__RUNPROG
-		__ERR=$?
-		[ $__ERR -eq 0 ] && return 0
-		write_log 3 "Connect error - BusyBox nc (netcat) Error '$__ERR'"
-		write_log 7 "$(cat $ERRFILE)"
-		return 3
-	else		# nc compiled without extensions (no timeout support)
-		__RUNPROG="timeout 2 -- $__NC $__IP $__PORT </dev/null >$DATFILE 2>$ERRFILE"
-		write_log 7 "#> $__RUNPROG"
-		eval $__RUNPROG
-		__ERR=$?
-		[ $__ERR -eq 0 ] && return 0
-		write_log 3 "Connect error - BusyBox nc (netcat) timeout Error '$__ERR'"
-		return 3
-	fi
-}
-
-# verify given DNS server if connectable
-# $1	DNS server to verify
-verify_dns() {
-	local __ERR=255	# last error buffer
-	local __CNT=0	# error counter
-
-	[ $# -ne 1 ] && write_log 12 "Error calling 'verify_dns()' - wrong number of parameters"
-	write_log 7 "Verify DNS server '$1'"
-
-	while [ $__ERR -ne 0 ]; do
-		# DNS uses port 53
-		verify_host_port "$1" "53"
-		__ERR=$?
-		if [ -n "$LUCI_HELPER" ]; then	# no retry if called by LuCI helper script
-			return $__ERR
-		elif [ $__ERR -ne 0 -a $VERBOSE -gt 1 ]; then	# VERBOSE > 1 then NO retry
-			write_log 4 "Verify DNS server '$1' failed - Verbose Mode: $VERBOSE - NO retry on error"
-			return $__ERR
-		elif [ $__ERR -ne 0 ]; then
-			__CNT=$(( $__CNT + 1 ))	# increment error counter
-			# if error count > retry_count leave here
-			[ $retry_count -gt 0 -a $__CNT -gt $retry_count ] && \
-				write_log 14 "Verify DNS server '$1' failed after $retry_count retries"
-
-			write_log 4 "Verify DNS server '$1' failed - retry $__CNT/$retry_count in $RETRY_SECONDS seconds"
-			sleep $RETRY_SECONDS &
-			PID_SLEEP=$!
-			wait $PID_SLEEP	# enable trap-handler
-			PID_SLEEP=0
-		fi
-	done
-	return 0
-}
-
-# analyze and verify given proxy string
-# $1	Proxy-String to verify
-verify_proxy() {
-	#	complete entry		user:password@host:port
-	# 				inside user and password NO '@' of ":" allowed
-	#	host and port only	host:port
-	#	host only		host		ERROR unsupported
-	#	IPv4 address instead of host	123.234.234.123
-	#	IPv6 address instead of host	[xxxx:....:xxxx]	in square bracket
-	local __TMP __HOST __PORT
-	local __ERR=255	# last error buffer
-	local __CNT=0	# error counter
-
-	[ $# -ne 1 ] && write_log 12 "Error calling 'verify_proxy()' - wrong number of parameters"
-	write_log 7 "Verify Proxy server 'http://$1'"
-
-	# try to split user:password "@" host:port
-	__TMP=$(echo $1 | awk -F "@" '{print $2}')
-	# no "@" found - only host:port is given
-	[ -z "$__TMP" ] && __TMP="$1"
-	# now lets check for IPv6 address
-	__HOST=$(echo $__TMP | grep -m 1 -o "$IPV6_REGEX")
-	# IPv6 host address found read port
-	if [ -n "$__HOST" ]; then
-		# IPv6 split at "]:"
-		__PORT=$(echo $__TMP | awk -F "]:" '{print $2}')
-	else
-		__HOST=$(echo $__TMP | awk -F ":" '{print $1}')
-		__PORT=$(echo $__TMP | awk -F ":" '{print $2}')
-	fi
-	# No Port detected - EXITING
-	[ -z "$__PORT" ] && {
-		[ -n "$LUCI_HELPER" ] && return 5
-		write_log 14 "Invalid Proxy server Error '5' - proxy port missing"
-	}
-
-	while [ $__ERR -gt 0 ]; do
-		verify_host_port "$__HOST" "$__PORT"
-		__ERR=$?
-		if [ -n "$LUCI_HELPER" ]; then	# no retry if called by LuCI helper script
-			return $__ERR
-		elif [ $__ERR -gt 0 -a $VERBOSE -gt 1 ]; then	# VERBOSE > 1 then NO retry
-			write_log 4 "Verify Proxy server '$1' failed - Verbose Mode: $VERBOSE - NO retry on error"
-			return $__ERR
-		elif [ $__ERR -gt 0 ]; then
-			__CNT=$(( $__CNT + 1 ))	# increment error counter
-			# if error count > retry_count leave here
-			[ $retry_count -gt 0 -a $__CNT -gt $retry_count ] && \
-				write_log 14 "Verify Proxy server '$1' failed after $retry_count retries"
-
-			write_log 4 "Verify Proxy server '$1' failed - retry $__CNT/$retry_count in $RETRY_SECONDS seconds"
-			sleep $RETRY_SECONDS &
-			PID_SLEEP=$!
-			wait $PID_SLEEP	# enable trap-handler
-			PID_SLEEP=0
-		fi
-	done
-	return 0
-}
-
-do_transfer() {
-	# $1	# URL to use
-	local __URL="$1"
-	local __ERR=0
-	local __CNT=0	# error counter
-	local __PROG  __RUNPROG
-
-	[ $# -ne 1 ] && write_log 12 "Error in 'do_transfer()' - wrong number of parameters"
-
-	# Use ip_network as default for bind_network if not separately specified
-	[ -z "$bind_network" ] && [ "$ip_source" = "network" ] && [ "$ip_network" ] && bind_network="$ip_network"
-
-	# lets prefer GNU Wget because it does all for us - IPv4/IPv6/HTTPS/PROXY/force IP version
-	if [ -n "$WGET_SSL" ] && [ $USE_CURL -eq 0 ]; then 			# except global option use_curl is set to "1"
-		__PROG="$WGET --hsts-file=/tmp/.wget-hsts -nv -t 1 -O $DATFILE -o $ERRFILE"	# non_verbose no_retry outfile errfile
-		# force network/ip to use for communication
-		if [ -n "$bind_network" ]; then
-			local __BINDIP
-			# set correct program to detect IP
-			[ $use_ipv6 -eq 0 ] && __RUNPROG="network_get_ipaddr" || __RUNPROG="network_get_ipaddr6"
-			eval "$__RUNPROG __BINDIP $bind_network" || \
-				write_log 13 "Can not detect local IP using '$__RUNPROG $bind_network' - Error: '$?'"
-			write_log 7 "Force communication via IP '$__BINDIP'"
-			__PROG="$__PROG --bind-address=$__BINDIP"
-		fi
-		# force ip version to use
-		if [ $force_ipversion -eq 1 ]; then
-			[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -4" || __PROG="$__PROG -6"	# force IPv4/IPv6
-		fi
-		# set certificate parameters
-		if [ $use_https -eq 1 ]; then
-			if [ "$cacert" = "IGNORE" ]; then	# idea from Ticket #15327 to ignore server cert
-				__PROG="$__PROG --no-check-certificate"
-			elif [ -f "$cacert" ]; then
-				__PROG="$__PROG --ca-certificate=${cacert}"
-			elif [ -d "$cacert" ]; then
-				__PROG="$__PROG --ca-directory=${cacert}"
-			elif [ -n "$cacert" ]; then		# it's not a file and not a directory but given
-				write_log 14 "No valid certificate(s) found at '$cacert' for HTTPS communication"
-			fi
-		fi
-		# disable proxy if no set (there might be .wgetrc or .curlrc or wrong environment set)
-		[ -z "$proxy" ] && __PROG="$__PROG --no-proxy"
-
-		__RUNPROG="$__PROG '$__URL'"	# build final command
-		__PROG="GNU Wget"		# reuse for error logging
-
-	# 2nd choice is cURL IPv4/IPv6/HTTPS
-	# libcurl might be compiled without Proxy or HTTPS Support
-	elif [ -n "$CURL" ]; then
-		__PROG="$CURL -RsS -o $DATFILE --stderr $ERRFILE"
-		# check HTTPS support
-		[ -z "$CURL_SSL" -a $use_https -eq 1 ] && \
-			write_log 13 "cURL: libcurl compiled without https support"
-		# force network/interface-device to use for communication
-		if [ -n "$bind_network" ]; then
-			local __DEVICE
-			network_get_device __DEVICE $bind_network || \
-				write_log 13 "Can not detect local device using 'network_get_device $bind_network' - Error: '$?'"
-			write_log 7 "Force communication via device '$__DEVICE'"
-			__PROG="$__PROG --interface $__DEVICE"
-		fi
-		# force ip version to use
-		if [ $force_ipversion -eq 1 ]; then
-			[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -4" || __PROG="$__PROG -6"	# force IPv4/IPv6
-		fi
-		# set certificate parameters
-		if [ $use_https -eq 1 ]; then
-			if [ "$cacert" = "IGNORE" ]; then	# idea from Ticket #15327 to ignore server cert
-				__PROG="$__PROG --insecure"	# but not empty better to use "IGNORE"
-			elif [ -f "$cacert" ]; then
-				__PROG="$__PROG --cacert $cacert"
-			elif [ -d "$cacert" ]; then
-				__PROG="$__PROG --capath $cacert"
-			elif [ -n "$cacert" ]; then		# it's not a file and not a directory but given
-				write_log 14 "No valid certificate(s) found at '$cacert' for HTTPS communication"
-			fi
-		fi
-		# disable proxy if no set (there might be .wgetrc or .curlrc or wrong environment set)
-		# or check if libcurl compiled with proxy support
-		if [ -z "$proxy" ]; then
-			__PROG="$__PROG --noproxy '*'"
-		elif [ -z "$CURL_PROXY" ]; then
-			# if libcurl has no proxy support and proxy should be used then force ERROR
-			write_log 13 "cURL: libcurl compiled without Proxy support"
-		fi
-
-		__RUNPROG="$__PROG '$__URL'"	# build final command
-		__PROG="cURL"			# reuse for error logging
-
-	# uclient-fetch possibly with ssl support if /lib/libustream-ssl.so installed
-	elif [ -n "$UCLIENT_FETCH" ]; then
-		# UCLIENT_FETCH_SSL not empty then SSL support available
-		UCLIENT_FETCH_SSL=$(find /lib /usr/lib -name libustream-ssl.so* 2>/dev/null)
-		__PROG="$UCLIENT_FETCH -q -O $DATFILE"
-		# force network/ip not supported
-		[ -n "$__BINDIP" ] && \
-			write_log 14 "uclient-fetch: FORCE binding to specific address not supported"
-		# force ip version to use
-		if [ $force_ipversion -eq 1 ]; then
-			[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -4" || __PROG="$__PROG -6"       # force IPv4/IPv6
-		fi
-		# https possibly not supported
-		[ $use_https -eq 1 -a -z "$UCLIENT_FETCH_SSL" ] && \
-			write_log 14 "uclient-fetch: no HTTPS support! Additional install one of ustream-ssl packages"
-		# proxy support
-		[ -z "$proxy" ] && __PROG="$__PROG -Y off" || __PROG="$__PROG -Y on"
-		# https & certificates
-		if [ $use_https -eq 1 ]; then
-			if [ "$cacert" = "IGNORE" ]; then
-				__PROG="$__PROG --no-check-certificate"
-			elif [ -f "$cacert" ]; then
-				__PROG="$__PROG --ca-certificate=$cacert"
-			elif [ -n "$cacert" ]; then		# it's not a file; nothing else supported
-				write_log 14 "No valid certificate file '$cacert' for HTTPS communication"
-			fi
-		fi
-		__RUNPROG="$__PROG '$__URL' 2>$ERRFILE"		# build final command
-		__PROG="uclient-fetch"				# reuse for error logging
-
-	# Busybox Wget or any other wget in search $PATH (did not support neither IPv6 nor HTTPS)
-	elif [ -n "$WGET" ]; then
-		__PROG="$WGET -q -O $DATFILE"
-		# force network/ip not supported
-		[ -n "$__BINDIP" ] && \
-			write_log 14 "BusyBox Wget: FORCE binding to specific address not supported"
-		# force ip version not supported
-		[ $force_ipversion -eq 1 ] && \
-			write_log 14 "BusyBox Wget: Force connecting to IPv4 or IPv6 addresses not supported"
-		# https not supported
-		[ $use_https -eq 1 ] && \
-			write_log 14 "BusyBox Wget: no HTTPS support"
-		# disable proxy if no set (there might be .wgetrc or .curlrc or wrong environment set)
-		[ -z "$proxy" ] && __PROG="$__PROG -Y off"
-
-		__RUNPROG="$__PROG '$__URL' 2>$ERRFILE"		# build final command
-		__PROG="Busybox Wget"				# reuse for error logging
-
-	else
-		write_log 13 "Neither 'Wget' nor 'cURL' nor 'uclient-fetch' installed or executable"
-	fi
-
-	while : ; do
-		write_log 7 "#> $__RUNPROG"
-		eval $__RUNPROG			# DO transfer
-		__ERR=$?			# save error code
-		[ $__ERR -eq 0 ] && return 0	# no error leave
-		[ -n "$LUCI_HELPER" ] && return 1	# no retry if called by LuCI helper script
-
-		write_log 3 "$__PROG Error: '$__ERR'"
-		write_log 7 "$(cat $ERRFILE)"		# report error
-
-		[ $VERBOSE -gt 1 ] && {
-			# VERBOSE > 1 then NO retry
-			write_log 4 "Transfer failed - Verbose Mode: $VERBOSE - NO retry on error"
-			return 1
-		}
-
-		__CNT=$(( $__CNT + 1 ))	# increment error counter
-		# if error count > retry_count leave here
-		[ $retry_count -gt 0 -a $__CNT -gt $retry_count ] && \
-			write_log 14 "Transfer failed after $retry_count retries"
-
-		write_log 4 "Transfer failed - retry $__CNT/$retry_count in $RETRY_SECONDS seconds"
-		sleep $RETRY_SECONDS &
-		PID_SLEEP=$!
-		wait $PID_SLEEP	# enable trap-handler
-		PID_SLEEP=0
-	done
-	# we should never come here there must be a programming error
-	write_log 12 "Error in 'do_transfer()' - program coding error"
-}
-
-send_update() {
-	# $1	# IP to set at DDNS service provider
-	local __IP
-
-	[ $# -ne 1 ] && write_log 12 "Error calling 'send_update()' - wrong number of parameters"
-
-	if [ $upd_privateip -eq 0 ]; then
-		# verify given IP / no private IPv4's / no IPv6 addr starting with fxxx of with ":"
-		[ $use_ipv6 -eq 0 ] && __IP=$(echo $1 | grep -v -E "(^0|^10\.|^100\.6[4-9]\.|^100\.[7-9][0-9]\.|^100\.1[0-1][0-9]\.|^100\.12[0-7]\.|^127|^169\.254|^172\.1[6-9]\.|^172\.2[0-9]\.|^172\.3[0-1]\.|^192\.168)")
-		[ $use_ipv6 -eq 1 ] && __IP=$(echo $1 | grep "^[0-9a-eA-E]")
-	else
-		__IP=$(echo $1 | grep -m 1 -o "$IPV4_REGEX")		# valid IPv4 or
-		[ -z "$__IP" ] && __IP=$(echo $1 | grep -m 1 -o "$IPV6_REGEX")	# IPv6
-	fi
-	[ -z "$__IP" ] && {
-		write_log 3 "No or private or invalid IP '$1' given! Please check your configuration"
-		return 127
-	}
-
-	if [ -n "$update_script" ]; then
-		write_log 7 "parsing script '$update_script'"
-		. $update_script
-	else
-		local __URL __ERR
-
-		# do replaces in URL
-		__URL=$(echo $update_url | sed -e "s#\[USERNAME\]#$URL_USER#g"	-e "s#\[PASSWORD\]#$URL_PASS#g" \
-					       -e "s#\[PARAMENC\]#$URL_PENC#g"	-e "s#\[PARAMOPT\]#$param_opt#g" \
-					       -e "s#\[DOMAIN\]#$domain#g"	-e "s#\[IP\]#$__IP#g")
-		[ $use_https -ne 0 ] && __URL=$(echo $__URL | sed -e 's#^http:#https:#')
-
-		do_transfer "$__URL" || return 1
-
-		write_log 7 "DDNS Provider answered:${N}$(cat $DATFILE)"
-
-		[ -z "$UPD_ANSWER" ] && return 0	# not set then ignore
-
-		grep -i -E "$UPD_ANSWER" $DATFILE >/dev/null 2>&1
-		return $?	# "0" if found
-	fi
-}
-
-get_local_ip () {
-	# $1	Name of Variable to store local IP (LOCAL_IP)
-	local __CNT=0	# error counter
-	local __RUNPROG __DATA __URL __ERR
-
-	[ $# -ne 1 ] && write_log 12 "Error calling 'get_local_ip()' - wrong number of parameters"
-	write_log 7 "Detect local IP on '$ip_source'"
-
-	while : ; do
-		if [ -n "$ip_network" -a "$ip_source" = "network" ]; then
-			# set correct program
-			network_flush_cache	# force re-read data from ubus
-			[ $use_ipv6 -eq 0 ] && __RUNPROG="network_get_ipaddr" \
-					    || __RUNPROG="network_get_ipaddr6"
-			eval "$__RUNPROG __DATA $ip_network" || \
-				write_log 13 "Can not detect local IP using $__RUNPROG '$ip_network' - Error: '$?'"
-			[ -n "$__DATA" ] && write_log 7 "Local IP '$__DATA' detected on network '$ip_network'"
-		elif [ -n "$ip_interface" -a "$ip_source" = "interface" ]; then
-			local __DATA4=""; local __DATA6=""
-			if [ -n "$(command -v ip)" ]; then		# ip program installed
-				write_log 7 "#> ip -o addr show dev $ip_interface scope global >$DATFILE 2>$ERRFILE"
-				ip -o addr show dev $ip_interface scope global >$DATFILE 2>$ERRFILE
-				__ERR=$?
-				if [ $__ERR -eq 0 ]; then
-					# DATFILE (sample)
-					# 10: l2tp-inet: <POINTOPOINT,MULTICAST,NOARP,UP,LOWER_UP> mtu 1456 qdisc fq_codel state UNKNOWN qlen 3\    link/ppp
-					# 10: l2tp-inet    inet 95.30.176.51 peer 95.30.176.1/32 scope global l2tp-inet\       valid_lft forever preferred_lft forever
-					# 5: eth1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc fq_codel state UP qlen 1000\    link/ether 08:00:27:d0:10:32 brd ff:ff:ff:ff:ff:ff
-					# 5: eth1    inet 172.27.10.128/24 brd 172.27.10.255 scope global eth1\       valid_lft forever preferred_lft forever
-					# 5: eth1    inet 172.55.55.155/24 brd 172.27.10.255 scope global eth1\       valid_lft 12345sec preferred_lft 12345sec
-					# 5: eth1    inet6 2002:b0c7:f326::806b:c629:b8b9:433/128 scope global dynamic \       valid_lft 8026sec preferred_lft 8026sec
-					# 5: eth1    inet6 fd43:5368:6f6d:6500:806b:c629:b8b9:433/128 scope global dynamic \       valid_lft 8026sec preferred_lft 8026sec
-					# 5: eth1    inet6 fd43:5368:6f6d:6500:a00:27ff:fed0:1032/64 scope global dynamic \       valid_lft 14352sec preferred_lft 14352sec
-					# 5: eth1    inet6 2002:b0c7:f326::a00:27ff:fed0:1032/64 scope global dynamic \       valid_lft 14352sec preferred_lft 14352sec
-
-					#    remove      remove     remove      replace     replace
-					#     link     inet6 fxxx    sec      forever=>-1   / => ' ' to separate subnet from ip
-					sed "/link/d; /inet6 f/d; s/sec//g; s/forever/-1/g; s/\// /g" $DATFILE | \
-						awk '{ print $3" "$4" "$NF }' > $ERRFILE	# temp reuse ERRFILE
-					# we only need    inet?   IP  prefered time
-
-					local __TIME4=0;  local __TIME6=0
-					local __TYP __ADR __TIME
-					while read __TYP __ADR __TIME; do
-						__TIME=${__TIME:-0}	# supress shell errors on last (empty) line of DATFILE
-						#    IPversion       no "-1" record stored - now "-1" record or new time > oldtime
-						[ "$__TYP" = "inet6" -a $__TIME6 -ge 0 -a \( $__TIME -lt 0 -o $__TIME -gt $__TIME6 \) ] && {
-							__DATA6="$__ADR"
-							__TIME6="$__TIME"
-						}
-						[ "$__TYP" = "inet" -a $__TIME4 -ge 0 -a \( $__TIME -lt 0 -o $__TIME -gt $__TIME4 \) ] && {
-							__DATA4="$__ADR"
-							__TIME4="$__TIME"
-						}
-					done < $ERRFILE
-				else
-					write_log 3 "ip Error: '$__ERR'"
-					write_log 7 "$(cat $ERRFILE)"		# report error
-				fi
-			else					# use deprecated ifconfig
-				write_log 7 "#> ifconfig $ip_interface >$DATFILE 2>$ERRFILE"
-				ifconfig $ip_interface >$DATFILE 2>$ERRFILE
-				__ERR=$?
-				if [ $__ERR -eq 0 ]; then
-					__DATA4=$(awk '
-						/inet addr:/ {	# Filter IPv4
-						#   inet addr:192.168.1.1  Bcast:192.168.1.255  Mask:255.255.255.0
-						$1="";		# remove inet
-						$3="";		# remove Bcast: ...
-						$4="";		# remove Mask: ...
-						FS=":";		# separator ":"
-						$0=$0;		# reread to activate separator
-						$1="";		# remove addr
-						FS=" ";		# set back separator to default " "
-						$0=$0;		# reread to activate separator (remove whitespaces)
-						print $1;	# print IPv4 addr
-						}' $DATFILE
-					)
-					__DATA6=$(awk '
-						/inet6/ && /: [0-9a-eA-E]/ {	# Filter IPv6 exclude fxxx
-						#   inet6 addr: 2001:db8::xxxx:xxxx/32 Scope:Global
-						FS="/";		# separator "/"
-						$0=$0;		# reread to activate separator
-						$2="";		# remove everything behind "/"
-						FS=" ";		# set back separator to default " "
-						$0=$0;		# reread to activate separator
-						print $3;	# print IPv6 addr
-						}' $DATFILE
-					)
-				else
-					write_log 3 "ifconfig Error: '$__ERR'"
-					write_log 7 "$(cat $ERRFILE)"		# report error
-				fi
-			fi
-			[ $use_ipv6 -eq 0 ] && __DATA="$__DATA4" || __DATA="$__DATA6"
-			[ -n "$__DATA" ] && write_log 7 "Local IP '$__DATA' detected on interface '$ip_interface'"
-		elif [ -n "$ip_script" -a "$ip_source" = "script" ]; then
-			write_log 7 "#> $ip_script >$DATFILE 2>$ERRFILE"
-			eval $ip_script >$DATFILE 2>$ERRFILE
-			__ERR=$?
-			if [ $__ERR -eq 0 ]; then
-				__DATA=$(cat $DATFILE)
-				[ -n "$__DATA" ] && write_log 7 "Local IP '$__DATA' detected via script '$ip_script'"
-			else
-				write_log 3 "$ip_script Error: '$__ERR'"
-				write_log 7 "$(cat $ERRFILE)"		# report error
-			fi
-		elif [ -n "$ip_url" -a "$ip_source" = "web" ]; then
-			do_transfer "$ip_url"
-			# use correct regular expression
-			[ $use_ipv6 -eq 0 ] \
-				&& __DATA=$(grep -m 1 -o "$IPV4_REGEX" $DATFILE) \
-				|| __DATA=$(grep -m 1 -o "$IPV6_REGEX" $DATFILE)
-			[ -n "$__DATA" ] && write_log 7 "Local IP '$__DATA' detected on web at '$ip_url'"
-		else
-			write_log 12 "Error in 'get_local_ip()' - unhandled ip_source '$ip_source'"
-		fi
-		# valid data found return here
-		[ -n "$__DATA" ] && {
-			eval "$1=\"$__DATA\""
-			return 0
-		}
-
-		[ -n "$LUCI_HELPER" ] && return 1	# no retry if called by LuCI helper script
-
-		write_log 7 "Data detected:"
-		write_log 7 "$(cat $DATFILE)"
-
-		[ $VERBOSE -gt 1 ] && {
-			# VERBOSE > 1 then NO retry
-			write_log 4 "Get local IP via '$ip_source' failed - Verbose Mode: $VERBOSE - NO retry on error"
-			return 1
-		}
-
-		__CNT=$(( $__CNT + 1 ))	# increment error counter
-		# if error count > retry_count leave here
-		[ $retry_count -gt 0 -a $__CNT -gt $retry_count ] && \
-			write_log 14 "Get local IP via '$ip_source' failed after $retry_count retries"
-		write_log 4 "Get local IP via '$ip_source' failed - retry $__CNT/$retry_count in $RETRY_SECONDS seconds"
-		sleep $RETRY_SECONDS &
-		PID_SLEEP=$!
-		wait $PID_SLEEP	# enable trap-handler
-		PID_SLEEP=0
-	done
-	# we should never come here there must be a programming error
-	write_log 12 "Error in 'get_local_ip()' - program coding error"
-}
-
-get_registered_ip() {
-	# $1	Name of Variable to store public IP (REGISTERED_IP)
-	# $2	(optional) if set, do not retry on error
-	local __CNT=0	# error counter
-	local __ERR=255
-	local __REGEX  __PROG  __RUNPROG  __DATA  __IP
-	# return codes
-	# 1	no IP detected
-
-	[ $# -lt 1 -o $# -gt 2 ] && write_log 12 "Error calling 'get_registered_ip()' - wrong number of parameters"
-	[ $is_glue -eq 1 -a -z "$BIND_HOST" ] && write_log 14 "Lookup of glue records is only supported using BIND host"
-	write_log 7 "Detect registered/public IP"
-
-	# set correct regular expression
-	[ $use_ipv6 -eq 0 ] && __REGEX="$IPV4_REGEX" || __REGEX="$IPV6_REGEX"
-
-	if [ -n "$BIND_HOST" ]; then
-		__PROG="$BIND_HOST"
-		[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -t A"  || __PROG="$__PROG -t AAAA"
-		if [ $force_ipversion -eq 1 ]; then			# force IP version
-			[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -4"  || __PROG="$__PROG -6"
-		fi
-		[ $force_dnstcp -eq 1 ] && __PROG="$__PROG -T"	# force TCP
-		[ $is_glue -eq 1 ] && __PROG="$__PROG -v" # use verbose output to get additional section
-
-		__RUNPROG="$__PROG $lookup_host $dns_server >$DATFILE 2>$ERRFILE"
-		__PROG="BIND host"
-	elif [ -n "$KNOT_HOST" ]; then
-		__PROG="$KNOT_HOST"
-		[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -t A"  || __PROG="$__PROG -t AAAA"
-		if [ $force_ipversion -eq 1 ]; then			# force IP version
-			[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -4"  || __PROG="$__PROG -6"
-		fi
-		[ $force_dnstcp -eq 1 ] && __PROG="$__PROG -T"	# force TCP
-
-		__RUNPROG="$__PROG $lookup_host $dns_server >$DATFILE 2>$ERRFILE"
-		__PROG="Knot host"
-	elif [ -n "$DRILL" ]; then
-		__PROG="$DRILL -V0"			# drill options name @server type
-		if [ $force_ipversion -eq 1 ]; then			# force IP version
-			[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -4"  || __PROG="$__PROG -6"
-		fi
-		[ $force_dnstcp -eq 1 ] && __PROG="$__PROG -t" || __PROG="$__PROG -u"	# force TCP
-		__PROG="$__PROG $lookup_host"
-		[ -n "$dns_server" ] && __PROG="$__PROG @$dns_server"
-		[ $use_ipv6 -eq 0 ] && __PROG="$__PROG A"  || __PROG="$__PROG AAAA"
-
-		__RUNPROG="$__PROG >$DATFILE 2>$ERRFILE"
-		__PROG="drill"
-	elif [ -n "$HOSTIP" ]; then	# hostip package installed
-		__PROG="$HOSTIP"
-		[ $force_dnstcp -ne 0 ] && \
-			write_log 14 "hostip - no support for 'DNS over TCP'"
-
-		# is IP given as dns_server ?
-		__IP=$(echo $dns_server | grep -m 1 -o "$IPV4_REGEX")
-		[ -z "$__IP" ] && __IP=$(echo $dns_server | grep -m 1 -o "$IPV6_REGEX")
-
-		# we got NO ip for dns_server, so build command
-		[ -z "$__IP" -a -n "$dns_server" ] && {
-			__IP="\`$HOSTIP"
-			[ $use_ipv6 -eq 1 -a $force_ipversion -eq 1 ] && __IP="$__IP -6"
-			__IP="$__IP $dns_server | grep -m 1 -o"
-			[ $use_ipv6 -eq 1 -a $force_ipversion -eq 1 ] \
-				&& __IP="$__IP '$IPV6_REGEX'" \
-				|| __IP="$__IP '$IPV4_REGEX'"
-			__IP="$__IP \`"
-		}
-
-		[ $use_ipv6 -eq 1 ] && __PROG="$__PROG -6"
-		[ -n "$dns_server" ] && __PROG="$__PROG -r $__IP"
-		__RUNPROG="$__PROG $lookup_host >$DATFILE 2>$ERRFILE"
-		__PROG="hostip"
-	elif [ -n "$NSLOOKUP" ]; then	# last use BusyBox nslookup
-		NSLOOKUP_MUSL=$($(command -v nslookup) localhost 2>&1 | grep -F "(null)")	# not empty busybox compiled with musl
-		[ $force_dnstcp -ne 0 ] && \
-			write_log 14 "Busybox nslookup - no support for 'DNS over TCP'"
-		[ -n "$NSLOOKUP_MUSL" -a -n "$dns_server" ] && \
-			write_log 14 "Busybox compiled with musl - nslookup don't support the use of DNS Server"
-		[ $force_ipversion -ne 0 ] && \
-			write_log 5 "Busybox nslookup - no support to 'force IP Version' (ignored)"
-
-		__RUNPROG="$NSLOOKUP $lookup_host $dns_server >$DATFILE 2>$ERRFILE"
-		__PROG="BusyBox nslookup"
-	else	# there must be an error
-		write_log 12 "Error in 'get_registered_ip()' - no supported Name Server lookup software accessible"
-	fi
-
-	while : ; do
-		write_log 7 "#> $__RUNPROG"
-		eval $__RUNPROG
-		__ERR=$?
-		if [ $__ERR -ne 0 ]; then
-			write_log 3 "$__PROG error: '$__ERR'"
-			write_log 7 "$(cat $ERRFILE)"
-		else
-			if [ -n "$BIND_HOST" -o -n "$KNOT_HOST" ]; then
-				if [ $is_glue -eq 1 ]; then
-					__DATA=$(cat $DATFILE | grep "^$lookup_host" | grep -om1 "$__REGEX" )
-				else
-					__DATA=$(cat $DATFILE | awk -F "address " '/has/ {print $2; exit}' )
-				fi
-			elif [ -n "$DRILL" ]; then
-				__DATA=$(cat $DATFILE | awk '/^'"$lookup_host"'/ {print $5; exit}' )
-			elif [ -n "$HOSTIP" ]; then
-				__DATA=$(cat $DATFILE | grep -om1 "$__REGEX")
-			elif [ -n "$NSLOOKUP" ]; then
-				__DATA=$(cat $DATFILE | sed -ne "/^Name:/,\$ { s/^Address[0-9 ]\{0,\}: \($__REGEX\).*$/\\1/p }" )
-			fi
-			[ -n "$__DATA" ] && {
-				write_log 7 "Registered IP '$__DATA' detected"
-				[ -z "$IPFILE" ] || echo "$__DATA" > $IPFILE
-				eval "$1=\"$__DATA\""	# valid data found
-				return 0		# leave here
-			}
-			write_log 4 "NO valid IP found"
-			__ERR=127
-		fi
-		[ -z "$IPFILE" ] || echo "" > $IPFILE
-
-		[ -n "$LUCI_HELPER" ] && return $__ERR	# no retry if called by LuCI helper script
-		[ -n "$2" ] && return $__ERR		# $2 is given -> no retry
-		[ $VERBOSE -gt 1 ] && {
-			# VERBOSE > 1 then NO retry
-			write_log 4 "Get registered/public IP for '$lookup_host' failed - Verbose Mode: $VERBOSE - NO retry on error"
-			return $__ERR
-		}
-
-		__CNT=$(( $__CNT + 1 ))	# increment error counter
-		# if error count > retry_count leave here
-		[ $retry_count -gt 0 -a $__CNT -gt $retry_count ] && \
-			write_log 14 "Get registered/public IP for '$lookup_host' failed after $retry_count retries"
-
-		write_log 4 "Get registered/public IP for '$lookup_host' failed - retry $__CNT/$retry_count in $RETRY_SECONDS seconds"
-		sleep $RETRY_SECONDS &
-		PID_SLEEP=$!
-		wait $PID_SLEEP	# enable trap-handler
-		PID_SLEEP=0
-	done
-	# we should never come here there must be a programming error
-	write_log 12 "Error in 'get_registered_ip()' - program coding error"
-}
-
-get_uptime() {
-	# $1	Variable to store result in
-	[ $# -ne 1 ] && write_log 12 "Error calling 'verify_host_port()' - wrong number of parameters"
-	local __UPTIME=$(cat /proc/uptime)
-	eval "$1=\"${__UPTIME%%.*}\""
-}
-
-trap_handler() {
-	# $1	trap signal
-	# $2	optional (exit status)
-	local __PIDS __PID
-	local __ERR=${2:-0}
-	local __OLD_IFS=$IFS
-	local __NEWLINE_IFS='
-' # __NEWLINE_IFS
-
-	[ $PID_SLEEP -ne 0 ] && kill -$1 $PID_SLEEP 2>/dev/null	# kill pending sleep if exist
-
-	case $1 in
-		 0)	if [ $__ERR -eq 0 ]; then
-				write_log 5 "PID '$$' exit normal at $(eval $DATE_PROG)${N}"
-			else
-				write_log 4 "PID '$$' exit WITH ERROR '$__ERR' at $(eval $DATE_PROG)${N}"
-			fi ;;
-		 1)	write_log 6 "PID '$$' received 'SIGHUP' at $(eval $DATE_PROG)"
-			# reload config via starting the script again
-			/usr/lib/ddns/dynamic_dns_updater.sh -v "0" -S "$__SECTIONID" -- start || true
-			exit 0 ;;	# and leave this one
-		 2)	write_log 5 "PID '$$' terminated by 'SIGINT' at $(eval $DATE_PROG)${N}";;
-		 3)	write_log 5 "PID '$$' terminated by 'SIGQUIT' at $(eval $DATE_PROG)${N}";;
-		15)	write_log 5 "PID '$$' terminated by 'SIGTERM' at $(eval $DATE_PROG)${N}";;
-		 *)	write_log 13 "Unhandled signal '$1' in 'trap_handler()'";;
-	esac
-
-	__PIDS=$(pgrep -P $$)	# get my childs (pgrep prints with "newline")
-	IFS=$__NEWLINE_IFS
-	for __PID in $__PIDS; do
-		kill -$1 $__PID	# terminate it
-	done
-	IFS=$__OLD_IFS
-
-	# remove out and err file
-	[ -f $DATFILE ] && rm -f $DATFILE
-	[ -f $ERRFILE ] && rm -f $ERRFILE
-
-	# exit with correct handling:
-	# remove trap handling settings and send kill to myself
-	trap - 0 1 2 3 15
-	[ $1 -gt 0 ] && kill -$1 $$
-}
-
-split_FQDN() {
-	# $1	FQDN to split
-	# $2	name of variable to store TLD
-	# $3	name of variable to store (reg)Domain
-	# $4	name of variable to store Host/Subdomain
-
-	[ $# -ne 4 ] && write_log 12 "Error calling 'split_FQDN()' - wrong number of parameters"
-	[ -z "$1"  ] && write_log 12 "Error calling 'split_FQDN()' - missing FQDN to split"
-	[ -f $TLDFILE ] || write_log 12 "Error calling 'split_FQDN()' - missing file '$TLDFILE'"
-
-	local _HOST _FDOM _CTLD _FTLD
-	local _SET="$@"					# save given function parameters
-
-	local _PAR=$(echo "$1" | tr [A-Z] [a-z] | tr "." " ")	# to lower and replace DOT with SPACE
-	set -- $_PAR					# set new as function parameters
-	_PAR=""						# clear variable for later reuse
-	while [ -n "$1" ] ; do				# as long we have parameters
-		_PAR="$1 $_PAR"				# invert order of parameters
-		shift
-	done
-	set -- $_PAR					# use new as function parameters
-	_PAR=""						# clear variable
-
-	while [ -n "$1" ] ; do				# as long we have parameters
-		if [ -z "$_CTLD" ]; then 		# first loop
-			_CTLD="$1"			# CURRENT TLD to look at
-			shift
-		else
-			_CTLD="$1.$_CTLD"		# Next TLD to look at
-			shift
-		fi
-		# check if TLD exact match in tld_names.dat, save TLD
-		zcat $TLDFILE | grep -E "^$_CTLD$" >/dev/null 2>&1 && {
-			_FTLD="$_CTLD"		# save found
-			_FDOM="$1"		# save domain next step might be invalid
-			continue
-		}
-		# check if match any "*" in tld_names.dat,
-		zcat $TLDFILE | grep -E "^\*.$_CTLD$" >/dev/null 2>&1 && {
-			[ -z "$1" ] && break	# no more data break
-			# check if next level TLD match excludes "!" in tld_names.dat
-			if zcat $TLDFILE | grep -E "^!$1.$_CTLD$" >/dev/null 2>&1 ; then
-				_FTLD="$_CTLD"	# Yes
-			else
-				_FTLD="$1.$_CTLD"
-				shift
-			fi
-			_FDOM="$1"; shift
-		}
-		[ -n "$_FTLD" ] && break	# we have something valid, break
-	done
-
-	# the leftover parameters are the HOST/SUBDOMAIN
-	while [ -n "$1" ]; do
-		_HOST="$1 $_HOST"		# remember we need to invert
-		shift
-	done
-	_HOST=$(echo $_HOST | tr " " ".")	# insert DOT
-
-	set -- $_SET				# set back parameters from function call
-	[ -n "$_FTLD" ] && {
-		eval "$2=$_FTLD"		# set TLD
-		eval "$3=$_FDOM"		# set registrable domain
-		eval "$4=$_HOST"		# set HOST/SUBDOMAIN
-		return 0
-	}
-	eval "$2=''"		# clear TLD
-	eval "$3=''"		# clear registrable domain
-	eval "$4=''"		# clear HOST/SUBDOMAIN
-	return 1
-}
-
-expand_ipv6() {
-	# Original written for bash by
-	#.Author:  Florian Streibelt <florian@f-streibelt.de>
-	# Date:    08.04.2012
-	# License: Public Domain, but please be fair and
-	#          attribute the original author(s) and provide
-	#          a link to the original source for corrections:
-	#.         https://github.com/mutax/IPv6-Address-checks
-
-	# $1	IPv6 to expand
-	# $2	name of variable to store expanded IPv6
-	[ $# -ne 2 ] && write_log 12 "Error calling 'expand_ipv6()' - wrong number of parameters"
-
-	INPUT="$(echo "$1" | tr 'A-F' 'a-f')"
-	[ "$INPUT" = "::" ] && INPUT="::0"	# special case ::
-
-	O=""
-
-	while [ "$O" != "$INPUT" ]; do
-		O="$INPUT"
-
-		# fill all words with zeroes
-		INPUT=$( echo "$INPUT" | sed	-e 's|:\([0-9a-f]\{3\}\):|:0\1:|g' \
-						-e 's|:\([0-9a-f]\{3\}\)$|:0\1|g' \
-						-e 's|^\([0-9a-f]\{3\}\):|0\1:|g' \
-						-e 's|:\([0-9a-f]\{2\}\):|:00\1:|g' \
-						-e 's|:\([0-9a-f]\{2\}\)$|:00\1|g' \
-						-e 's|^\([0-9a-f]\{2\}\):|00\1:|g' \
-						-e 's|:\([0-9a-f]\):|:000\1:|g' \
-						-e 's|:\([0-9a-f]\)$|:000\1|g' \
-						-e 's|^\([0-9a-f]\):|000\1:|g' )
-
-	done
-
-	# now expand the ::
-	ZEROES=""
-
-	echo "$INPUT" | grep -qs "::"
-	if [ "$?" -eq 0 ]; then
-		GRPS="$( echo "$INPUT" | sed  's|[0-9a-f]||g' | wc -m )"
-		GRPS=$(( GRPS-1 ))		# remove carriage return
-		MISSING=$(( 8-GRPS ))
-		while [ $MISSING -gt 0 ]; do
-			ZEROES="$ZEROES:0000"
-			MISSING=$(( MISSING-1 ))
-		done
-
-		# be careful where to place the :
-		INPUT=$( echo "$INPUT" | sed	-e 's|\(.\)::\(.\)|\1'$ZEROES':\2|g' \
-						-e 's|\(.\)::$|\1'$ZEROES':0000|g' \
-						-e 's|^::\(.\)|'$ZEROES':0000:\1|g;s|^:||g' )
-	fi
-
-	# an expanded address has 39 chars + CR
-	if [ $(echo $INPUT | wc -m) != 40 ]; then
-		write_log 4 "Error in 'expand_ipv6()' - invalid IPv6 found: '$1' expanded: '$INPUT'"
-		eval "$2='invalid'"
-		return 1
-	fi
-
-	# echo the fully expanded version of the address
-	eval "$2=$INPUT"
-	return 0
-}
diff --git a/ddns-scripts/files/usr/lib/ddns/dynamic_dns_lucihelper.sh b/ddns-scripts/files/usr/lib/ddns/dynamic_dns_lucihelper.sh
deleted file mode 100644
index ab3eb78e7..000000000
--- a/ddns-scripts/files/usr/lib/ddns/dynamic_dns_lucihelper.sh
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/bin/sh
-# /usr/lib/ddns/dynamic_dns_lucihelper.sh
-#
-#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
-#.2014-2018 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-# This script is used by luci-app-ddns
-#
-# variables in small chars are read from /etc/config/ddns as parameter given here
-# variables in big chars are defined inside these scripts as gloval vars
-# variables in big chars beginning with "__" are local defined inside functions only
-# set -vx  	#script debugger
-
-. /usr/lib/ddns/dynamic_dns_functions.sh	# global vars are also defined here
-
-usage() {
-	cat << EOF
-
-Usage:
- $MYPROG [options] -- command
-
-Commands:
- get_local_ip        using given INTERFACE or NETWORK or SCRIPT or URL
- get_registered_ip   for given FQDN
- verify_dns          given DNS-SERVER
- verify_proxy        given PROXY
- start               start given SECTION
- reload              force running ddns processes to reload changed configuration
- restart             restart all ddns processes
-
-Parameters:
- -6                  => use_ipv6=1          (default 0)
- -d DNS-SERVER       => dns_server=SERVER[:PORT]
- -f                  => force_ipversion=1   (default 0)
- -g                  => is_glue=1           (default 0)
- -i INTERFACE        => ip_interface=INTERFACE; ip_source="interface"
- -l FQDN             => lookup_host=FQDN
- -n NETWORK          => ip_network=NETWORK; ip_source="network"
- -p PROXY            => proxy=[USER:PASS@]PROXY:PORT
- -s SCRIPT           => ip_script=SCRIPT; ip_source="script"
- -t                  => force_dnstcp=1      (default 0)
- -u URL              => ip_url=URL; ip_source="web"
- -S SECTION          SECTION to start
-
- -h                  => show this help and exit
- -L                  => use_logfile=1    (default 0)
- -v LEVEL            => VERBOSE=LEVEL    (default 0)
- -V                  => show version and exit
-
-EOF
-}
-
-usage_err() {
-	printf %s\\n "$MYPROG: $@" >&2
-	usage >&2
-	exit 255
-}
-
-# preset some variables, wrong or not set in ddns-functions.sh
-SECTION_ID="lucihelper"
-LOGFILE="$ddns_logdir/$SECTION_ID.log"
-DATFILE="$ddns_rundir/$SECTION_ID.$$.dat"	# save stdout data of WGet and other extern programs called
-ERRFILE="$ddns_rundir/$SECTION_ID.$$.err"	# save stderr output of WGet and other extern programs called
-DDNSPRG="/usr/lib/ddns/dynamic_dns_updater.sh"
-VERBOSE=0		# no console logging
-# global variables normally set by reading DDNS UCI configuration
-use_syslog=0		# no syslog
-use_logfile=0		# no logfile
-
-use_ipv6=0		# Use IPv6 - default IPv4
-force_ipversion=0	# Force IP Version - default 0 - No
-force_dnstcp=0		# Force TCP on DNS - default 0 - No
-is_glue=0		# Is glue record - default 0 - No
-use_https=0		# not needed but must be set
-
-while getopts ":6d:fghi:l:n:p:s:S:tu:Lv:V" OPT; do
-	case "$OPT" in
-		6)	use_ipv6=1;;
-		d)	dns_server="$OPTARG";;
-		f)	force_ipversion=1;;
-		g)	is_glue=1;;
-		i)	ip_interface="$OPTARG"; ip_source="interface";;
-		l)	lookup_host="$OPTARG";;
-		n)	ip_network="$OPTARG"; ip_source="network";;
-		p)	proxy="$OPTARG";;
-		s)	ip_script="$OPTARG"; ip_source="script";;
-		t)	force_dnstcp=1;;
-		u)	ip_url="$OPTARG"; ip_source="web";;
-		h)	usage; exit 255;;
-		L)	use_logfile=1;;
-		v)	VERBOSE=$OPTARG;;
-		S)	SECTION=$OPTARG;;
-		V)	printf %s\\n "ddns-scripts $VERSION"; exit 255;;
-		:)	usage_err "option -$OPTARG missing argument";;
-		\?)	usage_err "invalid option -$OPTARG";;
-		*)	usage_err "unhandled option -$OPT $OPTARG";;
-	esac
-done
-shift $((OPTIND - 1 ))	# OPTIND is 1 based
-
-[ $# -eq 0 ] && usage_err "missing command"
-
-__RET=0
-case "$1" in
-	get_registered_ip)
-		[ -z "$lookup_host" ] && usage_err "command 'get_registered_ip': 'lookup_host' not set" 
-		write_log 7 "-----> get_registered_ip IP"
-		[ -z "$SECTION" ] || IPFILE="$ddns_rundir/$SECTION.ip"
-		IP=""
-		get_registered_ip IP
-		__RET=$?
-		[ $__RET -ne 0 ] && IP=""
-		printf "%s" "$IP"
-		;;
-	verify_dns)
-		[ -z "$dns_server" ] && usage_err "command 'verify_dns': 'dns_server' not set" 
-		write_log 7 "-----> verify_dns '$dns_server'"
-		verify_dns "$dns_server"
-		__RET=$?
-		;;
-	verify_proxy)
-		[ -z "$proxy" ] && usage_err "command 'verify_proxy': 'proxy' not set" 
-		write_log 7 "-----> verify_proxy '$proxy'"
-		verify_proxy "$proxy"
-		__RET=$?
-		;;
-	get_local_ip)
-		[ -z "$ip_source" ] && usage_err "command 'get_local_ip': 'ip_source' not set" 
-		[ -n "$proxy" -a "$ip_source" = "web" ] && {
-			# proxy defined, used for ip_source=web
-			export HTTP_PROXY="http://$proxy"
-			export HTTPS_PROXY="http://$proxy"
-			export http_proxy="http://$proxy"
-			export https_proxy="http://$proxy"
-		}
-		# don't need IP only the return code
-		IP=""
-		if [ "$ip_source" = "web" -o  "$ip_source" = "script" ]; then
-			# we wait only 3 seconds for an
-			# answer from "web" or "script"
-			write_log 7 "-----> timeout 3 -- get_local_ip IP"
-			timeout 3 -- get_local_ip IP
-		else
-			write_log 7 "-----> get_local_ip IP"
-			get_local_ip IP
-		fi
-		__RET=$?
-		;;
-	start)
-		[ -z "$SECTION" ] &&  usage_err "command 'start': 'SECTION' not set"
-		if [ $VERBOSE -eq 0 ]; then	# start in background
-			$DDNSPRG -v 0 -S $SECTION -- start &
-		else
-			$DDNSPRG -v $VERBOSE -S $SECTION -- start
-		fi
-		;;
-	reload)
-		$DDNSPRG -- reload
-		;;
-	restart)
-		$DDNSPRG -- stop
-		sleep 1
-		$DDNSPRG -- start
-		;;
-	*)
-		__RET=255
-		;;
-esac
-
-# remove out and err file
-[ -f $DATFILE ] && rm -f $DATFILE
-[ -f $ERRFILE ] && rm -f $ERRFILE
-return $__RET
diff --git a/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh b/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh
deleted file mode 100644
index 8176fa74c..000000000
--- a/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh
+++ /dev/null
@@ -1,436 +0,0 @@
-#!/bin/sh
-# /usr/lib/ddns/dynamic_dns_updater.sh
-#
-#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
-# Original written by Eric Paul Bishop, January 2008
-# (Loosely) based on the script on the one posted by exobyte in the forums here:
-# http://forum.openwrt.org/viewtopic.php?id=14040
-# extended and partial rewritten
-#.2014-2018 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-#
-# variables in small chars are read from /etc/config/ddns
-# variables in big chars are defined inside these scripts as global vars
-# variables in big chars beginning with "__" are local defined inside functions only
-# set -vx  	#script debugger
-
-. $(dirname $0)/dynamic_dns_functions.sh	# global vars are also defined here
-
-usage() {
-	cat << EOF
-
-Usage:
- $MYPROG [options] -- command
-
-Commands:
-start                Start SECTION or NETWORK or all
-stop                 Stop NETWORK or all
-
-Parameters:
- -n NETWORK          Start/Stop sections in background monitoring NETWORK, force VERBOSE=0
- -S SECTION          SECTION to start
-                     use either -N NETWORK or -S SECTION
-
- -h                  show this help and exit
- -V                  show version and exit
- -v LEVEL            VERBOSE=LEVEL (default 1)
-                        '0' NO output to console
-                        '1' output to console
-                        '2' output to console AND logfile
-                            + run once WITHOUT retry on error
-                        '3' output to console AND logfile
-                            + run once WITHOUT retry on error
-                            + NOT sending update to DDNS service
-
-EOF
-}
-
-usage_err() {
-	printf %s\\n "$MYPROG: $@" >&2
-	usage >&2
-	exit 1
-}
-
-while getopts ":hv:n:S:V" OPT; do
-	case "$OPT" in
-		h)	usage; exit 0;;
-		v)	VERBOSE=$OPTARG;;
-		n)	NETWORK=$OPTARG;;
-		S)	SECTION_ID=$OPTARG;;
-		V)	printf %s\\n "ddns-scripts $VERSION"; exit 0;;
-		:)	usage_err "option -$OPTARG missing argument";;
-		\?)	usage_err "invalid option -$OPTARG";;
-		*)	usage_err "unhandled option -$OPT $OPTARG";;
-	esac
-done
-shift $((OPTIND - 1 ))	# OPTIND is 1 based
-
-[ -n "$NETWORK" -a -n "$SECTION_ID" ] && usage_err "use either option '-N' or '-S' not both"
-[ $# -eq 0 ] && usage_err "missing command"
-[ $# -gt 1 ] && usage_err "to much commands"
-
-case "$1" in
-	start)
-		if [ -n "$NETWORK" ]; then
-			start_daemon_for_all_ddns_sections "$NETWORK"
-			exit 0
-		fi
-		if [ -z "$SECTION_ID" ]; then
-			start_daemon_for_all_ddns_sections
-			exit 0
-		fi
-		;;
-	stop)
-		if [ -n "$INTERFACE" ]; then
-			stop_daemon_for_all_ddns_sections "$NETWORK"
-			exit 0
-		else
-			stop_daemon_for_all_ddns_sections
-			exit 0
-		fi
-		exit 1
-		;;
-	reload)
-		killall -1 dynamic_dns_updater.sh 2>/dev/null
-		exit $?
-		;;
-	*)	usage_err "unknown command - $1";;
-esac
-
-# set file names
-PIDFILE="$ddns_rundir/$SECTION_ID.pid"	# Process ID file
-UPDFILE="$ddns_rundir/$SECTION_ID.update"	# last update successful send (system uptime)
-DATFILE="$ddns_rundir/$SECTION_ID.dat"	# save stdout data of WGet and other extern programs called
-ERRFILE="$ddns_rundir/$SECTION_ID.err"	# save stderr output of WGet and other extern programs called
-IPFILE="$ddns_rundir/$SECTION_ID.ip"	#
-LOGFILE="$ddns_logdir/$SECTION_ID.log"	# log file
-
-# VERBOSE > 1 delete logfile if exist to create an empty one
-# only with this data of this run for easier diagnostic
-# new one created by write_log function
-[ $VERBOSE -gt 1 -a -f $LOGFILE ] && rm -f $LOGFILE
-
-# TRAP handler
-trap "trap_handler 0 \$?" 0	# handle script exit with exit status
-trap "trap_handler 1"  1	# SIGHUP	Hangup / reload config
-trap "trap_handler 2"  2	# SIGINT	Terminal interrupt
-trap "trap_handler 3"  3	# SIGQUIT	Terminal quit
-# trap "trap_handler 9"  9	# SIGKILL	no chance to trap
-trap "trap_handler 15" 15	# SIGTERM	Termination
-
-################################################################################
-# Leave this comment here, to clearly document variable names that are expected/possible
-# Use load_all_config_options to load config options, which is a much more flexible solution.
-#
-# config_load "ddns"
-# config_get <variable> $SECTION_ID <option>
-#
-# defined options (also used as variable):
-#
-# enabled	self-explanatory
-# interface 	network interface used by hotplug.d i.e. 'wan' or 'wan6'
-#
-# service_name	Which DDNS service do you use or "custom"
-# update_url	URL to use to update your "custom" DDNS service
-# update_script SCRIPT to use to update your "custom" DDNS service
-#
-# lookup_host	FQDN of ONE of your at DDNS service defined host / required to validate if IP update happen/necessary
-# domain 	Nomally your DDNS hostname / replace [DOMAIN] in update_url
-# username 	Username of your DDNS service account / urlenceded and replace [USERNAME] in update_url
-# password 	Password of your DDNS service account / urlencoded and replace [PASSWORD] in update_url
-# param_enc	Optional parameter for (later) usage  / urlencoded and replace [PARAMENC] in update_url
-# param_opt	Optional parameter for (later) usage  / replace [PARAMOPT] in update_url
-#
-# use_https	use HTTPS to update DDNS service
-# cacert	file or directory where HTTPS can find certificates to verify server; 'IGNORE' ignore check of server certificate
-#
-# use_syslog	log activity to syslog
-#
-# ip_source	source to detect current local IP ('network' or 'web' or 'script' or 'interface')
-# ip_network	local defined network to read IP from i.e. 'wan' or 'wan6'
-# ip_url	URL to read local address from i.e. http://checkip.dyndns.com/ or http://checkipv6.dyndns.com/
-# ip_script	full path and name of your script to detect local IP
-# ip_interface	physical interface to use for detecting
-#
-# check_interval	check for changes every  !!! checks below 10 minutes make no sense because the Internet
-# check_unit		'days' 'hours' 'minutes' !!! needs about 5-10 minutes to sync an IP-change for an DNS entry
-#
-# force_interval	force to send an update to your service if no change was detected
-# force_unit		'days' 'hours' 'minutes' !!! force_interval="0" runs this script once for use i.e. with cron
-#
-# retry_interval	if error was detected retry in
-# retry_unit		'days' 'hours' 'minutes' 'seconds'
-# retry_count 		number of retries before scripts stops
-#
-# use_ipv6		detecting/sending IPv6 address
-# force_ipversion	force usage of IPv4 or IPv6 for the whole detection and update communication
-# dns_server		using a non default dns server to get Registered IP from Internet
-# force_dnstcp		force communication with DNS server via TCP instead of default UDP
-# proxy			using a proxy for communication !!! ALSO used to detect local IP via web => return proxy's IP !!!
-# use_logfile		self-explanatory "/var/log/ddns/$SECTION_ID.log"
-# is_glue			the record that should be updated is a glue record
-#
-# some functionality needs
-# - GNU Wget or cURL installed for sending updates to DDNS service
-# - BIND host installed to detect Registered IP
-#
-################################################################################
-
-load_all_config_options "ddns" "$SECTION_ID"
-ERR_LAST=$?	# save return code - equal 0 if SECTION_ID found
-
-# set defaults if not defined
-[ -z "$enabled" ]	  && enabled=0
-[ -z "$retry_count" ]	  && retry_count=0	# endless retry
-[ -z "$use_syslog" ]      && use_syslog=2	# syslog "Notice"
-[ -z "$use_https" ]       && use_https=0	# not use https
-[ -z "$use_logfile" ]     && use_logfile=1	# use logfile by default
-[ -z "$use_ipv6" ]	  && use_ipv6=0		# use IPv4 by default
-[ -z "$force_ipversion" ] && force_ipversion=0	# default let system decide
-[ -z "$force_dnstcp" ]	  && force_dnstcp=0	# default UDP
-[ -z "$ip_source" ]	  && ip_source="network"
-[ -z "$is_glue" ]	  && is_glue=0		# default the ddns record is not a glue record
-[ "$ip_source" = "network" -a -z "$ip_network" -a $use_ipv6 -eq 0 ] && ip_network="wan"  # IPv4: default wan
-[ "$ip_source" = "network" -a -z "$ip_network" -a $use_ipv6 -eq 1 ] && ip_network="wan6" # IPv6: default wan6
-[ "$ip_source" = "web" -a -z "$ip_url" -a $use_ipv6 -eq 0 ] && ip_url="http://checkip.dyndns.com"
-[ "$ip_source" = "web" -a -z "$ip_url" -a $use_ipv6 -eq 1 ] && ip_url="http://checkipv6.dyndns.com"
-[ "$ip_source" = "interface" -a -z "$ip_interface" ] && ip_interface="eth1"
-
-# url encode username (might be email or something like this)
-# and password (might have special chars for security reason)
-# and optional parameter "param_enc"
-[ -n "$username" ] && urlencode URL_USER "$username"
-[ -n "$password" ] && urlencode URL_PASS "$password"
-[ -n "$param_enc" ] && urlencode URL_PENC "$param_enc"
-
-# SECTION_ID does not exists
-[ $ERR_LAST -ne 0 ] && {
-	[ $VERBOSE -le 1 ] && VERBOSE=2		# force console out and logfile output
-	[ -f $LOGFILE ] && rm -f $LOGFILE	# clear logfile before first entry
-	write_log  7 "************ ************** ************** **************"
-	write_log  5 "PID '$$' started at $(eval $DATE_PROG)"
-	write_log  7 "ddns version  : $VERSION"
-	write_log  7 "uci configuration:${N}$(uci -q show ddns | grep '=service' | sort)"
-	write_log 14 "Service section '$SECTION_ID' not defined"
-}
-
-write_log 7 "************ ************** ************** **************"
-write_log 5 "PID '$$' started at $(eval $DATE_PROG)"
-write_log 7 "ddns version  : $VERSION"
-write_log 7 "uci configuration:${N}$(uci -q show ddns.$SECTION_ID | sort)"
-# write_log 7 "ddns version  : $(opkg list-installed ddns-scripts | cut -d ' ' -f 3)"
-case $VERBOSE in
-	0) write_log  7 "verbose mode  : 0 - run normal, NO console output";;
-	1) write_log  7 "verbose mode  : 1 - run normal, console mode";;
-	2) write_log  7 "verbose mode  : 2 - run once, NO retry on error";;
-	3) write_log  7 "verbose mode  : 3 - run once, NO retry on error, NOT sending update";;
-	*) write_log 14 "error detecting VERBOSE '$VERBOSE'";;
-esac
-
-# check enabled state otherwise we don't need to continue
-[ $enabled -eq 0 ] && write_log 14 "Service section disabled!"
-
-# determine what update url we're using if a service_name is supplied
-# otherwise update_url is set inside configuration (custom update url)
-# or update_script is set inside configuration (custom update script)
-[ -n "$service_name" ] && {
-	# Check first if we have a custom service provider with this name
-	get_service_data "$service_name" "/usr/share/ddns/custom" update_url update_script UPD_ANSWER
-	if [ "$?" != "0" ]; then
-		get_service_data "$service_name" "/usr/share/ddns/default" update_url update_script UPD_ANSWER
-	fi
-}
-
-[ -z "$update_url" -a -z "$update_script" ] && write_log 14 "No update_url found/defined or no update_script found/defined!"
-[ -n "$update_script" -a ! -f "$update_script" ] && write_log 14 "Custom update_script not found!"
-
-# temporary needed to convert existing uci settings
-[ -z "$lookup_host" ] && {
-	uci -q set ddns.$SECTION_ID.lookup_host="$domain"
-	uci -q commit ddns
-	lookup_host="$domain"
-}
-# later versions only check if configured correctly
-
-# without lookup host and possibly other required options we can do nothing for you
-[ -z "$lookup_host" ] && write_log 14 "Service section not configured correctly! Missing 'lookup_host'"
-
-# verify validity of variables
-[ -n "$lookup_host" ] && sanitize_variable lookup_host "$DNS_CHARSET" ""
-[ -n "$dns_server" ] && sanitize_variable dns_server "$DNS_CHARSET" ""
-[ -n "$domain" ] && sanitize_variable domain "$DNS_CHARSET_DOMAIN" ""
-
-# Filter shell escape characters, if these are required in the URL, they
-# can still be passed url encoded
-[ -n "$param_opt" ] && sanitize_variable param_opt "" "$SHELL_ESCAPE"
-
-[ -n "$update_url" ] && {
-	# only check if update_url is given, update_scripts have to check themselves
-	[ -z "$domain" ] && $(echo "$update_url" | grep "\[DOMAIN\]" >/dev/null 2>&1) && \
-		write_log 14 "Service section not configured correctly! Missing 'domain'"
-	[ -z "$username" ] && $(echo "$update_url" | grep "\[USERNAME\]" >/dev/null 2>&1) && \
-		write_log 14 "Service section not configured correctly! Missing 'username'"
-	[ -z "$password" ] && $(echo "$update_url" | grep "\[PASSWORD\]" >/dev/null 2>&1) && \
-		write_log 14 "Service section not configured correctly! Missing 'password'"
-	[ -z "$param_enc" ] && $(echo "$update_url" | grep "\[PARAMENC\]" >/dev/null 2>&1) && \
-		write_log 14 "Service section not configured correctly! Missing 'param_enc'"
-	[ -z "$param_opt" ] && $(echo "$update_url" | grep "\[PARAMOPT\]" >/dev/null 2>&1) && \
-		write_log 14 "Service section not configured correctly! Missing 'param_opt'"
-}
-
-# verify ip_source 'script' if script is configured and executable
-if [ "$ip_source" = "script" ]; then
-	set -- $ip_script	#handling script with parameters, we need a trick
-	[ -z "$1" ] && write_log 14 "No script defined to detect local IP!"
-	[ -x "$1" ] || write_log 14 "Script to detect local IP not executable!"
-fi
-
-# compute update interval in seconds
-get_seconds CHECK_SECONDS ${check_interval:-10} ${check_unit:-"minutes"} # default 10 min
-get_seconds FORCE_SECONDS ${force_interval:-72} ${force_unit:-"hours"}	 # default 3 days
-get_seconds RETRY_SECONDS ${retry_interval:-60} ${retry_unit:-"seconds"} # default 60 sec
-[ $CHECK_SECONDS -lt 300 ] && CHECK_SECONDS=300		# minimum 5 minutes
-[ $FORCE_SECONDS -gt 0 -a $FORCE_SECONDS -lt $CHECK_SECONDS ] && FORCE_SECONDS=$CHECK_SECONDS	# FORCE_SECONDS >= CHECK_SECONDS or 0
-write_log 7 "check interval: $CHECK_SECONDS seconds"
-write_log 7 "force interval: $FORCE_SECONDS seconds"
-write_log 7 "retry interval: $RETRY_SECONDS seconds"
-write_log 7 "retry counter : $retry_count times"
-
-# kill old process if it exists & set new pid file
-stop_section_processes "$SECTION_ID"
-[ $? -gt 0 ] && write_log 7 "'SIGTERM' was send to old process" || write_log 7 "No old process"
-echo $$ > $PIDFILE
-
-# determine when the last update was
-# the following lines should prevent multiple updates if hotplug fires multiple startups
-# as described in Ticket #7820, but did not function if never an update take place
-# i.e. after a reboot (/var is linked to /tmp)
-# using uptime as reference because date might not be updated via NTP client
-get_uptime CURR_TIME
-[ -e "$UPDFILE" ] && {
-	LAST_TIME=$(cat $UPDFILE)
-	# check also LAST > CURR because link of /var/run to /tmp might be removed
-	# i.e. boxes with larger filesystems
-	[ -z "$LAST_TIME" ] && LAST_TIME=0
-	[ $LAST_TIME -gt $CURR_TIME ] && LAST_TIME=0
-}
-if [ $LAST_TIME -eq 0 ]; then
-	write_log 7 "last update: never"
-else
-	EPOCH_TIME=$(( $(date +%s) - $CURR_TIME + $LAST_TIME ))
-	EPOCH_TIME="date -d @$EPOCH_TIME +'$ddns_dateformat'"
-	write_log 7 "last update: $(eval $EPOCH_TIME)"
-fi
-
-# verify DNS server
-[ -n "$dns_server" ] && verify_dns "$dns_server"
-
-# verify Proxy server and set environment
-[ -n "$proxy" ] && {
-	verify_proxy "$proxy" && {
-		# everything ok set proxy
-		export HTTP_PROXY="http://$proxy"
-		export HTTPS_PROXY="http://$proxy"
-		export http_proxy="http://$proxy"
-		export https_proxy="http://$proxy"
-	}
-}
-
-# let's check if there is already an IP registered on the web
-get_registered_ip REGISTERED_IP "NO_RETRY"
-ERR_LAST=$?
-#     No error    or     No IP set	 otherwise retry
-[ $ERR_LAST -eq 0 -o $ERR_LAST -eq 127 ] || get_registered_ip REGISTERED_IP
-# on IPv6 we use expanded version to be shure when comparing
-[ $use_ipv6 -eq 1 ] && expand_ipv6 "$REGISTERED_IP" REGISTERED_IP
-
-# loop endlessly, checking ip every check_interval and forcing an updating once every force_interval
-write_log 6 "Starting main loop at $(eval $DATE_PROG)"
-while : ; do
-
-	get_local_ip LOCAL_IP		# read local IP
-	[ $use_ipv6 -eq 1 ] && expand_ipv6 "$LOCAL_IP" LOCAL_IP	# on IPv6 we use expanded version
-
-	# prepare update
-	# never updated or forced immediate then NEXT_TIME = 0
-	[ $FORCE_SECONDS -eq 0 -o $LAST_TIME -eq 0 ] \
-		&& NEXT_TIME=0 \
-		|| NEXT_TIME=$(( $LAST_TIME + $FORCE_SECONDS ))
-
-	get_uptime CURR_TIME		# get current uptime
-
-	# send update when current time > next time or local ip different from registered ip
-	if [ $CURR_TIME -ge $NEXT_TIME -o "$LOCAL_IP" != "$REGISTERED_IP" ]; then
-		if [ $VERBOSE -gt 2 ]; then
-			write_log 7 "Verbose Mode: $VERBOSE - NO UPDATE send"
-		elif [ "$LOCAL_IP" != "$REGISTERED_IP" ]; then
-			write_log 7 "Update needed - L: '$LOCAL_IP' <> R: '$REGISTERED_IP'"
-		else
-			write_log 7 "Forced Update - L: '$LOCAL_IP' == R: '$REGISTERED_IP'"
-		fi
-
-		ERR_LAST=0
-		[ $VERBOSE -lt 3 ] && {
-			# only send if VERBOSE < 3
-			send_update "$LOCAL_IP"
-			ERR_LAST=$?	# save return value
-		}
-
-		# error sending local IP to provider
-		# we have no communication error (handled inside send_update/do_transfer)
-		# but update was not recognized
-		# do NOT retry after RETRY_SECONDS, do retry after CHECK_SECONDS
-		# to early retrys will block most DDNS provider
-		# providers answer is checked inside send_update() function
-		if [ $ERR_LAST -eq 0 ]; then
-			get_uptime LAST_TIME		# we send update, so
-			echo $LAST_TIME > $UPDFILE	# save LASTTIME to file
-			[ "$LOCAL_IP" != "$REGISTERED_IP" ] \
-				&& write_log 6 "Update successful - IP '$LOCAL_IP' send" \
-				|| write_log 6 "Forced update successful - IP: '$LOCAL_IP' send"
-		elif [ $ERR_LAST -eq 127 ]; then
-			write_log 3 "No update send to DDNS Provider"
-		else
-			write_log 3 "IP update not accepted by DDNS Provider"
-		fi
-	fi
-
-	# now we wait for check interval before testing if update was recognized
-	# only sleep if VERBOSE <= 2 because otherwise nothing was send
-	[ $VERBOSE -le 2 ] && {
-		write_log 7 "Waiting $CHECK_SECONDS seconds (Check Interval)"
-		sleep $CHECK_SECONDS &
-		PID_SLEEP=$!
-		wait $PID_SLEEP	# enable trap-handler
-		PID_SLEEP=0
-	} || write_log 7 "Verbose Mode: $VERBOSE - NO Check Interval waiting"
-
-	REGISTERED_IP=""		# clear variable
-	get_registered_ip REGISTERED_IP	# get registered/public IP
-	[ $use_ipv6 -eq 1 ] && expand_ipv6 "$REGISTERED_IP" REGISTERED_IP	# on IPv6 we use expanded version
-
-	# IP's are still different
-	if [ "$LOCAL_IP" != "$REGISTERED_IP" ]; then
-		if [ $VERBOSE -le 1 ]; then	# VERBOSE <=1 then retry
-			ERR_UPDATE=$(( $ERR_UPDATE + 1 ))
-			[ $retry_count -gt 0 -a $ERR_UPDATE -gt $retry_count ] && \
-				write_log 14 "Updating IP at DDNS provider failed after $retry_count retries"
-			write_log 4 "Updating IP at DDNS provider failed - starting retry $ERR_UPDATE/$retry_count"
-			continue # loop to beginning
-		else
-			write_log 4 "Updating IP at DDNS provider failed"
-			write_log 7 "Verbose Mode: $VERBOSE - NO retry"; exit 1
-		fi
-	else
-		# we checked successful the last update
-		ERR_UPDATE=0			# reset error counter
-	fi
-
-	# force_update=0 or VERBOSE > 1 - leave here
-	[ $VERBOSE -gt 1 ]  && write_log 7 "Verbose Mode: $VERBOSE - NO reloop"
-	[ $FORCE_SECONDS -eq 0 ] && write_log 6 "Configured to run once"
-	[ $VERBOSE -gt 1 -o $FORCE_SECONDS -eq 0 ] && exit 0
-
-	write_log 6 "Rerun IP check at $(eval $DATE_PROG)"
-done
-# we should never come here there must be a programming error
-write_log 12 "Error in 'dynamic_dns_updater.sh - program coding error"
diff --git a/ddns-scripts/files/usr/lib/ddns/update_cloudflare_com_v4.sh b/ddns-scripts/files/usr/lib/ddns/update_cloudflare_com_v4.sh
deleted file mode 100644
index c5bbe1799..000000000
--- a/ddns-scripts/files/usr/lib/ddns/update_cloudflare_com_v4.sh
+++ /dev/null
@@ -1,198 +0,0 @@
-#!/bin/sh
-#
-#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
-#
-# script for sending updates to cloudflare.com
-#.based on Ben Kulbertis cloudflare-update-record.sh found at http://gist.github.com/benkulbertis
-#.and on George Johnson's cf-ddns.sh found at https://github.com/gstuartj/cf-ddns.sh
-#.2016-2018 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-# CloudFlare API documentation at https://api.cloudflare.com/
-#
-# This script is parsed by dynamic_dns_functions.sh inside send_update() function
-#
-# using following options from /etc/config/ddns
-# option username  - your cloudflare e-mail
-# option password  - cloudflare api key, you can get it from cloudflare.com/my-account/
-# option domain    - "hostname@yourdomain.TLD"	# syntax changed to remove split_FQDN() function and tld_names.dat.gz
-#
-# The proxy status would not be changed by this script. Please change it in Cloudflare dashboard manually. 
-#
-# variable __IP already defined with the ip-address to use for update
-#
-
-# check parameters
-[ -z "$CURL" ] && [ -z "$CURL_SSL" ] && write_log 14 "Cloudflare communication require cURL with SSL support. Please install"
-[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing key as 'username'"
-[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing secret as 'password'"
-[ $use_https -eq 0 ] && use_https=1	# force HTTPS
-
-# used variables
-local __HOST __DOMAIN __TYPE __URLBASE __PRGBASE __RUNPROG __DATA __IPV6 __ZONEID __RECID __PROXIED
-local __URLBASE="https://api.cloudflare.com/client/v4"
-local __TTL=120
-
-# split __HOST __DOMAIN from $domain
-# given data:
-# @example.com for "domain record"
-# host.sub@example.com for a "host record"
-__HOST=$(printf %s "$domain" | cut -d@ -f1)
-__DOMAIN=$(printf %s "$domain" | cut -d@ -f2)
-
-# Cloudflare v4 needs:
-# __DOMAIN = the base domain i.e. example.com
-# __HOST   = the FQDN of record to modify
-# i.e. example.com for the "domain record" or host.sub.example.com for "host record"
-
-# handling domain record then set __HOST = __DOMAIN
-[ -z "$__HOST" ] && __HOST=$__DOMAIN
-# handling host record then rebuild fqdn host@domain.tld => host.domain.tld
-[ "$__HOST" != "$__DOMAIN" ] && __HOST="${__HOST}.${__DOMAIN}"
-
-# set record type
-[ $use_ipv6 -eq 0 ] && __TYPE="A" || __TYPE="AAAA"
-
-# transfer function to use for godaddy
-# all needed variables are set global here
-# so we can use them directly
-cloudflare_transfer() {
-	local __CNT=0
-	local __ERR
-	while : ; do
-		write_log 7 "#> $__RUNPROG"
-		eval "$__RUNPROG"
-		__ERR=$?			# save communication error
-		[ $__ERR -eq 0 ] && break	# no error break while
-
-		write_log 3 "cURL Error: '$__ERR'"
-		write_log 7 "$(cat $ERRFILE)"		# report error
-
-		[ $VERBOSE_MODE -gt 1 ] && {
-			# VERBOSE_MODE > 1 then NO retry
-			write_log 4 "Transfer failed - Verbose Mode: $VERBOSE_MODE - NO retry on error"
-			break
-		}
-
-		__CNT=$(( $__CNT + 1 ))	# increment error counter
-		# if error count > retry_count leave here
-		[ $retry_count -gt 0 -a $__CNT -gt $retry_count ] && \
-			write_log 14 "Transfer failed after $retry_count retries"
-
-		write_log 4 "Transfer failed - retry $__CNT/$retry_count in $RETRY_SECONDS seconds"
-		sleep $RETRY_SECONDS &
-		PID_SLEEP=$!
-		wait $PID_SLEEP	# enable trap-handler
-		PID_SLEEP=0
-	done
-
-	# check for error
-	grep -q '"success":\s*true' $DATFILE || {
-		write_log 4 "CloudFlare reported an error:"
-		write_log 7 "$(cat $DATFILE)"		# report error
-		return 1	# HTTP-Fehler
-	}
-}
-
-# Build base command to use
-__PRGBASE="$CURL -RsS -o $DATFILE --stderr $ERRFILE"
-# force network/interface-device to use for communication
-if [ -n "$bind_network" ]; then
-	local __DEVICE
-	network_get_physdev __DEVICE $bind_network || \
-		write_log 13 "Can not detect local device using 'network_get_physdev $bind_network' - Error: '$?'"
-	write_log 7 "Force communication via device '$__DEVICE'"
-	__PRGBASE="$__PRGBASE --interface $__DEVICE"
-fi
-# force ip version to use
-if [ $force_ipversion -eq 1 ]; then
-	[ $use_ipv6 -eq 0 ] && __PRGBASE="$__PRGBASE -4" || __PRGBASE="$__PRGBASE -6"	# force IPv4/IPv6
-fi
-# set certificate parameters
-if [ "$cacert" = "IGNORE" ]; then	# idea from Ticket #15327 to ignore server cert
-	__PRGBASE="$__PRGBASE --insecure"	# but not empty better to use "IGNORE"
-elif [ -f "$cacert" ]; then
-	__PRGBASE="$__PRGBASE --cacert $cacert"
-elif [ -d "$cacert" ]; then
-	__PRGBASE="$__PRGBASE --capath $cacert"
-elif [ -n "$cacert" ]; then		# it's not a file and not a directory but given
-	write_log 14 "No valid certificate(s) found at '$cacert' for HTTPS communication"
-fi
-# disable proxy if not set (there might be .wgetrc or .curlrc or wrong environment set)
-# or check if libcurl compiled with proxy support
-if [ -z "$proxy" ]; then
-	__PRGBASE="$__PRGBASE --noproxy '*'"
-elif [ -z "$CURL_PROXY" ]; then
-	# if libcurl has no proxy support and proxy should be used then force ERROR
-	write_log 13 "cURL: libcurl compiled without Proxy support"
-fi
-# set headers
-if [ "$username" = "Bearer" ]; then
-  write_log 7 "Found Username 'Bearer' using Password as Bearer Authorization Token"
-  __PRGBASE="$__PRGBASE --header 'Authorization: Bearer $password' "
-else
-  __PRGBASE="$__PRGBASE --header 'X-Auth-Email: $username' "
-  __PRGBASE="$__PRGBASE --header 'X-Auth-Key: $password' "
-fi
-__PRGBASE="$__PRGBASE --header 'Content-Type: application/json' "
-
-# read zone id for registered domain.TLD
-__RUNPROG="$__PRGBASE --request GET '$__URLBASE/zones?name=$__DOMAIN'"
-cloudflare_transfer || return 1
-# extract zone id
-__ZONEID=$(grep -o '"id":\s*"[^"]*' $DATFILE | grep -o '[^"]*$' | head -1)
-[ -z "$__ZONEID" ] && {
-	write_log 4 "Could not detect 'zone id' for domain.tld: '$__DOMAIN'"
-	return 127
-}
-
-# read record id for A or AAAA record of host.domain.TLD
-__RUNPROG="$__PRGBASE --request GET '$__URLBASE/zones/$__ZONEID/dns_records?name=$__HOST&type=$__TYPE'"
-cloudflare_transfer || return 1
-# extract record id
-__RECID=$(grep -o '"id":\s*"[^"]*' $DATFILE | grep -o '[^"]*$' | head -1)
-[ -z "$__RECID" ] && {
-	write_log 4 "Could not detect 'record id' for host.domain.tld: '$__HOST'"
-	return 127
-}
-
-# extract current stored IP
-__DATA=$(grep -o '"content":\s*"[^"]*' $DATFILE | grep -o '[^"]*$' | head -1)
-
-# check data
-[ $use_ipv6 -eq 0 ] \
-	&& __DATA=$(printf "%s" "$__DATA" | grep -m 1 -o "$IPV4_REGEX") \
-	|| __DATA=$(printf "%s" "$__DATA" | grep -m 1 -o "$IPV6_REGEX")
-
-# we got data so verify
-[ -n "$__DATA" ] && {
-	# expand IPv6 for compare
-	if [ $use_ipv6 -eq 1 ]; then
-		expand_ipv6 $__IP __IPV6
-		expand_ipv6 $__DATA __DATA
-		[ "$__DATA" = "$__IPV6" ] && {		# IPv6 no update needed
-			write_log 7 "IPv6 at CloudFlare.com already up to date"
-			return 0
-		}
-	else
-		[ "$__DATA" = "$__IP" ] && {		# IPv4 no update needed
-			write_log 7 "IPv4 at CloudFlare.com already up to date"
-			return 0
-		}
-	fi
-}
-
-# update is needed
-# let's build data to send
-# set proxied parameter
-__PROXIED=$(grep -o '"proxied":\s*[^",]*' $DATFILE | grep -o '[^:]*$')
-
-# use file to work around " needed for json
-cat > $DATFILE << EOF
-{"id":"$__ZONEID","type":"$__TYPE","name":"$__HOST","content":"$__IP","ttl":$__TTL,"proxied":$__PROXIED}
-EOF
-
-# let's complete transfer command
-__RUNPROG="$__PRGBASE --request PUT --data @$DATFILE '$__URLBASE/zones/$__ZONEID/dns_records/$__RECID'"
-cloudflare_transfer || return 1
-
-return 0
-
diff --git a/ddns-scripts/files/usr/lib/ddns/update_cnkuai_cn.sh b/ddns-scripts/files/usr/lib/ddns/update_cnkuai_cn.sh
deleted file mode 100644
index a2b78630f..000000000
--- a/ddns-scripts/files/usr/lib/ddns/update_cnkuai_cn.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-# inside url we need domain, username and password
-[ -z "$domain" ]   && write_log 14 "Service section not configured correctly! Missing 'domain'"
-[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing 'username'"
-[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing 'password'"
-
-local urlCp='http://cp.cnkuai.cn/'
-local urlLogin='http://cp.cnkuai.cn/userlogin.asp'
-local urlCaptcha='http://cp.cnkuai.cn/inc/image.asp'
-local urlDnsA='http://cp.cnkuai.cn/dns_a.asp'
-local urlDnsAAAA='http://cp.cnkuai.cn/dns_ipv6.asp'
-local urlDnsSave='http://cp.cnkuai.cn/dns_save.asp'
-
-getPixel(){
-  local filename=$1
-  local x=$(($2*3))
-  local y=$(($3*3))
-  local width=48
-
-  hexdump -s "$((x+width*y))" -n 3 -e '3/1 "%02X"' "$filename"
-}
-
-captchaChar(){
-  local filename=$1
-  local xoffset=$2
-
-  if [ "$(getPixel "$filename" $((xoffset+2)) 5)" = '000000' ]; then
-    echo '1'
-  elif [ "$(getPixel "$filename" $((xoffset+5)) 7)" = '000000' ]; then
-    echo '2'
-  elif [ "$(getPixel "$filename" $((xoffset+4)) 3)" = '000000' ]; then
-    echo '4'
-  elif [ "$(getPixel "$filename" $((xoffset+6)) 4)" = '000000' ]; then
-    echo '7'
-  elif [ "$(getPixel "$filename" $((xoffset+5)) 8)" = '000000' ]; then
-    echo '8'
-  elif [ "$(getPixel "$filename" $((xoffset+6)) 8)" = '000000' ]; then
-    echo '9'
-  elif [ "$(getPixel "$filename" $((xoffset+5)) 6)" = '000000' ]; then
-    echo '3'
-  elif [ "$(getPixel "$filename" $((xoffset+0)) 4)" = '000000' ]; then
-    echo '5'
-  elif [ "$(getPixel "$filename" $((xoffset+1)) 5)" = '000000' ]; then
-    echo '6'
-  else
-    echo '0'
-  fi
-}
-
-captcha(){
-  local str
-  str=$(captchaChar "$1" 9)
-  str=$str$(captchaChar "$1" 18)
-  str=$str$(captchaChar "$1" 26)
-  str=$str$(captchaChar "$1" 35)
-  echo "$str"
-}
-
-#clean
-rm /tmp/cnkuai.*
-#login to cnkuai dns cp
-curl -c '/tmp/cnkuai.cookiejar' "$urlCaptcha" | gif2rgb > /tmp/cnkuai.rgb || return 1
-yzm=$(captcha "/tmp/cnkuai.rgb")
-curl -b '/tmp/cnkuai.cookiejar' -c '/tmp/cnkuai.cookiejar' -H "Content-Type: application/x-www-form-urlencoded" -H "Referer: $urlCp" -d "userid=$URL_USER&password=$URL_PASS&yzm=$yzm&B1=%C8%B7%C8%CF%B5%C7%C2%BD&lx=0&userlx=3" -X POST "$urlLogin" > /dev/null || return 1
-
-if [ "$use_ipv6" -eq 0 ]; then
-  curl -b '/tmp/cnkuai.cookiejar' -c '/tmp/cnkuai.cookiejar' "$urlDnsA" > /tmp/cnkuai.html || return 1
-else
-  curl -b '/tmp/cnkuai.cookiejar' -c '/tmp/cnkuai.cookiejar' "$urlDnsAAAA" > /tmp/cnkuai.html || return 1
-fi
-local domainline
-domainline=$(awk "/<td>$domain<\/td>/{ print NR; exit }" /tmp/cnkuai.html)
-local domainid
-domainid=$(awk "NR==$((domainline+3))" /tmp/cnkuai.html | sed 's/^.*name=\x27domainid\x27 value="//g' | sed 's/".*$//g')
-local dnslistid
-dnslistid=$(awk "NR==$((domainline+3))" /tmp/cnkuai.html | sed 's/^.*name=\x27dnslistid\x27 value="//g' | sed 's/".*$//g')
-
-local data
-
-if [ "$use_ipv6" -eq 0 ]; then
-  data="T2=$__IP&T3=120&act=dns_a_edit&domainid=$domainid&dnslistid=$dnslistid&B1=%D0%DE%B8%C4"
-else
-  data="T2=$__IP&T3=120&act=dns_ipv6_edit&domainid=$domainid&dnslistid=$dnslistid&B1=%D0%DE%B8%C4"
-fi
-curl -b '/tmp/cnkuai.cookiejar' -c '/tmp/cnkuai.cookiejar' -H "Content-Type: application/x-www-form-urlencoded" -H "Referer: $urlDnsA" -d "$data" -X POST "$urlDnsSave" > /dev/null || return 1
-
-return 0
diff --git a/ddns-scripts/files/usr/lib/ddns/update_digitalocean_com_v2.sh b/ddns-scripts/files/usr/lib/ddns/update_digitalocean_com_v2.sh
deleted file mode 100644
index 0770ab270..000000000
--- a/ddns-scripts/files/usr/lib/ddns/update_digitalocean_com_v2.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-# Script for sending user defined updates using DO API
-# 2015 Artem Yakimenko <code at temik dot me>
-#
-# activated inside /etc/config/ddns by setting
-#
-# option update_script '/usr/lib/ddns/update_do.sh'
-#
-# the script is parsed (not executed) inside send_update() function
-# of /usr/lib/ddns/dynamic_dns_functions.sh
-# so you can use all available functions and global variables inside this script
-# already defined in dynamic_dns_updater.sh and dynamic_dns_functions.sh
-#
-# It make sence to define the update url ONLY inside this script
-# because it's anyway unique to the update script
-# otherwise it should work with the default scripts
-#
-# Options are passed from /etc/config/ddns:
-
-# Username - the record name DO Zone
-# Password - API Token
-# Domain - the domain managed by DO
-# Parm_opt - The Record ID in the DO API structure
-
-local __URL="https://api.digitalocean.com/v2/domains/[DOMAIN]/records/[RECORD_ID]"
-local __HEADER="Authorization: Bearer [PASSWORD]"
-local __HEADER_CONTENT="Content-Type: application/json"
-local __BODY='{"name":"[NAME]","data": "[IP]"}'
-# inside url we need username and password
-
-[ -z "$domain" ] && write_log 14 "Service section not configured correctly! Missing 'domain'"
-[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing 'Zone name in Username'"
-[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing 'password'"
-[ -z "$param_opt" ] && write_log 14 "Service section not configured correctly! Missing 'Zone ID in Optional Parameter'"
-
-# do replaces in URL, header and body:
-__URL=$(echo $__URL | sed -e "s#\[RECORD_ID\]#$param_opt#g"  \
-                               -e "s#\[DOMAIN\]#$domain#g")
-__HEADER=$(echo $__HEADER| sed -e "s#\[PASSWORD\]#$password#g")
-__HEADER_CONTENT=$(echo $__HEADER_CONTENT)
-__BODY=$(echo $__BODY | sed -e "s#\[NAME\]#$username#g" -e "s#\[IP\]#$__IP#g")
-
-#Send PUT request
-
-curl -X PUT -H "$__HEADER_CONTENT" -H "$__HEADER" -d "$__BODY" "$__URL"
-
-write_log 7 "DDNS Provider answered:\n$(cat $DATFILE)"
-
-# analyse provider answers
-# If IP is contained in the returned datastructure - API call was sucessful
-grep -E "$__IP" $DATFILE >/dev/null 2>&1
-return $?      # "0" if IP has been changed or no change is needed
diff --git a/ddns-scripts/files/usr/lib/ddns/update_freedns_42_pl.sh b/ddns-scripts/files/usr/lib/ddns/update_freedns_42_pl.sh
deleted file mode 100644
index f0e91972a..000000000
--- a/ddns-scripts/files/usr/lib/ddns/update_freedns_42_pl.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
-#.2018 Michal Lipka <michal at sysadmin dot care>
-local __DUMMY
-local __URL="https://freedns.42.pl/xmlrpc.php"
-[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing 'username'"
-[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing 'password'"
-[ $ip_dynamic -eq 1 ] && __IP='\&lt;dynamic\&gt;'
-PROG="$(command -v curl) -sk"
-write_log 7 "sending update to freedns.42.pl with ip $__IP"
-XMLDATA="<?xml version='1.0'?><methodCall><methodName>xname.updateArecord</methodName><params><param><value><struct><member><name>name</name><value><string>[RECORDNAME]</string></value></member><member><name>zone</name><value><string>[ZONENAME]</string></value></member><member><name>oldaddress</name><value><string>*</string></value></member><member><name>updatereverse</name><value><string>0</string></value></member><member><name>user</name><value><string>[USERNAME]</string></value></member><member><name>ttl</name><value><string>600</string></value></member><member><name>newaddress</name><value><string>[IP]</string></value></member><member><name>password</name><value><string>[PASSWORD]</string></value></member></struct></value></param></params></methodCall>"
-XMLDATA=$(echo $XMLDATA | sed -e "s#\[USERNAME\]#$URL_USER#g" -e "s#\[PASSWORD\]#$URL_PASS#g" \
--e "s#\[ZONENAME\]#$zone#g" -e "s#\[RECORDNAME\]#$record#g" -e "s#\[IP\]#$__IP#g")
-$PROG -d "$XMLDATA" -o $DATFILE $__URL || return 1
-write_log 7 "'freedns.42.pl' answered:${N}$(cat $DATFILE)"
-grep "<fault>" $DATFILE > /dev/null 2>&1 && return 1
-grep '<name>serial</name>' $DATFILE >/dev/null 2>&1
-return $?
diff --git a/ddns-scripts/files/usr/lib/ddns/update_gandi_net.sh b/ddns-scripts/files/usr/lib/ddns/update_gandi_net.sh
deleted file mode 100644
index 553e7e7aa..000000000
--- a/ddns-scripts/files/usr/lib/ddns/update_gandi_net.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# Thanks goes to Alex Griffin who provided this script.
-
-local __TTL=600
-local __RRTYPE
-local __ENDPOINT="https://dns.api.gandi.net/api/v5"
-
-[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing subdomain as 'username'"
-[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing API Key as 'password'"
-
-[ $use_ipv6 -ne 0 ] && __RRTYPE="AAAA" || __RRTYPE="A"
-
-curl -s -X PUT "$__ENDPOINT/domains/$domain/records/$username/$__RRTYPE" \
-	-H "X-Api-Key: $password" \
-	-H "Content-Type: application/json" \
-	-d "{\"rrset_ttl\": $__TTL, \"rrset_values\": [\"$__IP\"]}" >$DATFILE
-
-write_log 7 "gandi.net answered: $(cat $DATFILE)"
-
-return 0
diff --git a/ddns-scripts/files/usr/lib/ddns/update_godaddy_com_v1.sh b/ddns-scripts/files/usr/lib/ddns/update_godaddy_com_v1.sh
deleted file mode 100644
index b8d527ca6..000000000
--- a/ddns-scripts/files/usr/lib/ddns/update_godaddy_com_v1.sh
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/bin/sh
-#
-#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
-#
-# script for sending updates to godaddy.com
-#.based on GoDaddy.sh v1.0 by Nazar78 @ TeaNazaR.com
-#.2017-2018 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-# GoDaddy Documentation at https://developer.godaddy.com/doc
-#
-# This script is parsed by dynamic_dns_functions.sh inside send_update() function
-#
-# using following options from /etc/config/ddns
-# option username - "key" as generated at https://developer.godaddy.com/keys/
-# option password - "secret" as generated at https://developer.godaddy.com/keys/
-# option domain   - "yourdomain.TLD" to update or "hostname@yourdomain.TLD"
-#
-# variable __IP already defined with the ip-address to use for update
-#
-
-# check parameters
-[ -z "$CURL" ] && [ -z "$CURL_SSL" ] && write_log 14 "GoDaddy communication require cURL with SSL support. Please install"
-[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing key as 'username'"
-[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing secret as 'password'"
-[ $use_https -eq 0 ] && use_https=1	# force HTTPS
-
-# used variables
-local __HOST __DOMAIN __TYPE __URL __PRGBASE __RUNPROG __DATA __IPV6
-
-# split __HOST __DOMAIN from $domain
-# given data:
-# @example.com for "domain record"
-# host.sub@example.com for a "host record"
-__HOST=$(printf %s "$domain" | cut -d@ -f1)
-__DOMAIN=$(printf %s "$domain" | cut -d@ -f2)
-
-# GoDaddy needs:
-# __DOMAIN = the base domain i.e. example.com
-# __HOST   = host.sub if updating a host record or
-# __HOST   = "@" urlencoded "%40" for a domain record
-[ -z "$__HOST" -o "$__HOST" = "$__DOMAIN" ] && __HOST="%40"
-
-# set record type
-[ $use_ipv6 -eq 0 ] && __TYPE="A" || __TYPE="AAAA"
-
-# now we know the url to use
-# __URL="https://api.ote-godaddy.com/v1/domains/$__DOMAIN/records/$__TYPE/$__HOST"	# api test server
-__URL="https://api.godaddy.com/v1/domains/$__DOMAIN/records/$__TYPE/$__HOST"		# production server
-
-# transfer function to use for godaddy
-# all needed variables are set global here
-# so we can use them directly
-godaddy_transfer() {
-	local __CNT=0
-	local __STATUS __ERR __DEVICE
-	while : ; do
-		write_log 7 "#> $__RUNPROG"
-		__STATUS=$(eval "$__RUNPROG")
-		__ERR=$?			# save communication error
-		[ $__ERR -eq 0 ] && break	# no error break while
-
-		write_log 4 "cURL error: '$__ERR'"
-		write_log 7 "$(cat $ERRFILE)"		# report error
-
-		[ $VERBOSE_MODE -gt 1 ] && {
-			# VERBOSE_MODE > 1 then NO retry
-			write_log 4 "Transfer failed - Verbose Mode: $VERBOSE_MODE - NO retry on error"
-			break
-		}
-
-		__CNT=$(( $__CNT + 1 ))	# increment error counter
-		# if error count > retry_count leave here
-		[ $retry_count -gt 0 -a $__CNT -gt $retry_count ] && \
-			write_log 14 "Transfer failed after $retry_count retries"
-
-		write_log 4 "Transfer failed - retry $__CNT/$retry_count in $RETRY_SECONDS seconds"
-		sleep $RETRY_SECONDS &
-		PID_SLEEP=$!
-		wait $PID_SLEEP	# enable trap-handler
-		PID_SLEEP=0
-	done
-
-	# handle HTTP error
-	[ $__STATUS -ne 200 ] && {
-		write_log 4 "GoDaddy reported an error:"
-		write_log 7 "$(cat $DATFILE)"
-		return 1
-	}
-	return 0
-}
-
-# Build base command to use
-__PRGBASE="$CURL -RsS -w '%{http_code}' -o $DATFILE --stderr $ERRFILE"
-# force network/interface-device to use for communication
-if [ -n "$bind_network" ]; then
-	local __DEVICE
-	network_get_physdev __DEVICE $bind_network || \
-		write_log 13 "Can not detect local device using 'network_get_physdev $bind_network' - Error: '$?'"
-	write_log 7 "Force communication via device '$__DEVICE'"
-	__PRGBASE="$__PRGBASE --interface $__DEVICE"
-fi
-# force ip version to use
-if [ $force_ipversion -eq 1 ]; then
-	[ $use_ipv6 -eq 0 ] && __PRGBASE="$__PRGBASE -4" || __PRGBASE="$__PRGBASE -6"	# force IPv4/IPv6
-fi
-# set certificate parameters
-if [ "$cacert" = "IGNORE" ]; then	# idea from Ticket #15327 to ignore server cert
-	__PRGBASE="$__PRGBASE --insecure"	# but not empty better to use "IGNORE"
-elif [ -f "$cacert" ]; then
-	__PRGBASE="$__PRGBASE --cacert $cacert"
-elif [ -d "$cacert" ]; then
-	__PRGBASE="$__PRGBASE --capath $cacert"
-elif [ -n "$cacert" ]; then		# it's not a file and not a directory but given
-	write_log 14 "No valid certificate(s) found at '$cacert' for HTTPS communication"
-fi
-# disable proxy if no set (there might be .wgetrc or .curlrc or wrong environment set)
-# or check if libcurl compiled with proxy support
-if [ -z "$proxy" ]; then
-	__PRGBASE="$__PRGBASE --noproxy '*'"
-elif [ -z "$CURL_PROXY" ]; then
-	# if libcurl has no proxy support and proxy should be used then force ERROR
-	write_log 13 "cURL: libcurl compiled without Proxy support"
-fi
-# set headers
-__PRGBASE="$__PRGBASE --header 'Authorization: sso-key $username:$password' "
-__PRGBASE="$__PRGBASE --header 'Accept: application/json' "
-__PRGBASE="$__PRGBASE --header 'Content-Type: application/json; charset=utf-8' "
-
-# read data from godaddy.com
-__RUNPROG="$__PRGBASE --request GET $__URL"
-godaddy_transfer || return 1
-
-# HTTP 200 OK, now analyse data and check if update needed
-__DATA=$(sed -r 's/.+data":"(.+)","t.+/\1/g' $DATFILE)
-
-# check data
-[ $use_ipv6 -eq 0 ] \
-	&& __DATA=$(printf "%s" "$__DATA" | grep -m 1 -o "$IPV4_REGEX") \
-	|| __DATA=$(printf "%s" "$__DATA" | grep -m 1 -o "$IPV6_REGEX")
-
-# we got data so verify
-[ -n "$__DATA" ] && {
-	# expand IPv6 for compare
-	if [ $use_ipv6 -eq 1 ]; then
-		expand_ipv6 $__IP __IPV6
-		expand_ipv6 $__DATA __DATA
-		[ "$__DATA" = "$__IPV6" ] && {		# IPv6 no update needed
-			write_log 7 "IPv6 at GoDaddy.com already up to date"
-			return 0
-		}
-	else
-		[ "$__DATA" = "$__IP" ] && {		# IPv4 no update needed
-			write_log 7 "IPv4 at GoDaddy.com already up to date"
-			return 0
-		}
-	fi
-}
-
-# update is needed
-# let's build data to send,
-# use file to work around double quotes '"' needed for json
-cat > $DATFILE << EOF
-[{"data":"$__IP"}]
-EOF
-
-# let's complete transfer command
-__RUNPROG="$__PRGBASE --request PUT --data @$DATFILE $__URL"
-
-godaddy_transfer || return 1
-
-# HTTP 200 OK
-return 0
-
diff --git a/ddns-scripts/files/usr/lib/ddns/update_no-ip_com.sh b/ddns-scripts/files/usr/lib/ddns/update_no-ip_com.sh
deleted file mode 100644
index e13058b14..000000000
--- a/ddns-scripts/files/usr/lib/ddns/update_no-ip_com.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
-#
-# script for sending updates to no-ip.com / noip.com
-#.2014-2015 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-#
-# This script is parsed by dynamic_dns_functions.sh inside send_update() function
-#
-# provider did not reactivate records, if no IP change was recognized
-# so we send a dummy (localhost) and a seconds later we send the correct IP addr
-#
-local __DUMMY
-local __UPDURL6="http://[USERNAME]:[PASSWORD]@dynupdate6.noip.com/nic/update?hostname=[DOMAIN]&myip=[IP]"
-local __UPDURL="http://[USERNAME]:[PASSWORD]@dynupdate.noip.com/nic/update?hostname=[DOMAIN]&myip=[IP]"
-# inside url we need username and password
-[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing 'username'"
-[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing 'password'"
-
-# set IP version dependend dummy (localhost)
-[ $use_ipv6 -eq 0 ] && __DUMMY="127.0.0.1" || __DUMMY="::1"
-[ $use_ipv6 -eq 0 ] && __UPDURL=$__UPDURL || __UPDURL=$__UPDURL6
-
-# lets do DUMMY transfer
-write_log 7 "sending dummy IP to 'no-ip.com'"
-__URL=$(echo $__UPDURL | sed -e "s#\[USERNAME\]#$URL_USER#g" -e "s#\[PASSWORD\]#$URL_PASS#g" \
-			       -e "s#\[DOMAIN\]#$domain#g" -e "s#\[IP\]#$__DUMMY#g")
-[ $use_https -ne 0 ] && __URL=$(echo $__URL | sed -e 's#^http:#https:#')
-
-do_transfer "$__URL" || return 1
-
-write_log 7 "'no-ip.com' answered:${N}$(cat $DATFILE)"
-# analyse provider answers
-# "good [IP_ADR]"	= successful
-# "nochg [IP_ADR]"	= no change but OK
-grep -E "good|nochg" $DATFILE >/dev/null 2>&1 || return 1
-
-# lets wait a seconds
-sleep 1
-
-# now send the correct data
-write_log 7 "sending real IP to 'no-ip.com'"
-__URL=$(echo $__UPDURL | sed -e "s#\[USERNAME\]#$URL_USER#g" -e "s#\[PASSWORD\]#$URL_PASS#g" \
-			       -e "s#\[DOMAIN\]#$domain#g" -e "s#\[IP\]#$__IP#g")
-[ $use_https -ne 0 ] && __URL=$(echo $__URL | sed -e 's#^http:#https:#')
-
-do_transfer "$__URL" || return 1
-
-write_log 7 "'no-ip.com' answered:${N}$(cat $DATFILE)"
-# analyse provider answers
-# "good [IP_ADR]"	= successful
-# "nochg [IP_ADR]"	= no change but OK
-grep -E "good|nochg" $DATFILE >/dev/null 2>&1
-return $?	# "0" if "good" or "nochg" found
-
diff --git a/ddns-scripts/files/usr/lib/ddns/update_nsupdate.sh b/ddns-scripts/files/usr/lib/ddns/update_nsupdate.sh
deleted file mode 100644
index 039196ff8..000000000
--- a/ddns-scripts/files/usr/lib/ddns/update_nsupdate.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
-#
-# The script directly updates a PowerDNS (or maybe bind server) via nsupdate from bind-client package.
-#.based on github request #957 by Jan Riechers <de at r-jan dot de>
-#.2015 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-#
-# This script is parsed by dynamic_dns_functions.sh inside send_update() function
-#
-# using following options from /etc/config/ddns
-# option username   - keyname 
-# option password   - shared secret (base64 encoded)
-# option domain     - full qualified domain to update
-# option dns_server - DNS server to update
-#
-# variable __IP already defined with the ip-address to use for update
-#
-local __TTL=600		#.preset DNS TTL (in seconds)
-local __RRTYPE __PW __TCP
-local __PROG=$(command -v nsupdate)			# BIND nsupdate ?
-[ -z "$__PROG" ] && __PROG=$(command -v knsupdate)	# Knot nsupdate ?
-
-[ -z "$__PROG" ]     && write_log 14 "'nsupdate' or 'knsupdate' not installed !"
-[ -z "$username" ]   && write_log 14 "Service section not configured correctly! Missing 'username'"
-[ -z "$password" ]   && write_log 14 "Service section not configured correctly! Missing 'password'"
-[ -z "$dns_server" ] && write_log 14 "Service section not configured correctly! Missing 'dns_server'"
-
-[ $use_ipv6 -ne 0 ] && __RRTYPE="AAAA" || __RRTYPE="A"
-[ $force_dnstcp -ne 0 ] && __TCP="-v" || __TCP=""
-
-# create command file
-cat >$DATFILE <<-EOF
-server $dns_server
-key $username $password
-update del $domain $__RRTYPE
-update add $domain $__TTL $__RRTYPE $__IP
-show
-send
-answer
-quit
-EOF
-
-$__PROG -d $__TCP $DATFILE >$ERRFILE 2>&1
-
-# nsupdate always return success
-write_log 7 "(k)nsupdate reports:${N}$(cat $ERRFILE)"
-
-return 0
diff --git a/ddns-scripts/files/usr/lib/ddns/update_route53_v1.sh b/ddns-scripts/files/usr/lib/ddns/update_route53_v1.sh
deleted file mode 100644
index 6d752ba9e..000000000
--- a/ddns-scripts/files/usr/lib/ddns/update_route53_v1.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-# Distributed under the terms of the GNU General Public License (GPL) version 2.0
-# based on Yuval Adam's route53.sh found at https://github.com/yuvadm/route53-ddns/blob/master/route53.sh
-# 2017 Max Berger <max at berger dot name>
-
-[ -z "${CURL_SSL}" ] && write_log 14 "Amazon AWS Route53 communication require cURL with SSL support. Please install"
-[ -z "{$username}" ] && write_log 14 "Service section not configured correctly! Missing key as 'username'"
-[ -z "${password}" ] && write_log 14 "Service section not configured correctly! Missing secret as 'password'"
-[ -z "${domain}" ] && write_log 14 "Service section not configured correctly! Missing zone id as 'domain'"
-
-ENDPOINT="route53.amazonaws.com"
-RECORD_TTL=300
-RECORD_NAME="${lookup_host}."
-[ ${use_ipv6} -eq 0 ] && RECORD_TYPE="A"
-[ ${use_ipv6} -eq 1 ] && RECORD_TYPE="AAAA"
-RECORD_VALUE="${LOCAL_IP}"
-HOSTED_ZONE_ID="${domain}"
-API_PATH="/2013-04-01/hostedzone/${HOSTED_ZONE_ID}/rrset/"
-
-AWS_ACCESS_KEY_ID="${username}"
-AWS_SECRET_ACCESS_KEY="${password}"
-AWS_REGION='us-east-1'
-AWS_SERVICE='route53'
-
-hash() {
-    msg="$1"
-    echo -en "${msg}" | openssl dgst -sha256 | sed 's/^.* //'
-}
-
-sign_plain() {
-    # Sign message using a plaintext key
-    key="$1"
-    msg="$2"
-    echo -en "${msg}" | openssl dgst -hex -sha256 -hmac "${key}" | sed 's/^.* //'
-}
-
-sign() {
-    # Sign message using a hex formatted key
-    key="$1"
-    msg="$2"
-    echo -en "${msg}" | openssl dgst -hex -sha256 -mac HMAC -macopt "hexkey:${key}" | sed 's/^.* //'
-}
-
-request_body="<?xml version=\"1.0\" encoding=\"UTF-8\"?> \
-<ChangeResourceRecordSetsRequest xmlns=\"https://route53.amazonaws.com/doc/2013-04-01/\"> \
-<ChangeBatch> \
-   <Changes> \
-      <Change> \
-         <Action>UPSERT</Action> \
-         <ResourceRecordSet> \
-            <Name>${RECORD_NAME}</Name> \
-            <Type>${RECORD_TYPE}</Type> \
-            <TTL>${RECORD_TTL}</TTL> \
-            <ResourceRecords> \
-               <ResourceRecord> \
-                  <Value>${RECORD_VALUE}</Value> \
-               </ResourceRecord> \
-            </ResourceRecords> \
-         </ResourceRecordSet> \
-      </Change> \
-   </Changes> \
-</ChangeBatch> \
-</ChangeResourceRecordSetsRequest>"
-
-fulldate="$(date --utc +%Y%m%dT%H%M%SZ)"
-shortdate="$(date --utc +%Y%m%d)"
-signed_headers="host;x-amz-date"
-request_hash="$(hash "${request_body}")"
-canonical_request="POST\n${API_PATH}\n\nhost:route53.amazonaws.com\nx-amz-date:${fulldate}\n\n${signed_headers}\n${request_hash}"
-
-date_key="$(sign_plain "AWS4${AWS_SECRET_ACCESS_KEY}" "${shortdate}")"
-region_key="$(sign "${date_key}" ${AWS_REGION})"
-service_key="$(sign "${region_key}" ${AWS_SERVICE})"
-signing_key="$(sign "${service_key}" aws4_request)"
-
-credential="${shortdate}/${AWS_REGION}/${AWS_SERVICE}/aws4_request"
-sigmsg="AWS4-HMAC-SHA256\n${fulldate}\n${credential}\n$(hash "${canonical_request}")"
-
-signature="$(sign "${signing_key}" "${sigmsg}")"
-
-authorization="AWS4-HMAC-SHA256 Credential=${AWS_ACCESS_KEY_ID}/${credential}, SignedHeaders=${signed_headers}, Signature=${signature}"
-
-ANSWER="$(flock /tmp/$(basename -s .sh "$0").lock curl \
-    -X "POST" \
-    -H "Host: route53.amazonaws.com" \
-    -H "X-Amz-Date: ${fulldate}" \
-    -H "Authorization: ${authorization}" \
-    -H "Content-Type: text/xml" \
-    -d "$request_body" \
-    "https://${ENDPOINT}${API_PATH}")"
-write_log 7 "${ANSWER}"
-
-echo "${ANSWER}" | grep -F "Error" >/dev/null && return 1
-echo "${ANSWER}" | grep -F "ChangeInfo" >/dev/null && return 0
-return 2
diff --git a/ddns-scripts/files/usr/share/ddns/default/3322.org.json b/ddns-scripts/files/usr/share/ddns/default/3322.org.json
deleted file mode 100644
index d166dc44d..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/3322.org.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"name": "3322.org",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@members.3322.org/dyndns/update?system=dyndns&hostname=[DOMAIN]&myip=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/able.or.kr.json b/ddns-scripts/files/usr/share/ddns/default/able.or.kr.json
deleted file mode 100644
index f4f7c08d4..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/able.or.kr.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"name": "able.or.kr",
-	"ipv4": {
-		"url": "http://able.or.kr/ddns/src/update.php?hostname=[DOMAIN]&myip=[IP]&ddnsuser=[USERNAME]&pwd=[PASSWORD]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/afraid.org-basicauth.json b/ddns-scripts/files/usr/share/ddns/default/afraid.org-basicauth.json
deleted file mode 100644
index b4f73fa55..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/afraid.org-basicauth.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "afraid.org-basicauth",
-	"ipv4": {
-		"url": "https://[USERNAME]:[PASSWORD]@freedns.afraid.org/nic/update?hostname=[DOMAIN]&myip=[IP]"
-	},
-	"ipv6": {
-		"url": "https://[USERNAME]:[PASSWORD]@freedns.afraid.org/nic/update?hostname=[DOMAIN]&myip=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/afraid.org-keyauth.json b/ddns-scripts/files/usr/share/ddns/default/afraid.org-keyauth.json
deleted file mode 100644
index 166b004ba..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/afraid.org-keyauth.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "afraid.org-keyauth",
-	"ipv4": {
-		"url": "https://freedns.afraid.org/dynamic/update.php?[PASSWORD]&address=[IP]"
-	},
-	"ipv6": {
-		"url": "https://freedns.afraid.org/dynamic/update.php?[PASSWORD]&address=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/afraid.org-v2-basic.json b/ddns-scripts/files/usr/share/ddns/default/afraid.org-v2-basic.json
deleted file mode 100644
index 436caf488..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/afraid.org-v2-basic.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "afraid.org-v2-basic",
-	"ipv4": {
-		"url": "https://[USERNAME]:[PASSWORD]@sync.afraid.org/u/?h=[DOMAIN]&ip=[IP]"
-	},
-	"ipv6": {
-		"url": "https://[USERNAME]:[PASSWORD]@v6.sync.afraid.org/u/?h=[DOMAIN]&ip=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/afraid.org-v2-token.json b/ddns-scripts/files/usr/share/ddns/default/afraid.org-v2-token.json
deleted file mode 100644
index 0786dd823..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/afraid.org-v2-token.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "afraid.org-v2-token",
-	"ipv4": {
-		"url": "https://sync.afraid.org/u/[PASSWORD]/?address=[IP]"
-	},
-	"ipv6": {
-		"url": "https://v6.sync.afraid.org/u/[PASSWORD]/?address=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/all-inkl.com.json b/ddns-scripts/files/usr/share/ddns/default/all-inkl.com.json
deleted file mode 100644
index d0f5b7369..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/all-inkl.com.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "all-inkl.com",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@dyndns.kasserver.com/?myip=[IP]"
-	},
-	"ipv6": {
-		"url": "http://[USERNAME]:[PASSWORD]@dyndns.kasserver.com/?myip=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/bind-nsupdate.json b/ddns-scripts/files/usr/share/ddns/default/bind-nsupdate.json
deleted file mode 100644
index f91806a15..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/bind-nsupdate.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "bind-nsupdate",
-	"ipv4": {
-		"url": "update_nsupdate.sh"
-	},
-	"ipv6": {
-		"url": "update_nsupdate.sh"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/changeip.com.json b/ddns-scripts/files/usr/share/ddns/default/changeip.com.json
deleted file mode 100644
index 3472f0b30..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/changeip.com.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"name": "changeip.com",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@nic.changeip.com/nic/update?u=[USERNAME]&p=[PASSWORD]&cmd=update&hostname=[DOMAIN]&ip=[IP]",
-		"answer": "Successful"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/cloudflare.com-v4.json b/ddns-scripts/files/usr/share/ddns/default/cloudflare.com-v4.json
deleted file mode 100644
index 66a1d118f..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/cloudflare.com-v4.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "cloudflare.com-v4",
-	"ipv4": {
-		"url": "update_cloudflare_com_v4.sh"
-	},
-	"ipv6": {
-		"url": "update_cloudflare_com_v4.sh"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/cnkuai.cn.json b/ddns-scripts/files/usr/share/ddns/default/cnkuai.cn.json
deleted file mode 100644
index 1e9bebf5f..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/cnkuai.cn.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "cnkuai.cn",
-	"ipv4": {
-		"url": "update_cnkuai_cn.sh"
-	},
-	"ipv6": {
-		"url": "update_cnkuai_cn.sh"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/core-networks.de.json b/ddns-scripts/files/usr/share/ddns/default/core-networks.de.json
deleted file mode 100644
index c334d7733..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/core-networks.de.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"name": "core-networks.de",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@dyndns.core-networks.de/?hostname=[DOMAIN]&myip=[IP]&keepipv6=1",
-		"answer": "good"
-	},
-	"ipv6": {
-		"url": "http://[USERNAME]:[PASSWORD]@dyndns.core-networks.de/?hostname=[DOMAIN]&myip=[IP]&keepipv4=1",
-		"answer": "good"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/ddnss.de.json b/ddns-scripts/files/usr/share/ddns/default/ddnss.de.json
deleted file mode 100644
index 17cdf0e3b..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/ddnss.de.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"name": "ddnss.de",
-	"ipv4": {
-		"url": "http://ip4.ddnss.de/upd.php?user=[USERNAME]&pwd=[PASSWORD]&host=[DOMAIN]&ip=[IP]",
-		"answer": "Updated|No change"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/ddo.jp.json b/ddns-scripts/files/usr/share/ddns/default/ddo.jp.json
deleted file mode 100644
index 1cf53b572..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/ddo.jp.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"name": "ddo.jp",
-	"ipv4": {
-		"url": "http://free.ddo.jp/dnsupdate.php?dn=[DOMAIN]&pw=[PASSWORD]&ip=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/desec.io.json b/ddns-scripts/files/usr/share/ddns/default/desec.io.json
deleted file mode 100644
index 227762ef6..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/desec.io.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"name": "desec.io",
-	"ipv4": {
-		"url": "http://update.dedyn.io/update?username=[USERNAME]&password=[PASSWORD]&hostname=[DOMAIN]&myipv4=[IP]",
-		"answer": "good|nochg"
-	},
-	"ipv6": {
-		"url": "http://update.dedyn.io/update?username=[USERNAME]&password=[PASSWORD]&hostname=[DOMAIN]&myipv6=[IP]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dhis.org.json b/ddns-scripts/files/usr/share/ddns/default/dhis.org.json
deleted file mode 100644
index cc2ce3e5b..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/dhis.org.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "dhis.org",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@is.dhis.org/"
-	},
-	"ipv6": {
-		"url": "http://[USERNAME]:[PASSWORD]@is.dhis.org/"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/digitalocean.com-v2.json b/ddns-scripts/files/usr/share/ddns/default/digitalocean.com-v2.json
deleted file mode 100644
index abeac560f..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/digitalocean.com-v2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "digitalocean.com-v2",
-	"ipv4": {
-		"url": "update_digitalocean_com_v2.sh"
-	},
-	"ipv6": {
-		"url": "update_digitalocean_com_v2.sh"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dnsdynamic.org.json b/ddns-scripts/files/usr/share/ddns/default/dnsdynamic.org.json
deleted file mode 100644
index f1fd1810a..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/dnsdynamic.org.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"name": "dnsdynamic.org",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@www.dnsdynamic.org/api/?hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dnsever.com.json b/ddns-scripts/files/usr/share/ddns/default/dnsever.com.json
deleted file mode 100644
index 23f9ac941..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/dnsever.com.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"name": "dnsever.com",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@dyna.dnsever.com/update.php?host[[DOMAIN]]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dnsexit.com.json b/ddns-scripts/files/usr/share/ddns/default/dnsexit.com.json
deleted file mode 100644
index 89d7a8147..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/dnsexit.com.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"name": "dnsexit.com",
-	"ipv4": {
-		"url": "http://update.dnsexit.com/RemoteUpdate.sv?login=[USERNAME]&password=[PASSWORD]&host=[DOMAIN]&myip=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dnshome.de.json b/ddns-scripts/files/usr/share/ddns/default/dnshome.de.json
deleted file mode 100644
index f767de2bc..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/dnshome.de.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "dnshome.de",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@www.dnshome.de/dyndns.php?hostname=[DOMAIN]&ip=[IP]"
-	},
-	"ipv6": {
-		"url": "http://[USERNAME]:[PASSWORD]@www.dnshome.de/dyndns.php?hostname=[DOMAIN]&ip6=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dnsmadeeasy.com.json b/ddns-scripts/files/usr/share/ddns/default/dnsmadeeasy.com.json
deleted file mode 100644
index 744301af5..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/dnsmadeeasy.com.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"name": "dnsmadeeasy.com",
-	"ipv4": {
-		"url": "http://cp.dnsmadeeasy.com/servlet/updateip?username=[USERNAME]&password=[PASSWORD]&id=[DOMAIN]&ip=[IP]",
-		"answer": "success|ip-same"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dnsmax.com.json b/ddns-scripts/files/usr/share/ddns/default/dnsmax.com.json
deleted file mode 100644
index e84667a77..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/dnsmax.com.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"name": "dnsmax.com",
-	"ipv4": {
-		"url": "http://update.dnsmax.com/update/?username=[USERNAME]&password=[PASSWORD]&resellerid=1&clientname=openwrt&clientversion=8.09&protocolversion=2.0&updatehostname=[DOMAIN]&ip=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dnsomatic.com.json b/ddns-scripts/files/usr/share/ddns/default/dnsomatic.com.json
deleted file mode 100644
index 09df1eb00..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/dnsomatic.com.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"name": "dnsomatic.com",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@updates.dnsomatic.com/nic/update?hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dnspark.com.json b/ddns-scripts/files/usr/share/ddns/default/dnspark.com.json
deleted file mode 100644
index f10e1f246..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/dnspark.com.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"name": "dnspark.com",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@control.dnspark.com/api/dynamic/update.php?hostname=[DOMAIN]&ip=[IP]",
-		"answer": "ok|nochange"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/do.de.json b/ddns-scripts/files/usr/share/ddns/default/do.de.json
deleted file mode 100644
index 3884a01ae..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/do.de.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"name": "do.de",
-	"ipv4": {
-		"url": "http://ddns.do.de/?myip=[IP]&hostname=[DOMAIN]&username=[USERNAME]&password=[PASSWORD]",
-		"answer": "good|nochg"
-	},
-	"ipv6": {
-		"url": "http://ddns.do.de/?myip=[IP]&hostname=[DOMAIN]&username=[USERNAME]&password=[PASSWORD]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/domopoli.de.json b/ddns-scripts/files/usr/share/ddns/default/domopoli.de.json
deleted file mode 100644
index 517751cc4..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/domopoli.de.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"name": "domopoli.de",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@http://dyndns.domopoli.de/nic/update?hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dtdns.com.json b/ddns-scripts/files/usr/share/ddns/default/dtdns.com.json
deleted file mode 100644
index 14941c0c7..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/dtdns.com.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"name": "dtdns.com",
-	"ipv4": {
-		"url": "http://www.dtdns.com/api/autodns.cfm?id=[DOMAIN]&pw=[PASSWORD]&ip=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/duckdns.org.json b/ddns-scripts/files/usr/share/ddns/default/duckdns.org.json
deleted file mode 100644
index 625c9f990..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/duckdns.org.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"name": "duckdns.org",
-	"ipv4": {
-		"url": "http://www.duckdns.org/update?domains=[DOMAIN]&token=[PASSWORD]&ip=[IP]",
-		"answer": "OK"
-	},
-	"ipv6": {
-		"url": "http://www.duckdns.org/update?domains=[DOMAIN]&token=[PASSWORD]&ipv6=[IP]",
-		"answer": "OK"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/duiadns.net.json b/ddns-scripts/files/usr/share/ddns/default/duiadns.net.json
deleted file mode 100644
index bbf9998be..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/duiadns.net.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "duiadns.net",
-	"ipv4": {
-		"url": "http://ip.duiadns.net/dynamic.duia?host=[DOMAIN]&password=[PASSWORD]&ip4=[IP]"
-	},
-	"ipv6": {
-		"url": "http://ip.duiadns.net/dynamic.duia?host=[DOMAIN]&password=[PASSWORD]&ip6=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dy.fi.json b/ddns-scripts/files/usr/share/ddns/default/dy.fi.json
deleted file mode 100644
index ce9e4fd81..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/dy.fi.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"name": "dy.fi",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@www.dy.fi/nic/update?hostname=[DOMAIN]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dyn.com.json b/ddns-scripts/files/usr/share/ddns/default/dyn.com.json
deleted file mode 100644
index 0ac779b06..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/dyn.com.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"name": "dyn.com",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@members.dyndns.org/v3/update?hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	},
-	"ipv6": {
-		"url": "http://[USERNAME]:[PASSWORD]@members.dyndns.org/v3/update?hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dyndns.it.json b/ddns-scripts/files/usr/share/ddns/default/dyndns.it.json
deleted file mode 100644
index 2cffb347f..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/dyndns.it.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"name": "dyndns.it",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@update.dyndns.it/nic/update?system=dyndns&hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dyndns.org.json b/ddns-scripts/files/usr/share/ddns/default/dyndns.org.json
deleted file mode 100644
index a0c064f4d..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/dyndns.org.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"name": "dyndns.org",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@members.dyndns.org/v3/update?hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	},
-	"ipv6": {
-		"url": "http://[USERNAME]:[PASSWORD]@members.dyndns.org/v3/update?hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dyndnss.net.json b/ddns-scripts/files/usr/share/ddns/default/dyndnss.net.json
deleted file mode 100644
index 65b335137..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/dyndnss.net.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"name": "dyndnss.net",
-	"ipv4": {
-		"url": "http://www.dyndnss.net/?user=[USERNAME]&pass=[PASSWORD]&domain=[DOMAIN]&updater=other"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dynsip.org.json b/ddns-scripts/files/usr/share/ddns/default/dynsip.org.json
deleted file mode 100644
index ceb2e1500..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/dynsip.org.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"name": "dynsip.org",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@dynsip.org/nic/update?hostname=[DOMAIN]&myip=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dynu.com.json b/ddns-scripts/files/usr/share/ddns/default/dynu.com.json
deleted file mode 100644
index 2c25ea90f..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/dynu.com.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "dynu.com",
-	"ipv4": {
-		"url": "http://api.dynu.com/nic/update?hostname=[DOMAIN]&myip=[IP]&username=[USERNAME]&password=[PASSWORD]"
-	},
-	"ipv6": {
-		"url": "http://api.dynu.com/nic/update?hostname=[DOMAIN]&myipv6=[IP]&username=[USERNAME]&password=[PASSWORD]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dynv6.com.json b/ddns-scripts/files/usr/share/ddns/default/dynv6.com.json
deleted file mode 100644
index 66c62aa70..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/dynv6.com.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"name": "dynv6.com",
-	"ipv4": {
-		"url": "http://dynv6.com/api/update?hostname=[DOMAIN]&token=[PASSWORD]&ipv4=[IP]",
-		"answer": "updated|unchanged"
-	},
-	"ipv6": {
-		"url": "http://dynv6.com/api/update?hostname=[DOMAIN]&token=[PASSWORD]&ipv6=[IP]",
-		"answer": "updated|unchanged"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/easydns.com.json b/ddns-scripts/files/usr/share/ddns/default/easydns.com.json
deleted file mode 100644
index 6f6855d15..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/easydns.com.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"name": "easydns.com",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@api.cp.easydns.com/dyn/generic.php?hostname=[DOMAIN]&myip=[IP]",
-		"answer": "OK|NOERROR"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/editdns.net.json b/ddns-scripts/files/usr/share/ddns/default/editdns.net.json
deleted file mode 100644
index deb60fc0c..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/editdns.net.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"name": "editdns.net",
-	"ipv4": {
-		"url": "http://dyndns-free.editdns.net/api/dynLinux.php?p=[PASSWORD]&r=[DOMAIN]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/freedns.42.pl.json b/ddns-scripts/files/usr/share/ddns/default/freedns.42.pl.json
deleted file mode 100644
index c04dc1dd4..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/freedns.42.pl.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"name": "freedns.42.pl",
-	"ipv4": {
-		"url": "update_freedns_42_pl.sh"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/gandi.net.json b/ddns-scripts/files/usr/share/ddns/default/gandi.net.json
deleted file mode 100644
index de54a16a4..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/gandi.net.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "gandi.net",
-	"ipv4": {
-		"url": "update_gandi_net.sh"
-	},
-	"ipv6": {
-		"url": "update_gandi_net.sh"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/godaddy.com-v1.json b/ddns-scripts/files/usr/share/ddns/default/godaddy.com-v1.json
deleted file mode 100644
index 211e0e5f5..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/godaddy.com-v1.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "godaddy.com-v1",
-	"ipv4": {
-		"url": "update_godaddy_com_v1.sh"
-	},
-	"ipv6": {
-		"url": "update_godaddy_com_v1.sh"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/goip.de.json b/ddns-scripts/files/usr/share/ddns/default/goip.de.json
deleted file mode 100644
index 5aaf3baed..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/goip.de.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "goip.de",
-	"ipv4": {
-		"url": "http://www.goip.de/setip?username=[USERNAME]&password=[PASSWORD]&subdomain=[DOMAIN]&ip=[IP]"
-	},
-	"ipv6": {
-		"url": "http://www.goip.de/setip?username=[USERNAME]&password=[PASSWORD]&subdomain=[DOMAIN]&ip6=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/google.com.json b/ddns-scripts/files/usr/share/ddns/default/google.com.json
deleted file mode 100644
index edfe461c8..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/google.com.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"name": "google.com",
-	"ipv4": {
-		"url": "https://[USERNAME]:[PASSWORD]@domains.google.com/nic/update?hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	},
-	"ipv6": {
-		"url": "https://[USERNAME]:[PASSWORD]@domains.google.com/nic/update?hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/he.net.json b/ddns-scripts/files/usr/share/ddns/default/he.net.json
deleted file mode 100644
index 7043efe67..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/he.net.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"name": "he.net",
-	"ipv4": {
-		"url": "http://[DOMAIN]:[PASSWORD]@dyn.dns.he.net/nic/update?hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	},
-	"ipv6": {
-		"url": "http://[DOMAIN]:[PASSWORD]@dyn.dns.he.net/nic/update?hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/inwx.de.json b/ddns-scripts/files/usr/share/ddns/default/inwx.de.json
deleted file mode 100644
index 10b16a985..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/inwx.de.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"name": "inwx.de",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@dyndns.inwx.com/nic/update?myip=[IP]",
-		"answer": "good|nochg"
-	},
-	"ipv6": {
-		"url": "http://[USERNAME]:[PASSWORD]@dyndns.inwx.com/nic/update?myipv6=[IP]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/joker.com.json b/ddns-scripts/files/usr/share/ddns/default/joker.com.json
deleted file mode 100644
index af897f18e..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/joker.com.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"name": "joker.com",
-	"ipv4": {
-		"url": "http://svc.joker.com/nic/update?username=[USERNAME]&password=[PASSWORD]&myip=[IP]&hostname=[DOMAIN]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/loopia.se.json b/ddns-scripts/files/usr/share/ddns/default/loopia.se.json
deleted file mode 100644
index f1c3fc22f..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/loopia.se.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"name": "loopia.se",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@dns.loopia.se/XDynDNSServer/XDynDNS.php?system=custom&hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	},
-	"ipv6": {
-		"url": "http://[USERNAME]:[PASSWORD]@dns.loopia.se/XDynDNSServer/XDynDNS.php?system=custom&hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/moniker.com.json b/ddns-scripts/files/usr/share/ddns/default/moniker.com.json
deleted file mode 100644
index c5b7aa984..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/moniker.com.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"name": "moniker.com",
-	"ipv4": {
-		"url": "https://dynamicdns.key-systems.net/update.php?hostname=[DOMAIN]&password=[PASSWORD]&ip=[IP]",
-		"answer": "success"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/mydns.ip.json b/ddns-scripts/files/usr/share/ddns/default/mydns.ip.json
deleted file mode 100644
index 11e988735..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/mydns.ip.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "mydns.jp",
-	"ipv4": {
-		"url": "http://www.mydns.jp/directip.html?MID=[USERNAME]&PWD=[PASSWORD]&IPV4ADDR=[IP]"
-	},
-	"ipv6": {
-		"url": "http://www.mydns.jp/directip.html?MID=[USERNAME]&PWD=[PASSWORD]&IPV6ADDR=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/myip.co.ua.json b/ddns-scripts/files/usr/share/ddns/default/myip.co.ua.json
deleted file mode 100644
index bf3609d9e..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/myip.co.ua.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"name": "myip.co.ua",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@myip.co.ua/update?hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/myonlineportal.net.json b/ddns-scripts/files/usr/share/ddns/default/myonlineportal.net.json
deleted file mode 100644
index b3196d6d6..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/myonlineportal.net.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"name": "myonlineportal.net",
-	"ipv4": {
-		"url": "http://myonlineportal.net/updateddns?hostname=[DOMAIN]&ip=[IP]&username=[USERNAME]&password=[PASSWORD]",
-		"answer": "good|nochg"
-	},
-	"ipv6": {
-		"url": "http://myonlineportal.net/updateddns?hostname=[DOMAIN]&ip6=[IP]&username=[USERNAME]&password=[PASSWORD]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/mythic-beasts.com.json b/ddns-scripts/files/usr/share/ddns/default/mythic-beasts.com.json
deleted file mode 100644
index 9b2556bec..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/mythic-beasts.com.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "mythic-beasts.com",
-	"ipv4": {
-		"url": "http://dnsapi4.mythic-beasts.com/?domain=[USERNAME]&password=[PASSWORD]&command=REPLACE%20[DOMAIN]%2060%20A%20DYNAMIC_IP&origin=."
-	},
-	"ipv6": {
-		"url": "http://dnsapi6.mythic-beasts.com/?domain=[USERNAME]&password=[PASSWORD]&command=REPLACE%20[DOMAIN]%2060%20AAAA%20DYNAMIC_IP&origin=."
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/namecheap.com.json b/ddns-scripts/files/usr/share/ddns/default/namecheap.com.json
deleted file mode 100644
index bbb0c1fc3..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/namecheap.com.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"name": "namecheap.com",
-	"ipv4": {
-		"url": "http://dynamicdns.park-your-domain.com/update?host=[USERNAME]&domain=[DOMAIN]&password=[PASSWORD]&ip=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/nettica.com.json b/ddns-scripts/files/usr/share/ddns/default/nettica.com.json
deleted file mode 100644
index e0768ec4a..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/nettica.com.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"name": "nettica.com",
-	"ipv4": {
-		"url": "http://www.nettica.com/Domain/Update.aspx?U=[USERNAME]&PC=[PASSWORD]&FQDN=[DOMAIN]&N=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/no-ip.com.json b/ddns-scripts/files/usr/share/ddns/default/no-ip.com.json
deleted file mode 100644
index e0f8ccb54..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/no-ip.com.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"name": "no-ip.com",
-	"ipv4": {
-		"url": "update_no-ip_com.sh"
-	},
-	"ipv6": {
-		"url": "update_no-ip_com.sh"
-	}
-}
-
diff --git a/ddns-scripts/files/usr/share/ddns/default/no-ip.pl.json b/ddns-scripts/files/usr/share/ddns/default/no-ip.pl.json
deleted file mode 100644
index 323a415ae..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/no-ip.pl.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "no-ip.pl",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@update.no-ip.pl/?hostname=[DOMAIN]"
-	},
-	"ipv6": {
-		"url": "http://[USERNAME]:[PASSWORD]@update.no-ip.pl/?hostname=[DOMAIN]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/now-dns.com.json b/ddns-scripts/files/usr/share/ddns/default/now-dns.com.json
deleted file mode 100644
index 8c4a2209b..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/now-dns.com.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"name": "now-dns.com",
-	"ipv4": {
-		"url": "https://[USERNAME]:[PASSWORD]@now-dns.com/update?hostname=[DOMAIN]",
-		"answer": "good|nochg"
-	},
-	"ipv6": {
-		"url": "https://[USERNAME]:[PASSWORD]@now-dns.com/update?hostname=[DOMAIN]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/nsupdate.info.json b/ddns-scripts/files/usr/share/ddns/default/nsupdate.info.json
deleted file mode 100644
index 435e41dfe..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/nsupdate.info.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"name": "nsupdate.info",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@ipv4.nsupdate.info/nic/update?hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	},
-	"ipv6": {
-		"url": "http://[USERNAME]:[PASSWORD]@ipv6.nsupdate.info/nic/update?hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/opendns.com.json b/ddns-scripts/files/usr/share/ddns/default/opendns.com.json
deleted file mode 100644
index 35d4953ce..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/opendns.com.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"name":"opendns.com",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@updates.opendns.com/nic/update?hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/oray.com.json b/ddns-scripts/files/usr/share/ddns/default/oray.com.json
deleted file mode 100644
index 317280573..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/oray.com.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"name": "oray.com",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@ddns.oray.com/ph/update?hostname=[DOMAIN]&myip=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/ovh.com.json b/ddns-scripts/files/usr/share/ddns/default/ovh.com.json
deleted file mode 100644
index 92f2066a6..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/ovh.com.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"name": "ovh.com",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@www.ovh.com/nic/update?system=dyndns&hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/regfish.de.json b/ddns-scripts/files/usr/share/ddns/default/regfish.de.json
deleted file mode 100644
index 9b1799592..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/regfish.de.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"name": "regfish.de",
-	"ipv4": {
-		"url": "http://dyndns.regfish.de/?fqdn=[DOMAIN]&forcehost=1&authtype=secure&token=[PASSWORD]&ipv4=[IP]",
-		"answer": "success|100|101"
-	},
-	"ipv6": {
-		"url": "http://dyndns.regfish.de/?fqdn=[DOMAIN]&forcehost=1&authtype=secure&token=[PASSWORD]&ipv6=[IP]",
-		"answer": "success|100|101"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/route53-v1.json b/ddns-scripts/files/usr/share/ddns/default/route53-v1.json
deleted file mode 100644
index bf5d8d37b..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/route53-v1.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "route53-v1",
-	"ipv4": {
-		"url": "update_route53_v1.sh"
-	},
-	"ipv6": {
-		"url": "update_route53_v1.sh"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/schokokeks.org.json b/ddns-scripts/files/usr/share/ddns/default/schokokeks.org.json
deleted file mode 100644
index 480c06931..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/schokokeks.org.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"name": "schokokeks.org",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@dyndns.schokokeks.org/nic/update?myip=[IP]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/selfhost.de.json b/ddns-scripts/files/usr/share/ddns/default/selfhost.de.json
deleted file mode 100644
index 0db3895c8..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/selfhost.de.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"name": "selfhost.de",
-	"ipv4": {
-		"url": "http://carol.selfhost.de/update?username=[USERNAME]&password=[PASSWORD]&myip=[IP]&hostname=1",
-		"answer": "good|nochg|200|204"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/sitelutions.com.json b/ddns-scripts/files/usr/share/ddns/default/sitelutions.com.json
deleted file mode 100644
index a9fec1fb7..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/sitelutions.com.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"name": "sitelutions.com",
-	"ipv4": {
-		"url": "https://dnsup.sitelutions.com/dnsup?user=[USERNAME]&pass=[PASSWORD]&id=[DOMAIN]&ip=[IP]",
-		"answer": "success"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/spdyn.de.json b/ddns-scripts/files/usr/share/ddns/default/spdyn.de.json
deleted file mode 100644
index a9352efc9..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/spdyn.de.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"name": "spdyn.de",
-	"ipv4": {
-		"url": "https://update.spdyn.de/nic/update?hostname=[DOMAIN]&myip=[IP]&user=[USERNAME]&pass=[PASSWORD]",
-		"answer": "good|nochg"
-	},
-	"ipv6": {
-		"url": "https://update.spdyn.de/nic/update?hostname=[DOMAIN]&myip=[IP]&user=[USERNAME]&pass=[PASSWORD]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/strato.com.json b/ddns-scripts/files/usr/share/ddns/default/strato.com.json
deleted file mode 100644
index a81c015ce..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/strato.com.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"name": "strato.com",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@dyndns.strato.com/nic/update?hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/system-ns.com.json b/ddns-scripts/files/usr/share/ddns/default/system-ns.com.json
deleted file mode 100644
index 4c4ca7fce..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/system-ns.com.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"name": "system-ns.com",
-
-	"ipv4": {
-		"url": "http://system-ns.com/api?type=dynamic&command=set&domain=[DOMAIN]&token=[PASSWORD]&ip=[IP]",
-		"answer": "0"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/thatip.com.json b/ddns-scripts/files/usr/share/ddns/default/thatip.com.json
deleted file mode 100644
index 18e72b753..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/thatip.com.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"name": "thatip.com",
-	"ipv4": {
-		"url": "http://update.dnsmax.com/update/?username=[USERNAME]&password=[PASSWORD]&resellerid=2&clientname=openwrt&clientversion=8.09&protocolversion=2.0&updatehostname=[DOMAIN]&ip=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/twodns.de.json b/ddns-scripts/files/usr/share/ddns/default/twodns.de.json
deleted file mode 100644
index 2d20e76c6..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/twodns.de.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"name": "twodns.de",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@update.twodns.de/update?hostname=[DOMAIN]&ip=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/udmedia.de.json b/ddns-scripts/files/usr/share/ddns/default/udmedia.de.json
deleted file mode 100644
index fa9ff4c59..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/udmedia.de.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"name": "udmedia.de",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@www.udmedia.de/nic/update?myip=[IP]"
-	},
-	"ipv6": {
-		"url": "http://[USERNAME]:[PASSWORD]@www.udmedia.de/nic/update?myip=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/variomedia.de.json b/ddns-scripts/files/usr/share/ddns/default/variomedia.de.json
deleted file mode 100644
index fa86f4e62..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/variomedia.de.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"name": "variomedia.de",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@dyndns.variomedia.de/nic/update?hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	},
-	"ipv6": {
-		"url": "http://[USERNAME]:[PASSWORD]@dyndns.variomedia.de/nic/update?hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/xlhost.de.json b/ddns-scripts/files/usr/share/ddns/default/xlhost.de.json
deleted file mode 100644
index 302cdc630..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/xlhost.de.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"name": "xlhost.de",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@nsupdate.xlhost.de/nic/update?hostname=[DOMAIN]&myip=[IP]",
-		"answer": "good|nochg"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/zerigo.com.json b/ddns-scripts/files/usr/share/ddns/default/zerigo.com.json
deleted file mode 100644
index 0e07982a8..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/zerigo.com.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"name": "zerigo.com",
-	"ipv4": {
-		"url": "http://update.zerigo.com/dynamic?user=[USERNAME]&password=[PASSWORD]&host=[DOMAIN]&ip=[IP]",
-		"answer": "ok"
-	},
-	"ipv6": {
-		"url": "http://update.zerigo.com/dynamic?user=[USERNAME]&password=[PASSWORD]&host=[DOMAIN]&ip=[IP]",
-		"answer": "ok"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/zoneedit.com.json b/ddns-scripts/files/usr/share/ddns/default/zoneedit.com.json
deleted file mode 100644
index dd3c2263a..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/zoneedit.com.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"name": "zoneedit.com",
-	"ipv4": {
-		"url": "http://[USERNAME]:[PASSWORD]@dynamic.zoneedit.com/auth/dynamic.html?host=[DOMAIN]&dnsto=[IP]"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/default/zzzz.io.json b/ddns-scripts/files/usr/share/ddns/default/zzzz.io.json
deleted file mode 100644
index d3a9d20d8..000000000
--- a/ddns-scripts/files/usr/share/ddns/default/zzzz.io.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"name": "zzzz.io",
-	"ipv4": {
-		"url": "http://zzzz.io/api/v1/update/[DOMAIN]/?token=[PASSWORD]&ip=[IP]",
-		"answer": "Updated|No change"
-	},
-	"ipv6": {
-		"url": "http://zzzz.io/api/v1/update/[DOMAIN]/?token=[PASSWORD]&type=aaaa&ip=[IP]",
-		"answer": "Updated|No change"
-	}
-}
diff --git a/ddns-scripts/files/usr/share/ddns/list b/ddns-scripts/files/usr/share/ddns/list
deleted file mode 100644
index 35b7aa7a0..000000000
--- a/ddns-scripts/files/usr/share/ddns/list
+++ /dev/null
@@ -1,70 +0,0 @@
-3322.org
-able.or.kr
-afraid.org-basicauth
-afraid.org-keyauth
-afraid.org-v2-basic
-afraid.org-v2-token
-all-inkl.com
-changeip.com
-core-networks.de
-ddnss.de
-ddo.jp
-desec.io
-dhis.org
-dnsdynamic.org
-dnsever.com
-dnsexit.com
-dnshome.de
-dnsmadeeasy.com
-dnsmax.com
-dnsomatic.com
-dnspark.com
-do.de
-domopoli.de
-dtdns.com
-duckdns.org
-duiadns.net
-dy.fi
-dyn.com
-dyndns.it
-dyndns.org
-dyndnss.net
-dynsip.org
-dynu.com
-dynv6.com
-easydns.com
-editdns.net
-goip.de
-google.com
-he.net
-inwx.de
-joker.com
-loopia.se
-moniker.com
-mydns.ip
-myip.co.ua
-myonlineportal.net
-mythic-beasts.com
-namecheap.com
-nettica.com
-no-ip.pl
-now-dns.com
-nsupdate.info
-opendns.com
-oray.com
-ovh.com
-regfish.de
-schokokeks.org
-selfhost.de
-sitelutions.com
-spdyn.de
-strato.com
-system-ns.com
-thatip.com
-twodns.de
-udmedia.de
-variomedia.de
-xlhost.de
-zerigo.com
-zoneedit.com
-zzzz.io
diff --git a/ddns-scripts/samples/ddns.config_sample b/ddns-scripts/samples/ddns.config_sample
deleted file mode 100644
index a3aa7e813..000000000
--- a/ddns-scripts/samples/ddns.config_sample
+++ /dev/null
@@ -1,314 +0,0 @@
-#
-#
-# Here you find a description on every parameter supported
-# and used by ddns-scripts and corresponding LuCI application
-#
-# Inside your ddns configuration file (/etc/config/ddns)
-# you might not find some of below described options.
-# This is because you don't need to define options
-# if using there defaults. The LuCI application will delete
-# options that configured to there default values.
-#
-# If you have a working ddns configuration from old ddns-scripts (Version 1.x)
-# everything will function the same with new scripts
-# without any changes to the configuration.
-#
-# If you like to use this file for your configuration then
-# use a copy, because the used software to modify the
-# configuration files will throw away all empty lines
-# and those starting with # (comments).
-#
-
-#####################################################################
-# Global application settings
-#
-config ddns "global"
-
-	###########
-	# set date format to use for display date in logfiles
-	# and LuCI web application.
-	# For codes see man pages of date command.
-	# default: "%F %R" (ISO 8601 format)
-#	option ddns_dateformat "%F %R"
-
-	###########
-	# set run directory to use for .pid and .update files
-	# there will be a separate file for every running service section
-	# default: "/var/run/ddns"
-#	option ddns_rundir "/var/run/ddns"
-
-	###########
-	# set log directory to use for .log files
-	# there will be a separate file for every running service section
-	# default: "/var/log/ddns"
-#	option ddns_logdir "/var/log/ddns"
-
-	###########
-	# set number of lines stored in .log file before auto truncated
-	# default: "250" lines
-#	option ddns_loglines "250"
-
-	###########
-	# Whether to allow to send Private/Special IP's to the DDNS provider
-	# IPv4: 0.x, 10.x, 127.x, 172.16.x-172.31.x, 192.168.x
-	# IPv6: ::, Fxxx:
-	# default: "0"	disabled
-#	option upd_privateip "0"
-
-#####################################################################
-# DDNS service settings
-#
-# for each service you want to serve you need a separate configuration
-# if you need IPv4 and IPv6 you need to setup 2 separate configurations
-# with different names. (i.e. "myddns_ipv4" and "myddns_ipv6")
-# do not use white-spaces or dashes "-" or "@" ":" "!" or
-# other special characters inside name.
-config service "myddns"
-
-	########### Basic settings ########################
-
-	###########
-	# enable/disable this service section
-	# default: "0"	disabled
-	option enabled "0"
-
-	###########
-	# detecting/sending IPv4 or IPv6 address to the DDNS provider
-	# set to "1" if you want to use IPv6
-	# default: "0"	use IPv4
-	option use_ipv6 "0"
-
-	###########
-	# defines the network as defined in /etc/config/network
-	# to be monitored for up/down events to start via hotplug
-	default: "wan"	for IPv4
-	default: "wan6"	for IPv6
-	option interface "wan"
-
-	###########
-	# Next you need to specify the name of the service you are
-	# connecting to "eg. dyndns.org".  The format of the update
-	# urls for several different dynamic dns services is specified
-	# in the "/usr/lib/ddns/services" file for IPv4 and in
-	# "/usr/lib/ddns/service_ipv6" file. This list is hardly complete
-	# as there are many, many different dynamic dns services.
-	# If your service is on the list you can merely specify it with the
-	# "service_name" option.  Otherwise you will need to determine
-	# the format of the url to update with.  You can either add an
-	# entry to the "/usr/lib/ddns/services" or "services_ipv6" file
-	# or specify this with the "update_url" option.
-	# If your ddns provider doesn't work with ddns-scripts because
-	# there are additional parameters or other special thinks to be done,
-	# then you could write your own script to send updates to your ddns provider.
-	# Have a look into /usr/lib/ddns/update_sample.sh
-	# The script is specified in "update_script"
-	# Either set "service_name" or one of "update_url" and "update_script"
-	# default: none
-	option service_name "dyndns.org"
-
-	# sample:
-	# "http://[USERNAME]:[PASSWORD]@members.dyndns.org/nic/update?hostname=[DOMAIN]&myip=[IP]"
-#	option update_url   ""
-
-	# sample:
-	# "/usr/lib/ddns/update_sample.sh"
-#	option update_script   ""
-
-	###########
-	# Keep an eye on providers help pages.
-	#
-	# FQDN of ONE of your defined host at DDNS provider
-	# REQUIRED to verify what the current IP at DNS using nslookup/host command
-	# default: none
-	option lookup_host ""
-
-	# Your DNS name / replace [DOMAIN] in update_url
-	# default: none
-	option domain ""
-
-	# Username of your DDNS service account / replace [USERNAME] in update_url
-	# default: none
-	option username ""
-
-	# Password of your DDNS service account / replace [PASSWORD] in update url
-	# default: none
-	option password ""
-
-	###########
-	# Optional parameters for use inside update_url
-	#
-	# parameter that will be urlencoded before replacement of [PARAMENC] inside update url
-	# default: none
-	option param_enc ""
-
-	# parameter that repace [PARAMOPT] inside update url
-	# default: none
-	option param_opt ""
-
-	###########
-	# use HTTPS for secure communication with you DDNS provider
-	# personally found some providers having problems when not sending
-	# updates via HTTPS. You must not specify "https://" in update_url.
-	# It's modified by the scripts themselves
-	# Needs GNU Wget (with SSL support) or cURL to be installed.
-	# default: "0"	do not use HTTPS
-	option use_https "0"
-
-	# if using HTTPS (see above) the transfer program tries to verify
-	# the providers server certificate. For verification there needs to be
-	# the counterpart on this machine. Specify the path or path/file where
-	# the transfer program can find them. (might need package CA-certificates)
-	# if you don't want to verify servers certificate (insecure) you should
-	# this parameter to "IGNORE" (in capital letters)
-	# default: (none)	path where CA-certificate package is installed
-	option cacert "/etc/ssl/certs"
-
-	###########
-	# for logging and control if everything work fine you can get information inside
-	# system log . Critical Errors are always send to system log.
-	# You can define which information you like to log
-	# 1 == info, notice, warning, errors
-	# 2 == notice, warning, errors
-	# 3 == warning, errors
-	# 4 == errors
-	# default: "0" off
-	option use_syslog  "0"
-
-	###########
-	# for logging and control if everything work fine you can get information inside
-	# log file. You find the file per default in /var/log/ddns/[sectionname].log
-	# The path can be modified for all log files in ddns.global section (see above)
-	# default: "1" on
-	option use_logfile "1"
-
-	########### Advanced settings #####################
-
-	###########
-	# you need to specify how ddns-scripts should detect you current local ip.
-	# the ip_source could be set to "network", "web", "interface" or "script"
-	# the parameters below specifying the additional information needed for
-	# the corresponding ip_spource configuration
-	# default: "network"
-
-	# ip_source "network" additional uses option ip_network and detects the
-	# current local ip on network as defined in /etc/config/network
-	# default: "wan"  using IPv4
-	# default: "wan6" using IPv6
-	option ip_source  "network"
-	option ip_network "wan"
-
-	# ip_source "web" additional uses option ip_url and detects the current
-	# local ip from special web sides that response with the ip address of
-	# calling host. If you are behind a firewall/NAT this is the best option
-	# since none of the local networks or interfaces will have the external ip.
-	# default: "http://checkip.dyndns.com"   using IPv4
-	# default: "http://checkipv6.dyndns.com" using IPv6
-#	option ip_source "web"
-#	option ip_url    "http://checkip.dyndns.com"
-
-	# ip_source "interface" additional uses option ip_interface
-	# ip_source "interface" uses one of the locally installed physical interfaces
-	# to detect independent from network they configured to.
-	# default: none
-#	option ip_source    "interface"
-#	option ip_interface "eth1"
-
-	# ip_source "script" additional uses option ip_script
-	# it's useful if you want to write your own script to detect the
-	# current local ip. put full path into ip_script option.
-	# The script must be executable.
-	# default: none
-#	option ip_source "script"
-#	option ip_script ""
-
-	###########
-	# force_ipversion option will set the "-4" respectively "-6" parameter
-	# on command line of transfer and DNS lookup program.
-	# So the whole communication uses the selected IP version between both ends.
-	# needs GNU Wget or cURL installed for transfer and
-	# BIND's host for DNS lookup.
-	# default: "0" disabled
-	option force_ipversion "0"
-
-	###########
-	# Normally the current (in the internet) registered ip is detected using the
-	# local defined name lookup policies (i.e. /etc/resolve.conf etc.)
-	# Specify here a DNS server to use instead of the defaults.
-	# you can use hostname or ip address
-	# i.e. "google-public-dns-a.google.com"
-	# default: none
-#	option dns_server "google-public-dns-a.google.com"
-
-	# By default every DNS call is made via UDP protocol
-	# Some internet provider offer modems that cache UDP DNS requests.
-	# They also redirect calls to external servers to local.
-	# To force the usage of TCP for DNS requests enable this option
-	# Needs BIND's host program be installed
-	# default: "0" disabled
-#	option force_dnstcp "0"
-
-	###########
-	# If a Proxy is need to access HTTP/HTTPS pages on the WEB
-	# it can be configured here also for sending updates to the
-	# DDNS provider. If you configured use_https='1' above, you
-	# need to setup your HTTPS proxy here, otherwise your
-	# HTTP proxy. !!! You should not detect your current IP
-	# ip_source='web' (see above) because this request is also
-	# send via the configured proxy !!!
-	# Syntax: [user:password@]proxy:port !port is required !
-	# IPv6 address must be in squared brackets "[...]"
-	# default: none
-#	option proxy ''
-
-	###########
-	# In some very special configurations i.e. Multi WAN environment
-	# in a NAT cascade it might be necessary to define
-	# a network to use for communication.
-	# should use option ip_source "web" (see above)
-	# Needs GNU Wget (with SSL support) or cURL to be installed.
-	# GNU Wget will use IP address and cURL the physical device 
-	# of the given network
-	# default: none
-#	option bind_network "wan7"
-
-	########### Timer settings ########################
-
-	###########
-	# defines the time interval to check if local IP has changed
-	# After the first start and first update send, the system will
-	# wait this time before verify if update was successful send.
-	# !!! checks below 5 minutes make no sense because the Internet
-	# needs about 5-10 minutes to sync an IP-change to all DNS servers !!!
-	# accepted unit entry’s: 'seconds' 'minutes' 'hours'
-	# minimum 5 minutes == 300 seconds
-	# default 10 minutes
-	option check_interval	'10'
-	option check_unit	'minutes'
-
-	###########
-	# force to send an update to service provider, if no change was detected.
-	# consult DDNS providers documentation if your DDNS entry might timeout.
-	# accepted unit entry’s: 'minutes' 'hours' 'days'
-	# minimum needs to be greater or equal check interval (see above)
-	# A special setting of '0' is allowed, which forces the script to run once.
-	# It sends an update, verify if update was accepted by DNS
-	# (retry if not) and finish. Useful if you want to start by your own (i.e. cron)
-	# default 3 days == 72 hours
-	option force_interval	'72'
-	option force_unit	'hours'
-
-	###########
-	# if error happen on detecting, sending or updating the
-	# script will retry the relevant action for retry_count times
-	# before stopping script execution.
-	# default: 5
-	option retry_count '5'
-
-	###########
-	# if error happen on detecting, sending or updating the
-	# script will retry the relevant action.
-	# here you define the time to wait before retry is started
-	# accepted unit entry’s: 'seconds' 'minutes'
-	# default: 60 seconds
-	option retry_interval	'60'
-	option retry_unit	'seconds'
diff --git a/ddns-scripts/samples/getlocalip_sample.sh b/ddns-scripts/samples/getlocalip_sample.sh
deleted file mode 100755
index b98806b67..000000000
--- a/ddns-scripts/samples/getlocalip_sample.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# sample script for detecting local IP
-# 2014-2015 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-#
-# activated inside /etc/config/ddns by setting
-#
-# option ip_source	'script'
-# option ip_script 	'/usr/lib/ddns/getlocalip_sample.sh -6' !!! parameters ALLOWED
-#
-# the script is executed (not parsed) inside get_local_ip() function
-# of /usr/lib/ddns/dynamic_dns_functions.sh
-#
-# useful when this box is the only DDNS client in the network
-# IP adresses of "internal" boxes could be detected with this script
-# so no need to install ddns client on every "internal" box
-# On IPv6 every internal box normally has it's own external IP
-#
-# This script should
-# 	- return the IP address via stdout	echo -n "...."	!!! without line feed
-#	- report errors via stderr		echo "...." >&2
-#	- return an error code ('0' for success)	exit 123
-
-case $1 in
-	-4)	echo -n "8.8.8.8"		# never append linefeed or simular
-		exit 0
-		;;				# IP's of Googles public DNS
-	-6)	echo -n "2001:4860:4860::8888"
-		exit 0
-		;;
-	*)	echo "$0 - Invalid or missing parameter" >&2
-		exit 1
-esac
-echo "Should never come here" >&2
-exit 2
diff --git a/ddns-scripts/samples/slaac_sample.sh b/ddns-scripts/samples/slaac_sample.sh
deleted file mode 100755
index ea8f24d87..000000000
--- a/ddns-scripts/samples/slaac_sample.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-#
-# script to determine and return SLAAC ipv6 address using prefix from a locally configured interface and the MAC address of the device
-# (c) 2018 Keve Mueller <keve at keve dot hu>
-#
-# activated inside /etc/config/ddns by setting
-#
-# option ip_source      'script'
-# option ip_script      '/usr/lib/ddns/slaac_sample.sh br-lan AA:BB:CC:DD:EE:FF'
-#
-# the script is executed (not parsed) inside get_local_ip() function
-# of /usr/lib/ddns/dynamic_dns_functions.sh
-#
-# useful when this box is the only DDNS client in the network and other clients use SLAAC
-# so no need to install ddns client on every "internal" box
-#
-# NB: this will not catch the actual IPV6 used by the host when it is configured to use temporary addresses
-
-#NB: we need a valid MAC address that is fully expanded with leading zeroes on all positions
-format_eui_64() {
-    local macaddr="$1"
-    echo ${macaddr:0:1}$(echo ${macaddr:1:1}|tr 0123456789abcdefABCDEF 23016745ab89efcd89efcd)${macaddr:3:2}:${macaddr:6:2}ff:fe${macaddr:9:2}:${macaddr:12:2}${macaddr:15:2}
-}
-
-# expand :: in an ipv6 address specification to the appropriate series of 0:
-# result will have 8 ipv6 fragments separated by single colon
-# NB: input must be a valid IPv6 address, e.g. ::1
-# NB: numbers are not prepended with leading zeroes
-expand_ipv6_colons() {
-    local ipv6=$1
-# we need :: to be in the middle, so prepend a 0 if the input starts with : and append 0 if it ends with it
-    if [ "${ipv6:0:1}" = ":" ]; then ipv6=0${ipv6}; fi
-    if [ "${ipv6: -1:1}" = ":" ]; then ipv6=${ipv6}0; fi
-# retain only the real colons
-    local colons=${ipv6//::|[0123456789abcdefABCDEF]/}
-# count them
-    local num_colons=${#colons}
-    local filler=":0:0:0:0:0:0:"
-# replace the :: with the appropriate substring from filler
-    local ipv6_x=${ipv6/::/${filler:0:(7-$num_colons)*2-1}}
-    echo $ipv6_x
-}
-
-# obtain the first ipv6 address of the device passed in $1
-addr_net=$(ip -6 -o addr show dev $1 scope global up | cut -d" " -f 7 | head -1)
-#addr_net=$1
-addr=${addr_net%/*}
-# TODO: we assume /64 subnet
-# get the first 64 bits of the address
-prefix=$(expand_ipv6_colons $addr | cut -d: -f -4)
-# compute the SLAAC 64 bits from the MAC
-suffix=$(format_eui_64 "$2")
-
-echo -n $prefix:$suffix
-exit 0
-
-#echo "Should never come here" >&2
-#exit 2
-
diff --git a/ddns-scripts/samples/update_sample.sh b/ddns-scripts/samples/update_sample.sh
deleted file mode 100644
index 00b51cbd2..000000000
--- a/ddns-scripts/samples/update_sample.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-# sample script for sending user defined updates
-# 2014-2015 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-#
-# activated inside /etc/config/ddns by setting
-#
-# option update_script '/usr/lib/ddns/update_sample.sh'
-#
-# the script is parsed (not executed) inside send_update() function
-# of /usr/lib/ddns/dynamic_dns_functions.sh
-# so you can use all available functions and global variables inside this script
-# already defined in dynamic_dns_updater.sh and dynamic_dns_functions.sh
-#
-# It make sence to define the update url ONLY inside this script
-# because it's anyway unique to the update script
-# otherwise it should work with the default scripts
-#
-# the code here is the copy of the default used inside send_update()
-#
-# tested with spdns.de
-local __URL="http://[USERNAME]:[PASSWORD]@update.spdns.de/nic/update?hostname=[DOMAIN]&myip=[IP]"
-# inside url we need domain, username and password
-[ -z "$domain" ]   && write_log 14 "Service section not configured correctly! Missing 'domain'"
-[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing 'username'"
-[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing 'password'"
-
-# do replaces in URL
-__URL=$(echo $__URL |  | sed -e "s#\[USERNAME\]#$URL_USER#g" -e "s#\[PASSWORD\]#$URL_PASS#g" \
-			     -e "s#\[PARAMENC\]#$URL_PENC#g" -e "s#\[PARAMOPT\]#$param_opt#g" \
-			     -e "s#\[DOMAIN\]#$domain#g"     -e "s#\[IP\]#$__IP#g")
-[ $use_https -ne 0 ] && __URL=$(echo $__URL | sed -e 's#^http:#https:#')
-
-do_transfer "$__URL" || return 1
-
-write_log 7 "DDNS Provider answered:\n$(cat $DATFILE)"
-
-# analyse provider answers
-# "good [IP_ADR]"	= successful
-# "nochg [IP_ADR]"	= no change but OK
-grep -i -E "good|nochg" $DATFILE >/dev/null 2>&1
-return $?	# "0" if "good" or "nochg" found
-
diff --git a/netdata/Makefile b/netdata/Makefile
deleted file mode 100644
index ff999ae3f..000000000
--- a/netdata/Makefile
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# Copyright (C) 2008-2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=netdata
-PKG_VERSION:=1.30.1
-PKG_RELEASE:=2
-
-PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>, Daniel Engberg <daniel.engberg.lists@pyret.net>
-PKG_LICENSE:=GPL-3.0-or-later
-PKG_LICENSE_FILES:=COPYING
-PKG_CPE_ID:=cpe:/a:my-netdata:netdata
-
-PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/netdata/netdata/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=skip
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-PKG_FIXUP:=autoreconf
-PKG_USE_MIPS16:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/netdata
-  SECTION:=admin
-  CATEGORY:=Administration
-  DEPENDS:=+zlib +libuuid +libuv +libmnl +libjson-c
-  TITLE:=Real-time performance monitoring tool
-  URL:=https://www.netdata.cloud/
-endef
-
-define Package/netdata/description
-  netdata is a highly optimized Linux daemon providing real-time performance
-  monitoring for Linux systems, applications and SNMP devices over the web.
-
-  If you want to use Python plugins install python3, python3-yaml and
-  python3-urllib3
-endef
-
-TARGET_CFLAGS := $(filter-out -O%,$(TARGET_CFLAGS))
-TARGET_CFLAGS += -ffunction-sections -fdata-sections -O3
-TARGET_LDFLAGS += -Wl,--gc-sections
-
-CONFIGURE_ARGS += \
-	--with-zlib \
-	--with-math \
-	--disable-x86-sse \
-	--enable-lto \
-	--disable-ebpf \
-	--without-libcap \
-	--disable-dbengine \
-	--disable-plugin-nfacct \
-	--disable-plugin-freeipmi \
-	--disable-plugin-cups \
-	--disable-plugin-xenstat \
-	--disable-backend-prometheus-remote-write \
-	--disable-unit-tests \
-	--disable-cloud
-
-define Package/netdata/conffiles
-/etc/netdata/
-endef
-
-define Package/netdata/install
-	$(INSTALL_DIR) $(1)/etc/netdata/custom-plugins.d
-	$(CP) $(PKG_INSTALL_DIR)/etc/netdata $(1)/etc
-	$(CP) ./files/netdata.conf $(1)/etc/netdata
-	touch $(1)/etc/netdata/.opt-out-from-anonymous-statistics
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/netdata $(1)/usr/lib
-	$(CP) $(1)/usr/lib/netdata/conf.d/fping.conf $(1)/etc
-	$(CP) $(1)/usr/lib/netdata/conf.d/health_alarm_notify.conf $(1)/etc
-	$(CP) $(1)/usr/lib/netdata/plugins.d/tc-qos-helper.sh $(1)/etc
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/netdata $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/usr/share/netdata
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/netdata $(1)/usr/share
-	rm $(1)/usr/share/netdata/web/demo*html
-	rm $(1)/usr/share/netdata/web/fonts/*.svg
-	rm $(1)/usr/share/netdata/web/fonts/*.ttf
-	rm $(1)/usr/share/netdata/web/fonts/*.woff
-	rm $(1)/usr/share/netdata/web/images/*.png
-	rm $(1)/usr/share/netdata/web/images/*.gif
-	rm $(1)/usr/share/netdata/web/images/*.ico
-	rm -rf $(1)/usr/share/netdata/web/old
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/netdata.init $(1)/etc/init.d/netdata
-endef
-
-$(eval $(call BuildPackage,netdata))
diff --git a/netdata/files/netdata.conf b/netdata/files/netdata.conf
deleted file mode 100644
index 4a247daae..000000000
--- a/netdata/files/netdata.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-# Full configuration can be retrieved from the running
-# server at http://localhost:19999/netdata.conf
-#
-# Example:
-#   curl -o /etc/netdata/netdata.conf http://localhost:19999/netdata.conf
-#
-
-[global]
-	update every = 2
-	memory deduplication (ksm) = no
-	debug log = syslog
-	error log = syslog
-	access log = none
-	run as user = root
-
-[web]
-	allow connections from = localhost 10.* 192.168.* 172.16.* 172.17.* 172.18.* 172.19.* 172.20.* 172.21.* 172.22.* 172.23.* 172.24.* 172.25.* 172.26.* 172.27.* 172.28.* 172.29.* 172.30.* 172.31.*
-	allow dashboard from = localhost 10.* 192.168.* 172.16.* 172.17.* 172.18.* 172.19.* 172.20.* 172.21.* 172.22.* 172.23.* 172.24.* 172.25.* 172.26.* 172.27.* 172.28.* 172.29.* 172.30.* 172.31.*
-
-[plugins]
-	cgroups = no
-	apps = no
-	charts.d = no
-	fping = no
-	node.d = no
-	python.d = no
-
-[health]
-	enabled = no
-
-[plugin:proc:ipc]
-	shared memory totals = no
diff --git a/netdata/files/netdata.init b/netdata/files/netdata.init
deleted file mode 100644
index 7d80627a0..000000000
--- a/netdata/files/netdata.init
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-USE_PROCD=1
-
-APPBINARY=/usr/sbin/netdata
-CONFIGFILE=/etc/netdata/netdata.conf
-
-start_service() {
-	mkdir -m 0755 -p /var/cache/netdata
-	chown nobody /var/cache/netdata
-	mkdir -m 0755 -p /var/lib/netdata
-	chown nobody /var/lib/netdata
-	mkdir -m 0755 -p /var/log/netdata
-	chown nobody /var/log/netdata
-	procd_open_instance
-	procd_set_param command $APPBINARY -D -c $CONFIGFILE
-	procd_set_param file $CONFIGFILE
-	procd_set_param respawn
-	procd_close_instance
-}
diff --git a/netdata/patches/001-disable-plugins-by-default.patch b/netdata/patches/001-disable-plugins-by-default.patch
deleted file mode 100644
index a55670b67..000000000
--- a/netdata/patches/001-disable-plugins-by-default.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/collectors/charts.d.plugin/charts.d.conf
-+++ b/collectors/charts.d.plugin/charts.d.conf
-@@ -30,7 +30,7 @@
- 
- # the default enable/disable for all charts.d collectors
- # the default is "yes"
--# enable_all_charts="yes"
-+enable_all_charts="no"
- 
- # BY DEFAULT ENABLED MODULES
- # ap=yes
---- a/collectors/python.d.plugin/python.d.conf
-+++ b/collectors/python.d.plugin/python.d.conf
-@@ -7,7 +7,7 @@
- #
- 
- # Enable / disable the whole python.d.plugin (all its modules)
--enabled: yes
-+enabled: no
- 
- # ----------------------------------------------------------------------
- # Enable / Disable python.d.plugin modules
diff --git a/netdata/patches/002-extra-patch-web_gui_index.html.patch b/netdata/patches/002-extra-patch-web_gui_index.html.patch
deleted file mode 100644
index 93f653760..000000000
--- a/netdata/patches/002-extra-patch-web_gui_index.html.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/web/gui/index.html
-+++ b/web/gui/index.html
-@@ -90,7 +90,9 @@
-             </div>
-             <nav class="collapse navbar-collapse navbar-right" role="navigation">
-                 <ul class="nav navbar-nav">
-+                    <!--
-                     <li title="Nodes view" data-toggle="tooltip" data-placement="bottom"><a onclick="openAuthenticatedUrl('console.html');" class="btn" target="_blank"><i class="fas fa-tv"></i>&nbsp;<span class="hidden-sm hidden-md">Nodes<sup class="beta"> beta</sup></span></a></li>
-+                    -->
-                     <li id="alarmsButton"  title="check the health monitoring alarms and their log" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#alarmsModal"><i class="fas fa-bell"></i>&nbsp;<span class="hidden-sm hidden-md">Alarms&nbsp;</span><span id="alarms_count_badge" class="badge"></span></a></li>
-                     <li title="change dashboard settings" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#optionsModal"><i class="fas fa-cog"></i>&nbsp;<span class="hidden-sm hidden-md">Settings</span></a></li>
-                     <li title="check for netdata updates<br/>you should keep your netdata updated" data-toggle="tooltip" data-placement="bottom" class="hidden-sm" id="updateButton"><a href="#" class="btn" data-toggle="modal" data-target="#updateModal"><i class="fas fa-cloud-download-alt"></i> <span class="hidden-sm hidden-md">Update </span><span id="update_badge" class="badge"></span></a></li>
-@@ -110,6 +112,7 @@
-         <div id="navbar-highlight-content" class="navbar-highlight-content"></div>
-     </div>
- 
-+<!--
-     <div id="sign-in-banner" style="display: none">
-         <div class="container">
-             Like what you see? 
-@@ -120,6 +123,7 @@
-             </div>
-         </div>
-     </div>
-+-->
-     
-     <div id="masthead" style="display: none;">
-         <div class="container">
diff --git a/netdata/patches/003-extra-patch-web_gui_main.js.patch b/netdata/patches/003-extra-patch-web_gui_main.js.patch
deleted file mode 100644
index f2b86b4ca..000000000
--- a/netdata/patches/003-extra-patch-web_gui_main.js.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/web/gui/main.js
-+++ b/web/gui/main.js
-@@ -759,11 +759,7 @@ function renderMyNetdataMenu(machinesArr
-     if (!isSignedIn()) {
-         if (!NETDATA.registry.isRegistryEnabled()) {
-             html += (
--                `<div class="info-item" style="white-space: nowrap">
--                    <span>Please <a href="#" onclick="signInDidClick(event); return false">sign in to netdata.cloud</a> to view your nodes!</span>
--                    <div></div>
--                </div>
--                <hr />`
-+                ``
-             );
-         }
-     }
diff --git a/netdata/patches/004-patch-collectors_python.d.plugin_Makefile.am.patch b/netdata/patches/004-patch-collectors_python.d.plugin_Makefile.am.patch
deleted file mode 100644
index e4816009e..000000000
--- a/netdata/patches/004-patch-collectors_python.d.plugin_Makefile.am.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- a/collectors/python.d.plugin/Makefile.am
-+++ b/collectors/python.d.plugin/Makefile.am
-@@ -145,109 +145,3 @@ dist_third_party_DATA = \
-     python_modules/third_party/monotonic.py \
-     python_modules/third_party/filelock.py \
-     $(NULL)
--
--pythonyaml2dir=$(pythonmodulesdir)/pyyaml2
--dist_pythonyaml2_DATA = \
--    python_modules/pyyaml2/__init__.py \
--    python_modules/pyyaml2/composer.py \
--    python_modules/pyyaml2/constructor.py \
--    python_modules/pyyaml2/cyaml.py \
--    python_modules/pyyaml2/dumper.py \
--    python_modules/pyyaml2/emitter.py \
--    python_modules/pyyaml2/error.py \
--    python_modules/pyyaml2/events.py \
--    python_modules/pyyaml2/loader.py \
--    python_modules/pyyaml2/nodes.py \
--    python_modules/pyyaml2/parser.py \
--    python_modules/pyyaml2/reader.py \
--    python_modules/pyyaml2/representer.py \
--    python_modules/pyyaml2/resolver.py \
--    python_modules/pyyaml2/scanner.py \
--    python_modules/pyyaml2/serializer.py \
--    python_modules/pyyaml2/tokens.py \
--    $(NULL)
--
--pythonyaml3dir=$(pythonmodulesdir)/pyyaml3
--dist_pythonyaml3_DATA = \
--    python_modules/pyyaml3/__init__.py \
--    python_modules/pyyaml3/composer.py \
--    python_modules/pyyaml3/constructor.py \
--    python_modules/pyyaml3/cyaml.py \
--    python_modules/pyyaml3/dumper.py \
--    python_modules/pyyaml3/emitter.py \
--    python_modules/pyyaml3/error.py \
--    python_modules/pyyaml3/events.py \
--    python_modules/pyyaml3/loader.py \
--    python_modules/pyyaml3/nodes.py \
--    python_modules/pyyaml3/parser.py \
--    python_modules/pyyaml3/reader.py \
--    python_modules/pyyaml3/representer.py \
--    python_modules/pyyaml3/resolver.py \
--    python_modules/pyyaml3/scanner.py \
--    python_modules/pyyaml3/serializer.py \
--    python_modules/pyyaml3/tokens.py \
--    $(NULL)
--
--python_urllib3dir=$(pythonmodulesdir)/urllib3
--dist_python_urllib3_DATA = \
--    python_modules/urllib3/__init__.py \
--    python_modules/urllib3/_collections.py \
--    python_modules/urllib3/connection.py \
--    python_modules/urllib3/connectionpool.py \
--    python_modules/urllib3/exceptions.py \
--    python_modules/urllib3/fields.py \
--    python_modules/urllib3/filepost.py \
--    python_modules/urllib3/response.py \
--    python_modules/urllib3/poolmanager.py \
--    python_modules/urllib3/request.py \
--    $(NULL)
--
--python_urllib3_utildir=$(python_urllib3dir)/util
--dist_python_urllib3_util_DATA = \
--    python_modules/urllib3/util/__init__.py \
--    python_modules/urllib3/util/connection.py \
--    python_modules/urllib3/util/request.py \
--    python_modules/urllib3/util/response.py \
--    python_modules/urllib3/util/retry.py \
--    python_modules/urllib3/util/selectors.py \
--    python_modules/urllib3/util/ssl_.py \
--    python_modules/urllib3/util/timeout.py \
--    python_modules/urllib3/util/url.py \
--    python_modules/urllib3/util/wait.py \
--    $(NULL)
--
--python_urllib3_packagesdir=$(python_urllib3dir)/packages
--dist_python_urllib3_packages_DATA = \
--    python_modules/urllib3/packages/__init__.py \
--    python_modules/urllib3/packages/ordered_dict.py \
--    python_modules/urllib3/packages/six.py \
--    $(NULL)
--
--python_urllib3_backportsdir=$(python_urllib3_packagesdir)/backports
--dist_python_urllib3_backports_DATA = \
--    python_modules/urllib3/packages/backports/__init__.py \
--    python_modules/urllib3/packages/backports/makefile.py \
--    $(NULL)
--
--python_urllib3_ssl_match_hostnamedir=$(python_urllib3_packagesdir)/ssl_match_hostname
--dist_python_urllib3_ssl_match_hostname_DATA = \
--    python_modules/urllib3/packages/ssl_match_hostname/__init__.py \
--    python_modules/urllib3/packages/ssl_match_hostname/_implementation.py \
--    $(NULL)
--
--python_urllib3_contribdir=$(python_urllib3dir)/contrib
--dist_python_urllib3_contrib_DATA = \
--    python_modules/urllib3/contrib/__init__.py \
--    python_modules/urllib3/contrib/appengine.py \
--    python_modules/urllib3/contrib/ntlmpool.py \
--    python_modules/urllib3/contrib/pyopenssl.py \
--    python_modules/urllib3/contrib/securetransport.py \
--    python_modules/urllib3/contrib/socks.py \
--    $(NULL)
--
--python_urllib3_securetransportdir=$(python_urllib3_contribdir)/_securetransport
--dist_python_urllib3_securetransport_DATA = \
--    python_modules/urllib3/contrib/_securetransport/__init__.py \
--    python_modules/urllib3/contrib/_securetransport/bindings.py \
--    python_modules/urllib3/contrib/_securetransport/low_level.py \
--    $(NULL)
diff --git a/netdata/patches/005-patch-collectors_python.d.plugin_python__modules_bases_loaders.py.patch b/netdata/patches/005-patch-collectors_python.d.plugin_python__modules_bases_loaders.py.patch
deleted file mode 100644
index 6a686df77..000000000
--- a/netdata/patches/005-patch-collectors_python.d.plugin_python__modules_bases_loaders.py.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/collectors/python.d.plugin/python_modules/bases/loaders.py
-+++ b/collectors/python.d.plugin/python_modules/bases/loaders.py
-@@ -10,9 +10,9 @@ PY_VERSION = version_info[:2]
- 
- try:
-     if PY_VERSION > (3, 1):
--        from pyyaml3 import SafeLoader as YamlSafeLoader
-+        from yaml import SafeLoader as YamlSafeLoader
-     else:
--        from pyyaml2 import SafeLoader as YamlSafeLoader
-+        from yaml import SafeLoader as YamlSafeLoader
- except ImportError:
-     from yaml import SafeLoader as YamlSafeLoader
- 
diff --git a/netdata/patches/006-patch-web_gui_index.html.patch b/netdata/patches/006-patch-web_gui_index.html.patch
deleted file mode 100644
index ad1cf2e0e..000000000
--- a/netdata/patches/006-patch-web_gui_index.html.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/web/gui/index.html
-+++ b/web/gui/index.html
-@@ -95,10 +95,14 @@
-                     -->
-                     <li id="alarmsButton"  title="check the health monitoring alarms and their log" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#alarmsModal"><i class="fas fa-bell"></i>&nbsp;<span class="hidden-sm hidden-md">Alarms&nbsp;</span><span id="alarms_count_badge" class="badge"></span></a></li>
-                     <li title="change dashboard settings" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#optionsModal"><i class="fas fa-cog"></i>&nbsp;<span class="hidden-sm hidden-md">Settings</span></a></li>
-+                    <!--
-                     <li title="check for netdata updates<br/>you should keep your netdata updated" data-toggle="tooltip" data-placement="bottom" class="hidden-sm" id="updateButton"><a href="#" class="btn" data-toggle="modal" data-target="#updateModal"><i class="fas fa-cloud-download-alt"></i> <span class="hidden-sm hidden-md">Update </span><span id="update_badge" class="badge"></span></a></li>
-+                    -->
-+                    <!--
-                     <li title="the netdata wiki home at github<br/>remember to <b>give netdata a <i class=&quot;fas fa-star&quot;></i></b> !" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://github.com/netdata/netdata" class="btn" target="_blank"><i class="fab fa-github"></i></a></li>
-                     <li title="follow netdata on twitter" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://twitter.com/linuxnetdata" class="btn" target="_blank"><i class="fab fa-twitter"></i></a></li>
-                     <li title="like netdata on facebook" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://www.facebook.com/linuxnetdata/" class="btn" target="_blank"><i class="fab fa-facebook"></i></a></li>
-+                    -->
-                     <li title="import / load a netdata snapshot" data-toggle="tooltip" data-placement="bottom" id="loadButton"><a href="#" class="btn" data-toggle="modal" data-target="#loadSnapshotModal"><i class="fas fa-download"></i>&nbsp;<span class="hidden-sm hidden-md hidden-lg">Import</span></a></li>
-                     <li title="export / save a netdata snapshot" data-toggle="tooltip" data-placement="bottom" id="saveButton"><a href="#" class="btn" data-toggle="modal" data-target="#saveSnapshotModal"><i class="fas fa-upload"></i>&nbsp;<span class="hidden-sm hidden-md hidden-lg">Export</span></a></li>
-                     <li title="print this dashboard to PDF" data-toggle="tooltip" data-placement="bottom" id="printButton"><a href="#" class="btn" data-toggle="modal" data-target="#printPreflightModal"><i class="fas fa-print"></i>&nbsp;<span class="hidden-sm hidden-md hidden-lg">Print</span></a></li>
diff --git a/netdata/test.sh b/netdata/test.sh
deleted file mode 100644
index d75d80490..000000000
--- a/netdata/test.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-netdata -version 2>&1 | grep "$2"
diff --git a/nginx/Config_ssl.in b/nginx/Config_ssl.in
deleted file mode 100644
index 1c53dab6a..000000000
--- a/nginx/Config_ssl.in
+++ /dev/null
@@ -1,262 +0,0 @@
-#
-# Copyright (C) 2010-2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-menu "Configuration"
-        depends on PACKAGE_nginx-ssl
-
-config NGINX_DAV
-	bool
-	prompt "Enable WebDAV module"
-	help
-		Enable the HTTP and WebDAV methods PUT, DELETE, MKCOL, COPY and MOVE.
-	default n
-
-config NGINX_UBUS
-	bool
-	prompt "Enable UBUS module"
-	help
-		Enable UBUS api support directly from the server.
-	default y
-
-config NGINX_FLV
-	bool
-	prompt "Enable FLV module"
-	help
-		Provides the ability to seek within FLV (Flash) files using time-based offsets.
-	default n
-
-config NGINX_STUB_STATUS
-	bool
-	prompt "Enable stub status module"
-	help
-		Enable the stub status module which gives some status from the server.
-	default n
-
-config NGINX_HTTP_CHARSET
-	bool
-	prompt "Enable HTTP charset module"
-	default y
-
-config NGINX_HTTP_GZIP
-	bool
-	prompt "Enable HTTP gzip module"
-	default y
-
-config NGINX_HTTP_SSI
-	bool
-	prompt "Enable HTTP ssi module"
-	default y
-
-config NGINX_HTTP_USERID
-	bool
-	prompt "Enable HTTP userid module"
-	default y
-
-config NGINX_HTTP_ACCESS
-	bool
-	prompt "Enable HTTP access module"
-	default y
-
-config NGINX_HTTP_AUTH_BASIC
-	bool
-	prompt "Enable HTTP auth basic"
-	default y
-
-config NGINX_HTTP_AUTH_REQUEST
-	bool
-	prompt "Enable HTTP auth request module"
-	default n
-
-config NGINX_HTTP_AUTOINDEX
-	bool
-	prompt "Enable HTTP autoindex module"
-	default y
-
-config NGINX_HTTP_GEO
-	bool
-	prompt "Enable HTTP geo module"
-	default y
-
-config NGINX_HTTP_MAP
-	bool
-	prompt "Enable HTTP map module"
-	default y
-
-config NGINX_HTTP_SPLIT_CLIENTS
-	bool
-	prompt "Enable HTTP split clients"
-	default y
-
-config NGINX_HTTP_REFERER
-	bool
-	prompt "Enable HTTP referer module"
-	default y
-
-config NGINX_HTTP_REWRITE
-	bool
-	prompt "Enable HTTP rewrite module"
-	select NGINX_PCRE
-	default y
-
-config NGINX_HTTP_PROXY
-	bool
-	prompt "Enable HTTP proxy module"
-	default y
-
-config NGINX_HTTP_FASTCGI
-	bool
-	prompt "Enable HTTP fastcgi module"
-	default y
-
-config NGINX_HTTP_UWSGI
-	bool
-	prompt "Enable HTTP uwsgi module"
-	default y
-
-config NGINX_HTTP_SCGI
-	bool
-	prompt "Enable HTTP scgi module"
-	default y
-
-config NGINX_HTTP_MEMCACHED
-	bool
-	prompt "Enable HTTP memcached module"
-	default y
-
-config NGINX_HTTP_LIMIT_CONN
-	bool
-	prompt "Enable HTTP limit conn"
-	default y
-
-config NGINX_HTTP_LIMIT_REQ
-	bool
-	prompt "Enable HTTP limit req"
-	default y
-
-config NGINX_HTTP_EMPTY_GIF
-	bool
-	prompt "Enable HTTP empty gif"
-	default y
-
-config NGINX_HTTP_BROWSER
-	bool
-	prompt "Enable HTTP browser module"
-	default y
-
-config NGINX_HTTP_UPSTREAM_HASH
-	bool
-	prompt "Enable HTTP hash module"
-	default y
-
-config NGINX_HTTP_UPSTREAM_IP_HASH
-	bool
-	prompt "Enable HTTP IP hash module"
-	default y
-
-config NGINX_HTTP_UPSTREAM_LEAST_CONN
-	bool
-	prompt "Enable HTTP least conn module"
-	default y
-
-config NGINX_HTTP_UPSTREAM_KEEPALIVE
-	bool
-	prompt "Enable HTTP keepalive module"
-	default y
-
-config NGINX_HTTP_CACHE
-	bool
-	prompt "Enable HTTP cache"
-	default y
-
-config NGINX_HTTP_V2
-	bool
-	prompt "Enable HTTP_V2 module"
-	default y
-
-config NGINX_PCRE
-	bool
-	prompt "Enable PCRE library usage"
-	default y
-
-config NGINX_NAXSI
-	bool
-	prompt "Enable NAXSI module"
-	default y
-
-config NGINX_LUA
-	bool
-	prompt "Enable Lua module"
-	default n
-
-config NGINX_HTTP_REAL_IP
-	bool
-	prompt "Enable HTTP real ip module"
-	default n
-
-config NGINX_HTTP_SECURE_LINK
-	bool
-	prompt "Enable HTTP secure link module"
-	default n
-
-config NGINX_HTTP_SUB
-	bool
-	prompt "Enable HTTP sub module"
-	default n
-	
-config NGINX_HEADERS_MORE
-	bool
-	prompt "Enable Headers_more module"
-	help
-		Set and clear input and output headers...more than "add"!
-	default y
-	
-config NGINX_HTTP_BROTLI
-	bool
-	prompt "Enable Brotli compression module"
-	help
-		Add support for brotli compression module.
-	default n
-
-config NGINX_STREAM_CORE_MODULE
-	bool
-	prompt "Enable stream support"
-	help
-		Add support for NGINX request streaming.
-	default n
-
-config NGINX_STREAM_SSL_MODULE
-	bool
-	prompt "Enable stream support with SSL/TLS termination"
-	depends on NGINX_STREAM_CORE_MODULE
-	help
-		Add support for NGINX request streaming with SSL/TLS termination.
-	default n
-
-config NGINX_STREAM_SSL_PREREAD_MODULE
-	bool
-	prompt "Enable stream support with SSL/TLS pre-read"
-	depends on NGINX_STREAM_CORE_MODULE
-	help
-		Add support for NGINX request streaming using information from the ClientHello message without terminating SSL/TLS.
-	default n
-
-config NGINX_RTMP_MODULE
-	bool
-	prompt "Enable RTMP module"
-	help
-		Add support for NGINX-based Media Streaming Server module.
-		DASH enhanced - https://github.com/ut0mt8/nginx-rtmp-module
-	default n
-
-config NGINX_TS_MODULE
-	bool
-	prompt "Enable TS module"
-	help
-		Add support for MPEG-TS Live Module module.
-	default n
-
-endmenu
diff --git a/nginx/Makefile b/nginx/Makefile
deleted file mode 100644
index 739f76651..000000000
--- a/nginx/Makefile
+++ /dev/null
@@ -1,577 +0,0 @@
-#
-# Copyright (C) 2012-2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=nginx
-PKG_VERSION:=1.19.6
-PKG_RELEASE:=2
-
-PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://nginx.org/download/
-PKG_HASH:=skip
-
-PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> \
-				Ansuel Smith <ansuelsmth@gmail.com>
-PKG_LICENSE:=2-clause BSD-like license
-PKG_CPE_ID:=cpe:/a:nginx:nginx
-
-PKG_FIXUP:=autoreconf
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-PKG_CONFIG_DEPENDS := \
-	CONFIG_NGINX_DAV \
-	CONFIG_NGINX_FLV \
-	CONFIG_NGINX_UBUS \
-	CONFIG_NGINX_STUB_STATUS \
-	CONFIG_NGINX_HTTP_CHARSET \
-	CONFIG_NGINX_HTTP_GZIP \
-	CONFIG_NGINX_HTTP_SSI \
-	CONFIG_NGINX_HTTP_USERID \
-	CONFIG_NGINX_HTTP_ACCESS \
-	CONFIG_NGINX_HTTP_AUTH_BASIC \
-	CONFIG_NGINX_HTTP_AUTH_REQUEST \
-	CONFIG_NGINX_HTTP_AUTOINDEX \
-	CONFIG_NGINX_HTTP_GEO \
-	CONFIG_NGINX_HTTP_MAP \
-	CONFIG_NGINX_HTTP_SPLIT_CLIENTS \
-	CONFIG_NGINX_HTTP_REFERER \
-	CONFIG_NGINX_HTTP_REWRITE \
-	CONFIG_NGINX_HTTP_PROXY \
-	CONFIG_NGINX_HTTP_FASTCGI \
-	CONFIG_NGINX_HTTP_UWSGI \
-	CONFIG_NGINX_HTTP_SCGI \
-	CONFIG_NGINX_HTTP_MEMCACHED \
-	CONFIG_NGINX_HTTP_LIMIT_CONN \
-	CONFIG_NGINX_HTTP_LIMIT_REQ \
-	CONFIG_NGINX_HTTP_EMPTY_GIF \
-	CONFIG_NGINX_HTTP_BROWSER \
-	CONFIG_NGINX_HTTP_UPSTREAM_HASH \
-	CONFIG_NGINX_HTTP_UPSTREAM_IP_HASH \
-	CONFIG_NGINX_HTTP_UPSTREAM_LEAST_CONN \
-	CONFIG_NGINX_HTTP_UPSTREAM_KEEPALIVE \
-	CONFIG_NGINX_HTTP_UPSTREAM_ZONE \
-	CONFIG_NGINX_HTTP_CACHE \
-	CONFIG_NGINX_HTTP_V2 \
-	CONFIG_NGINX_PCRE \
-	CONFIG_NGINX_NAXSI \
-	CONFIG_NGINX_LUA \
-	CONFIG_NGINX_HTTP_REAL_IP \
-	CONFIG_NGINX_HTTP_SECURE_LINK \
-	CONFIG_NGINX_HTTP_BROTLI \
-	CONFIG_NGINX_HEADERS_MORE \
-	CONFIG_NGINX_STREAM_CORE_MODULE \
-	CONFIG_NGINX_STREAM_SSL_MODULE \
-	CONFIG_NGINX_STREAM_SSL_PREREAD_MODULE \
-	CONFIG_NGINX_RTMP_MODULE \
-	CONFIG_NGINX_TS_MODULE \
-	CONFIG_OPENSSL_ENGINE \
-	CONFIG_OPENSSL_WITH_NPN
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/nginx/default
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Web Servers/Proxies
-  TITLE:=Nginx web server
-  URL:=http://nginx.org/
-  DEPENDS:=+libopenssl +libpthread
-  # TODO: add PROVIDES when removing nginx
-  # PROVIDES:=nginx
-endef
-
-define Package/nginx/description
- nginx is an HTTP and reverse proxy server, as well as a mail proxy server, \
- written by Igor Sysoev.
-endef
-
-define Package/nginx-ssl
-  $(Package/nginx/default)
-  TITLE += with SSL support
-  VARIANT:=ssl
-  DEPENDS+= +NGINX_PCRE:libpcre \
-	+NGINX_PCRE:nginx-ssl-util +!NGINX_PCRE:nginx-ssl-util-nopcre \
-	+NGINX_HTTP_GZIP:zlib +NGINX_LUA:liblua +NGINX_DAV:libxml2 \
-	+NGINX_UBUS:libubus +NGINX_UBUS:libblobmsg-json +NGINX_UBUS:libjson-c
-  EXTRA_DEPENDS:=nginx-ssl-util$(if $(CONFIG_NGINX_PCRE),,-nopcre) (>=1.5-1) (<2)
-  CONFLICTS:=nginx-all-module
-endef
-
-Package/nginx-ssl/description = $(Package/nginx/description) \
-  This variant is compiled with SSL support enabled. To enable additional module \
-  select them in the nginx default configuration menu.
-
-define Package/nginx-all-module
-  $(Package/nginx/default)
-  TITLE += with ALL module selected
-  DEPENDS+=+libpcre +nginx-ssl-util +zlib +liblua +libxml2 +libubus \
-	+libblobmsg-json +libjson-c
-  EXTRA_DEPENDS:=nginx-ssl-util (>=1.5-1) (<2)
-  VARIANT:=all-module
-  PROVIDES += nginx-ssl
-endef
-
-Package/nginx-all-module/description = $(Package/nginx/description) \
-  This variant is compiled with ALL module selected.
-
-define Package/nginx-ssl/config
-  source "$(SOURCE)/Config_ssl.in"
-endef
-
-config_files=mime.types
-
-define Package/nginx/conffiles
-/etc/nginx/
-endef
-
-Package/nginx-ssl/conffiles = $(Package/nginx/conffiles)
-Package/nginx-all-module/conffiles = $(Package/nginx/conffiles)
-
-
-ADDITIONAL_MODULES:= --with-http_ssl_module
-
-ifneq ($(BUILD_VARIANT),all-module)
-  ifneq ($(CONFIG_NGINX_HTTP_CACHE),y)
-    ADDITIONAL_MODULES += --without-http-cache
-  endif
-  ifneq ($(CONFIG_NGINX_PCRE),y)
-    ADDITIONAL_MODULES += --without-pcre
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_CHARSET),y)
-    ADDITIONAL_MODULES += --without-http_charset_module
-  else
-    config_files += koi-utf koi-win win-utf
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_GZIP),y)
-    ADDITIONAL_MODULES += --without-http_gzip_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_SSI),y)
-    ADDITIONAL_MODULES += --without-http_ssi_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_USERID),y)
-    ADDITIONAL_MODULES += --without-http_userid_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_ACCESS),y)
-    ADDITIONAL_MODULES += --without-http_access_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_AUTH_BASIC),y)
-    ADDITIONAL_MODULES += --without-http_auth_basic_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_AUTOINDEX),y)
-    ADDITIONAL_MODULES += --without-http_autoindex_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_GEO),y)
-    ADDITIONAL_MODULES += --without-http_geo_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_MAP),y)
-    ADDITIONAL_MODULES += --without-http_map_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_SPLIT_CLIENTS),y)
-    ADDITIONAL_MODULES += --without-http_split_clients_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_REFERER),y)
-    ADDITIONAL_MODULES += --without-http_referer_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_REWRITE),y)
-    ADDITIONAL_MODULES += --without-http_rewrite_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_PROXY),y)
-    ADDITIONAL_MODULES += --without-http_proxy_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_FASTCGI),y)
-    ADDITIONAL_MODULES += --without-http_fastcgi_module
-  else
-    config_files += fastcgi_params
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_UWSGI),y)
-    ADDITIONAL_MODULES += --without-http_uwsgi_module
-  else
-    config_files += uwsgi_params
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_SCGI),y)
-    ADDITIONAL_MODULES += --without-http_scgi_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_MEMCACHED),y)
-    ADDITIONAL_MODULES += --without-http_memcached_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_LIMIT_CONN),y)
-    ADDITIONAL_MODULES += --without-http_limit_conn_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_LIMIT_REQ),y)
-    ADDITIONAL_MODULES += --without-http_limit_req_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_EMPTY_GIF),y)
-    ADDITIONAL_MODULES += --without-http_empty_gif_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_BROWSER),y)
-    ADDITIONAL_MODULES += --without-http_browser_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_HASH),y)
-    ADDITIONAL_MODULES += --without-http_upstream_hash_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_IP_HASH),y)
-    ADDITIONAL_MODULES += --without-http_upstream_ip_hash_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_LEAST_CONN),y)
-    ADDITIONAL_MODULES += --without-http_upstream_least_conn_module
-  endif
-  ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_KEEPALIVE),y)
-    ADDITIONAL_MODULES += --without-http_upstream_keepalive_module
-  endif
-  ifeq ($(CONFIG_NGINX_NAXSI),y)
-    ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-naxsi/naxsi_src
-  endif
-  ifeq ($(CONFIG_NGINX_LUA),y)
-    ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/lua-nginx
-  endif
-  ifeq ($(CONFIG_IPV6),y)
-    ADDITIONAL_MODULES += --with-ipv6
-  endif
-  ifeq ($(CONFIG_NGINX_STUB_STATUS),y)
-    ADDITIONAL_MODULES += --with-http_stub_status_module
-  endif
-  ifeq ($(CONFIG_NGINX_FLV),y)
-    ADDITIONAL_MODULES += --with-http_flv_module
-  endif
-  ifeq ($(CONFIG_NGINX_DAV),y)
-    ADDITIONAL_MODULES += --with-http_dav_module --add-module=$(PKG_BUILD_DIR)/nginx-dav-ext-module
-  endif
-  ifeq ($(CONFIG_NGINX_UBUS),y)
-    ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-ubus-module
-  endif
-  ifeq ($(CONFIG_NGINX_HTTP_AUTH_REQUEST),y)
-    ADDITIONAL_MODULES += --with-http_auth_request_module
-  endif
-  ifeq ($(CONFIG_NGINX_HTTP_V2),y)
-    ADDITIONAL_MODULES += --with-http_v2_module
-  endif
-  ifeq ($(CONFIG_NGINX_HTTP_REAL_IP),y)
-    ADDITIONAL_MODULES += --with-http_realip_module
-  endif
-  ifeq ($(CONFIG_NGINX_HTTP_SECURE_LINK),y)
-    ADDITIONAL_MODULES += --with-http_secure_link_module
-  endif
-  ifeq ($(CONFIG_NGINX_HTTP_SUB),y)
-	ADDITIONAL_MODULES += --with-http_sub_module
-  endif
-  ifeq ($(CONFIG_NGINX_STREAM_CORE_MODULE),y)
-    ADDITIONAL_MODULES += --with-stream
-  endif
-  ifeq ($(CONFIG_NGINX_STREAM_SSL_MODULE),y)
-    ADDITIONAL_MODULES += --with-stream_ssl_module
-  endif
-  ifeq ($(CONFIG_NGINX_STREAM_SSL_PREREAD_MODULE),y)
-    ADDITIONAL_MODULES += --with-stream_ssl_preread_module
-  endif
-  ifeq ($(CONFIG_NGINX_HEADERS_MORE),y)
-    ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-headers-more
-  endif
-  ifeq ($(CONFIG_NGINX_HTTP_BROTLI),y)
-    ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-brotli
-  endif
-  ifeq ($(CONFIG_NGINX_RTMP_MODULE),y)
-    ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-rtmp
-  endif
-  ifeq ($(CONFIG_NGINX_TS_MODULE),y)
-    ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-ts
-  endif
-else
-  CONFIG_NGINX_HEADERS_MORE:=y
-  CONFIG_NGINX_HTTP_BROTLI:=y
-  CONFIG_NGINX_RTMP_MODULE:=y
-  CONFIG_NGINX_TS_MODULE:=y
-  CONFIG_NGINX_NAXSI:=y
-  CONFIG_NGINX_LUA:=y
-  CONFIG_NGINX_DAV:=y
-  CONFIG_NGINX_UBUS:=y
-  ADDITIONAL_MODULES += --with-ipv6 --with-http_stub_status_module --with-http_flv_module \
-	--with-http_dav_module \
-	--with-http_auth_request_module --with-http_v2_module --with-http_realip_module \
-	--with-http_secure_link_module --with-http_sub_module \
-	--with-stream --with-stream_ssl_module --with-stream_ssl_preread_module \
-	--add-module=$(PKG_BUILD_DIR)/nginx-headers-more \
-	--add-module=$(PKG_BUILD_DIR)/nginx-naxsi/naxsi_src \
-	--add-module=$(PKG_BUILD_DIR)/lua-nginx \
-	--add-module=$(PKG_BUILD_DIR)/nginx-dav-ext-module \
-	--add-module=$(PKG_BUILD_DIR)/nginx-brotli --add-module=$(PKG_BUILD_DIR)/nginx-rtmp \
-	--add-module=$(PKG_BUILD_DIR)/nginx-ts --add-module=$(PKG_BUILD_DIR)/nginx-ubus-module
-  config_files += koi-utf koi-win win-utf fastcgi_params uwsgi_params
-endif
-
-define Package/nginx-mod-luci
-  TITLE:=Nginx on LuCI
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Web Servers/Proxies
-  TITLE:=Support file for Nginx
-  URL:=http://nginx.org/
-  DEPENDS:=+uwsgi +uwsgi-luci-support +nginx
-  # TODO: add PROVIDES when removing nginx-mod-luci-ssl
-  # PROVIDES:=nginx-mod-luci-ssl
-endef
-
-define Package/nginx-mod-luci/description
- Support file for LuCI in nginx. Include custom nginx configuration, autostart script for uwsgi.
-endef
-
-
-TARGET_CFLAGS += -fvisibility=hidden -ffunction-sections -fdata-sections -DNGX_LUA_NO_BY_LUA_BLOCK
-TARGET_LDFLAGS += -Wl,--gc-sections
-
-ifeq ($(CONFIG_NGINX_LUA),y)
-  CONFIGURE_VARS += LUA_INC=$(STAGING_DIR)/usr/include \
-					LUA_LIB=$(STAGING_DIR)/usr/lib
-endif
-
-CONFIGURE_VARS += CONFIG_BIG_ENDIAN=$(CONFIG_BIG_ENDIAN)
-
-CONFIGURE_ARGS += \
-			--crossbuild=Linux::$(ARCH) \
-			--prefix=/usr \
-			--conf-path=/etc/nginx/nginx.conf \
-			$(ADDITIONAL_MODULES) \
-			--error-log-path=stderr \
-			--pid-path=/var/run/nginx.pid \
-			--lock-path=/var/lock/nginx.lock \
-			--http-log-path=/var/log/nginx/access.log \
-			--http-client-body-temp-path=/var/lib/nginx/body \
-			--http-proxy-temp-path=/var/lib/nginx/proxy \
-			--http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
-			--with-cc="$(TARGET_CC)" \
-			--with-cc-opt="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
-			--with-ld-opt="$(TARGET_LDFLAGS)" \
-			--without-http_upstream_zone_module
-
-define Package/nginx-mod-luci/install
-	$(INSTALL_DIR) $(1)/etc/nginx/conf.d
-	$(INSTALL_CONF) ./files-luci-support/luci.locations $(1)/etc/nginx/conf.d/
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files-luci-support/60_nginx-luci-support $(1)/etc/uci-defaults/60_nginx-luci-support
-endef
-
-define Package/nginx-ssl/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/nginx $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/nginx/conf.d
-	$(INSTALL_DATA) $(addprefix $(PKG_INSTALL_DIR)/etc/nginx/,$(config_files)) $(1)/etc/nginx/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/nginx.init $(1)/etc/init.d/nginx
-ifeq ($(CONFIG_NGINX_NAXSI),y)
-	$(INSTALL_DIR) $(1)/etc/nginx
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/nginx-naxsi/naxsi_config/naxsi_core.rules $(1)/etc/nginx
-	chmod 0640 $(1)/etc/nginx/naxsi_core.rules
-endif
-	$(if $(CONFIG_NGINX_NAXSI),$($(INSTALL_BIN) $(PKG_BUILD_DIR)/nginx-naxsi/naxsi_config/naxsi_core.rules $(1)/etc/nginx))
-	$(if $(CONFIG_NGINX_NAXSI),$(chmod 0640 $(1)/etc/nginx/naxsi_core.rules))
-endef
-
-Package/nginx-all-module/install = $(Package/nginx-ssl/install)
-
-define Package/nginx-ssl/prerm
-#!/bin/sh
-[ -z "$${IPKG_INSTROOT}" ] || exit 0
-[ "$${PKG_UPGRADE}" = "1" ] && exit 0
-eval $$(/usr/bin/nginx-util get_env)
-[ "$$(uci get "nginx.$${LAN_NAME}.$${MANAGE_SSL}")" = "self-signed" ] || exit 0
-rm -f "$$(uci get "nginx.$${LAN_NAME}.ssl_certificate")"
-rm -f "$$(uci get "nginx.$${LAN_NAME}.ssl_certificate_key")"
-exit 0
-endef
-
-Package/nginx-all-module/prerm = $(Package/nginx-ssl/prerm)
-
-define Build/Prepare
-	$(Build/Prepare/Default)
-	$(Prepare/nginx-naxsi)
-	$(Prepare/lua-nginx)
-	$(Prepare/nginx-brotli)
-	$(Prepare/nginx-headers-more)
-	$(Prepare/nginx-rtmp)
-	$(Prepare/nginx-ts)
-	$(Prepare/nginx-dav-ext-module)
-	$(Prepare/nginx-ubus-module)
-endef
-
-
-ifeq ($(CONFIG_NGINX_HEADERS_MORE),y)
-  define Download/nginx-headers-more
-    VERSION:=a9f7c7e86cc7441d04e2f11f01c2e3a9c4b0301d
-    SUBDIR:=nginx-headers-more
-    FILE:=headers-more-nginx-module-$$(VERSION).tar.xz
-    URL:=https://github.com/openresty/headers-more-nginx-module.git
-    MIRROR_HASH:=ce0b9996ecb2cff790831644d6ab1adc087aa2771d77d3931c06246d11bc59fd
-    PROTO:=git
-  endef
-  $(eval $(call Download,nginx-headers-more))
-
-  define Prepare/nginx-headers-more
-	$(eval $(Download/nginx-headers-more))
-	xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
-  endef
-endif
-
-
-ifeq ($(CONFIG_NGINX_HTTP_BROTLI),y)
-  define Download/nginx-brotli
-    VERSION:=e505dce68acc190cc5a1e780a3b0275e39f160ca
-    SUBDIR:=nginx-brotli
-    FILE:=ngx-brotli-module-$$(VERSION).tar.xz
-    URL:=https://github.com/google/ngx_brotli.git
-    MIRROR_HASH:=04847f11ef808fed50f44b2af0ef3abf59ff0ffc06dfc7394d9ab51d53fef31f
-    PROTO:=git
-  endef
-  $(eval $(call Download,nginx-brotli))
-
-  define Prepare/nginx-brotli
-	$(eval $(Download/nginx-brotli))
-	xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
-  endef
-endif
-
-
-ifeq ($(CONFIG_NGINX_RTMP_MODULE),y)
-  define Download/nginx-rtmp
-    VERSION:=f0ea62342a4eca504b311cd5df910d026c3ea4cf
-    SUBDIR:=nginx-rtmp
-    FILE:=ngx-rtmp-module-$$(VERSION).tar.xz
-    URL:=https://github.com/ut0mt8/nginx-rtmp-module.git
-    MIRROR_HASH:=d3f58066f0f858ed79f7f2b0c9b89de2ccc512c94ab3d0625f6dcff3df0b72c1
-    PROTO:=git
-  endef
-  $(eval $(call Download,nginx-rtmp))
-
-  define  Prepare/nginx-rtmp
-	$(eval $(Download/nginx-rtmp))
-	xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
-  endef
-endif
-
-
-ifeq ($(CONFIG_NGINX_TS_MODULE),y)
-  define Download/nginx-ts
-    VERSION:=ef2f874d95cc75747eb625a292524a702aefb0fd
-    SUBDIR:=nginx-ts
-    FILE:=ngx-ts-module-$$(VERSION).tar.xz
-    URL:=https://github.com/arut/nginx-ts-module.git
-    MIRROR_HASH:=73938950bb286d40d9e54b0994d1a63827340c1156c72eb04d7041b25b20ec18
-    PROTO:=git
-  endef
-  $(eval $(call Download,nginx-ts))
-
-  define  Prepare/nginx-ts
-	$(eval $(Download/nginx-ts))
-	xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
-  endef
-endif
-
-
-ifeq ($(CONFIG_NGINX_NAXSI),y)
-  define Download/nginx-naxsi
-    VERSION:=951123ad456bdf5ac94e8d8819342fe3d49bc002
-    SUBDIR:=nginx-naxsi
-    FILE:=nginx-naxsi-module-$$(VERSION).tar.xz
-    URL:=https://github.com/nbs-system/naxsi.git
-    MIRROR_HASH:=c734cae19a596affadd62a2df1b58d3df8d1364093a4e80a7cd1ab4555963535
-    PROTO:=git
-  endef
-  $(eval $(call Download,nginx-naxsi))
-
-  define Prepare/nginx-naxsi
-	$(eval $(Download/nginx-naxsi))
-	xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
-  endef
-endif
-
-
-ifeq ($(CONFIG_NGINX_LUA),y)
-  define Download/lua-nginx
-    VERSION:=e94f2e5d64daa45ff396e262d8dab8e56f5f10e0
-    SUBDIR:=lua-nginx
-    FILE:=lua-nginx-module-$$(VERSION).tar.xz
-    URL:=https://github.com/openresty/lua-nginx-module.git
-    MIRROR_HASH:=27729921964f066d97e99c263da153b34622a2f4b811114e4c3ee61c6fc71395
-    PROTO:=git
-  endef
-  $(eval $(call Download,lua-nginx))
-
-  define Prepare/lua-nginx
-	$(eval $(Download/lua-nginx))
-	xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
-	$(call PatchDir,$(PKG_BUILD_DIR),./patches-lua-nginx)
-  endef
-endif
-
-
-ifeq ($(CONFIG_NGINX_DAV),y)
-  define Download/nginx-dav-ext-module
-    VERSION:=f5e30888a256136d9c550bf1ada77d6ea78a48af
-    SUBDIR:=nginx-dav-ext-module
-    FILE:=nginx-dav-ext-module-$$(VERSION).tar.xz
-    URL:=https://github.com/arut/nginx-dav-ext-module.git
-    MIRROR_HASH:=70bb4c3907f4b783605500ba494e907aede11f8505702e370012abb3c177dc5b
-    PROTO:=git
-  endef
-  $(eval $(call Download,nginx-dav-ext-module))
-
-  define Prepare/nginx-dav-ext-module
-	$(eval $(Download/nginx-dav-ext-module))
-	xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
-	$(call PatchDir,$(PKG_BUILD_DIR),./patches-dav-nginx)
-  endef
-endif
-
-ifeq ($(CONFIG_NGINX_UBUS),y)
-  define Download/nginx-ubus-module
-    VERSION:=b2d7260dcb428b2fb65540edb28d7538602b4a26
-    SUBDIR:=nginx-ubus-module
-    FILE:=nginx-ubus-module-$$(VERSION).tar.xz
-    URL:=https://github.com/Ansuel/nginx-ubus-module.git
-    MIRROR_HASH:=472cef416d25effcac66c85417ab6596e634a7a64d45b709bb090892d567553c
-    PROTO:=git
-  endef
-  $(eval $(call Download,nginx-ubus-module))
-
-  define Prepare/nginx-ubus-module
-	$(eval $(Download/nginx-ubus-module))
-	xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
-  endef
-endif
-
-$(eval $(call BuildPackage,nginx-ssl))
-$(eval $(call BuildPackage,nginx-all-module))
-$(eval $(call BuildPackage,nginx-mod-luci))
-
-# TODO: remove after a transition period (together with pkg nginx-util):
-# It is for smoothly substituting nginx and nginx-mod-luci-ssl (by nginx-ssl
-# respectively nginx-mod-luci). Add above commented PROVIDES when removing.
-
-define Package/nginx
-  TITLE:=Dummy package for transition when upgrading.
-  DEPENDS:=+nginx-ssl
-  PKGARCH:=all
-endef
-
-define Package/nginx/install
-	$(INSTALL_DIR) $(1)/usr/bin
-endef
-
-$(eval $(call BuildPackage,nginx))
-
-define Package/nginx-mod-luci-ssl
-  TITLE:=Dummy package for transition when upgrading.
-  DEPENDS:=+nginx-mod-luci
-  PKGARCH:=all
-endef
-
-define Package/nginx-mod-luci-ssl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-endef
-
-$(eval $(call BuildPackage,nginx-mod-luci-ssl))
diff --git a/nginx/files-luci-support/60_nginx-luci-support b/nginx/files-luci-support/60_nginx-luci-support
deleted file mode 100644
index b2564444c..000000000
--- a/nginx/files-luci-support/60_nginx-luci-support
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-if nginx -V 2>&1 | grep -q ubus; then
-	if [ -z "$(cat /etc/nginx/conf.d/luci.locations | grep ubus)" ]; then
-		cat <<EOT >> /etc/nginx/conf.d/luci.locations
-
-location /ubus {
-        ubus_interpreter;
-        ubus_socket_path /var/run/ubus/ubus.sock;
-        ubus_parallel_req 2;
-}
-EOT
-	fi
-fi
-
-grep -q /var/run/ubus.sock /etc/nginx/conf.d/luci.locations &&
-	sed -i 's#/var/run/ubus.sock#/var/run/ubus/ubus.sock#' /etc/nginx/conf.d/luci.locations
-
-if [ -x /etc/init.d/uhttpd ]; then
-        /etc/init.d/uhttpd disable
-        if [ -n "$(pgrep uhttpd)" ]; then
-                /etc/init.d/uhttpd stop
-        fi
-fi
-
-/etc/init.d/nginx enable
-if [ -n "$(pgrep nginx)" ]; then
-        /etc/init.d/nginx restart
-else
-        /etc/init.d/nginx start
-fi
-
-/etc/init.d/uwsgi enable
-if [ -n "$(pgrep uwsgi)" ]; then
-        /etc/init.d/uwsgi restart
-else
-        /etc/init.d/uwsgi start
-fi
-
-
-exit 0
diff --git a/nginx/files-luci-support/luci.locations b/nginx/files-luci-support/luci.locations
deleted file mode 100644
index 374ee5d9f..000000000
--- a/nginx/files-luci-support/luci.locations
+++ /dev/null
@@ -1,17 +0,0 @@
-location /cgi-bin/luci {
-		index  index.html;
-		include uwsgi_params;
-		uwsgi_param SERVER_ADDR $server_addr;
-		uwsgi_modifier1 9;
-		uwsgi_pass unix:////var/run/luci-webui.socket;
-}
-location ~ /cgi-bin/cgi-(backup|download|upload|exec) {
-		include uwsgi_params;
-		uwsgi_param SERVER_ADDR $server_addr;
-		uwsgi_modifier1 9;
-		uwsgi_pass unix:////var/run/luci-cgi_io.socket;
-}
-
-location /luci-static {
-		error_log stderr crit;
-}
diff --git a/nginx/files/nginx.init b/nginx/files/nginx.init
deleted file mode 100644
index 300a8c657..000000000
--- a/nginx/files/nginx.init
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2015 OpenWrt.org
-
-START=80
-
-USE_PROCD=1
-
-G_OPTS="daemon off;"
-
-NGINX_UTIL="/usr/bin/nginx-util"
-
-eval $("${NGINX_UTIL}" get_env)
-
-CONF=""
-
-
-nginx_init() {
-	[ -z "${CONF}" ] || return # already called.
-
-	[ -d /var/log/nginx ] || mkdir -p /var/log/nginx
-	[ -d /var/lib/nginx ] || mkdir -p /var/lib/nginx
-
-	rm -f "$(readlink "${UCI_CONF}")"
-	${NGINX_UTIL} init_lan
-
-	if [ -e "${UCI_CONF}" ]
-	then CONF="${UCI_CONF}"
-	else CONF="${NGINX_CONF}"
-	fi
-
-	local message
-	message="$(/usr/sbin/nginx -t -c "${CONF}" -g "${G_OPTS}" 2>&1)" ||
-	{
-		echo -e "${message}" | logger -t "nginx_init" -p "daemon.err"
-		logger -s -t "nginx_init" -p "daemon.err" "NOT using conf file!"
-		echo "show config to be used by: nginx -T -c '${CONF}'" >&2
-		exit 1
-	}
-
-	logger -t "nginx_init" -p "daemon.info" "using ${CONF} (the test is ok)"
-}
-
-
-start_service() {
-	nginx_init
-
-	procd_open_instance
-	procd_set_param command /usr/sbin/nginx -c "${CONF}" -g "${G_OPTS}"
-	procd_set_param stdout 1
-	procd_set_param stderr 1
-	procd_set_param file "${CONF}" "${CONF_DIR}*.crt" "${CONF_DIR}*.key" \
-		"${CONF_DIR}*.conf" "${CONF_DIR}*.locations"
-	procd_set_param respawn
-	procd_close_instance
-}
-
-
-reload_service() {
-	nginx_init
-
-	if [ "$(cat "/proc/$(cat "/var/run/nginx.pid")/cmdline")" = \
-	     "nginx: master process /usr/sbin/nginx -c ${CONF} -g ${G_OPTS}" ]
-	then procd_send_signal nginx
-	else restart
-	fi
-}
-
-
-extra_command "relog" "Reopen log files (without reloading)"
-relog() {
-	[ -d /var/log/nginx ] || mkdir -p /var/log/nginx
-	procd_send_signal nginx '*' USR1
-}
diff --git a/nginx/patches-dav-nginx/100-drop-libxslt-dep.patch b/nginx/patches-dav-nginx/100-drop-libxslt-dep.patch
deleted file mode 100644
index c5941f422..000000000
--- a/nginx/patches-dav-nginx/100-drop-libxslt-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/nginx-dav-ext-module/config	2018-12-17 08:45:12.000000000 +0000
-+++ b/nginx-dav-ext-module/config	2019-10-11 13:49:41.446919258 +0000
-@@ -8,9 +8,8 @@ ngx_module_name=ngx_http_dav_ext_module
- # building nginx with the xslt module, in which case libxslt will
- # be linked anyway.  In other cases libxslt is just redundant.
- # If that's a big deal, libxml2 can be linked directly:
--# ngx_module_libs=-lxml2
-+ngx_module_libs=-lxml2
-+ngx_module_incs=$(pkg-config --cflags-only-I libxml-2.0 | sed 's/^-I//')
- 
--ngx_module_libs=LIBXSLT
--
- ngx_module_srcs="$ngx_addon_dir/ngx_http_dav_ext_module.c"
- 
diff --git a/nginx/patches-lua-nginx/100-no_by_lua_block.patch b/nginx/patches-lua-nginx/100-no_by_lua_block.patch
deleted file mode 100644
index 968e12d58..000000000
--- a/nginx/patches-lua-nginx/100-no_by_lua_block.patch
+++ /dev/null
@@ -1,195 +0,0 @@
---- a/lua-nginx/src/ngx_http_lua_module.c
-+++ b/lua-nginx/src/ngx_http_lua_module.c
-@@ -165,14 +165,14 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       offsetof(ngx_http_lua_loc_conf_t, log_socket_errors),
-       NULL },
--
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     { ngx_string("init_by_lua_block"),
-       NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-       ngx_http_lua_init_by_lua_block,
-       NGX_HTTP_MAIN_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_init_by_inline },
--
-+#endif
-     { ngx_string("init_by_lua"),
-       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-       ngx_http_lua_init_by_lua,
-@@ -186,14 +186,14 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_MAIN_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_init_by_file },
--
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     { ngx_string("init_worker_by_lua_block"),
-       NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-       ngx_http_lua_init_worker_by_lua_block,
-       NGX_HTTP_MAIN_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_init_worker_by_inline },
--
-+#endif
-     { ngx_string("init_worker_by_lua"),
-       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
-       ngx_http_lua_init_worker_by_lua,
-@@ -209,6 +209,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       (void *) ngx_http_lua_init_worker_by_file },
- 
- #if defined(NDK) && NDK
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     /* set_by_lua $res { inline Lua code } [$arg1 [$arg2 [...]]] */
-     { ngx_string("set_by_lua_block"),
-       NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-@@ -217,7 +218,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_filter_set_by_lua_inline },
--
-+#endif
-     /* set_by_lua $res <inline script> [$arg1 [$arg2 [...]]] */
-     { ngx_string("set_by_lua"),
-       NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-@@ -245,7 +246,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_rewrite_handler_inline },
--
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     /* rewrite_by_lua_block { <inline script> } */
-     { ngx_string("rewrite_by_lua_block"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-@@ -254,7 +255,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_rewrite_handler_inline },
--
-+#endif
-     /* access_by_lua "<inline script>" */
-     { ngx_string("access_by_lua"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-@@ -263,7 +264,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_access_handler_inline },
--
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     /* access_by_lua_block { <inline script> } */
-     { ngx_string("access_by_lua_block"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-@@ -272,7 +273,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_access_handler_inline },
--
-+#endif
-     /* content_by_lua "<inline script>" */
-     { ngx_string("content_by_lua"),
-       NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-@@ -280,7 +281,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_content_handler_inline },
--
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     /* content_by_lua_block { <inline script> } */
-     { ngx_string("content_by_lua_block"),
-       NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-@@ -288,7 +289,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_content_handler_inline },
--
-+#endif
-     /* log_by_lua <inline script> */
-     { ngx_string("log_by_lua"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-@@ -297,7 +298,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_log_handler_inline },
--
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     /* log_by_lua_block { <inline script> } */
-     { ngx_string("log_by_lua_block"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-@@ -306,7 +307,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_log_handler_inline },
--
-+#endif
-     { ngx_string("rewrite_by_lua_file"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-                         |NGX_CONF_TAKE1,
-@@ -361,7 +362,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_header_filter_inline },
--
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     /* header_filter_by_lua_block { <inline script> } */
-     { ngx_string("header_filter_by_lua_block"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-@@ -370,7 +371,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_header_filter_inline },
--
-+#endif
-     { ngx_string("header_filter_by_lua_file"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-                         |NGX_CONF_TAKE1,
-@@ -386,7 +387,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_body_filter_inline },
--
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     /* body_filter_by_lua_block { <inline script> } */
-     { ngx_string("body_filter_by_lua_block"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-@@ -395,7 +396,7 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_body_filter_inline },
--
-+#endif
-     { ngx_string("body_filter_by_lua_file"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-                         |NGX_CONF_TAKE1,
-@@ -403,14 +404,14 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_body_filter_file },
--
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     { ngx_string("balancer_by_lua_block"),
-       NGX_HTTP_UPS_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-       ngx_http_lua_balancer_by_lua_block,
-       NGX_HTTP_SRV_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_balancer_handler_inline },
--
-+#endif
-     { ngx_string("balancer_by_lua_file"),
-       NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
-       ngx_http_lua_balancer_by_lua,
-@@ -517,14 +518,14 @@ static ngx_command_t ngx_http_lua_cmds[]
-       NGX_HTTP_LOC_CONF_OFFSET,
-       offsetof(ngx_http_lua_loc_conf_t, ssl_ciphers),
-       NULL },
--
-+#ifndef NGX_LUA_NO_BY_LUA_BLOCK
-     { ngx_string("ssl_certificate_by_lua_block"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
-       ngx_http_lua_ssl_cert_by_lua_block,
-       NGX_HTTP_SRV_CONF_OFFSET,
-       0,
-       (void *) ngx_http_lua_ssl_cert_handler_inline },
--
-+#endif
-     { ngx_string("ssl_certificate_by_lua_file"),
-       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-       ngx_http_lua_ssl_cert_by_lua,
diff --git a/nginx/patches/101-feature_test_fix.patch b/nginx/patches/101-feature_test_fix.patch
deleted file mode 100644
index b867c88dd..000000000
--- a/nginx/patches/101-feature_test_fix.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- a/auto/cc/name
-+++ b/auto/cc/name
-@@ -7,7 +7,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
- 
-     ngx_feature="C compiler"
-     ngx_feature_name=
--    ngx_feature_run=yes
-+    ngx_feature_run=
-     ngx_feature_incs=
-     ngx_feature_path=
-     ngx_feature_libs=
---- a/auto/cc/conf
-+++ b/auto/cc/conf
-@@ -183,7 +183,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
-     else
-         ngx_feature="gcc builtin atomic operations"
-         ngx_feature_name=NGX_HAVE_GCC_ATOMIC
--        ngx_feature_run=yes
-+        ngx_feature_run=no
-         ngx_feature_incs=
-         ngx_feature_path=
-         ngx_feature_libs=
-@@ -204,7 +204,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
-     else
-         ngx_feature="C99 variadic macros"
-         ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS"
--        ngx_feature_run=yes
-+        ngx_feature_run=no
-         ngx_feature_incs="#include <stdio.h>
- #define var(dummy, ...)  sprintf(__VA_ARGS__)"
-         ngx_feature_path=
-@@ -218,7 +218,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
- 
-     ngx_feature="gcc variadic macros"
-     ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS"
--    ngx_feature_run=yes
-+    ngx_feature_run=no
-     ngx_feature_incs="#include <stdio.h>
- #define var(dummy, args...)  sprintf(args)"
-     ngx_feature_path=
---- a/auto/os/linux
-+++ b/auto/os/linux
-@@ -36,7 +36,7 @@ fi
- 
- ngx_feature="epoll"
- ngx_feature_name="NGX_HAVE_EPOLL"
--ngx_feature_run=yes
-+ngx_feature_run=no
- ngx_feature_incs="#include <sys/epoll.h>"
- ngx_feature_path=
- ngx_feature_libs=
-@@ -110,7 +110,7 @@ ngx_feature_test="int fd; struct stat sb
- CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE"
- ngx_feature="sendfile()"
- ngx_feature_name="NGX_HAVE_SENDFILE"
--ngx_feature_run=yes
-+ngx_feature_run=no
- ngx_feature_incs="#include <sys/sendfile.h>
-                   #include <errno.h>"
- ngx_feature_path=
-@@ -131,7 +131,7 @@ fi
- CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
- ngx_feature="sendfile64()"
- ngx_feature_name="NGX_HAVE_SENDFILE64"
--ngx_feature_run=yes
-+ngx_feature_run=no
- ngx_feature_incs="#include <sys/sendfile.h>
-                   #include <errno.h>"
- ngx_feature_path=
-@@ -149,7 +149,7 @@ ngx_include="sys/prctl.h"; . auto/includ
- 
- ngx_feature="prctl(PR_SET_DUMPABLE)"
- ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE"
--ngx_feature_run=yes
-+ngx_feature_run=no
- ngx_feature_incs="#include <sys/prctl.h>"
- ngx_feature_path=
- ngx_feature_libs=
---- a/auto/unix
-+++ b/auto/unix
-@@ -840,7 +840,7 @@ ngx_feature_test="void *p; p = memalign(
- 
- ngx_feature="mmap(MAP_ANON|MAP_SHARED)"
- ngx_feature_name="NGX_HAVE_MAP_ANON"
--ngx_feature_run=yes
-+ngx_feature_run=no
- ngx_feature_incs="#include <sys/mman.h>"
- ngx_feature_path=
- ngx_feature_libs=
-@@ -853,7 +853,7 @@ ngx_feature_test="void *p;
- 
- ngx_feature='mmap("/dev/zero", MAP_SHARED)'
- ngx_feature_name="NGX_HAVE_MAP_DEVZERO"
--ngx_feature_run=yes
-+ngx_feature_run=no
- ngx_feature_incs="#include <sys/mman.h>
-                   #include <sys/stat.h>
-                   #include <fcntl.h>"
-@@ -868,7 +868,7 @@ ngx_feature_test='void *p; int  fd;
- 
- ngx_feature="System V shared memory"
- ngx_feature_name="NGX_HAVE_SYSVSHM"
--ngx_feature_run=yes
-+ngx_feature_run=no
- ngx_feature_incs="#include <sys/ipc.h>
-                   #include <sys/shm.h>"
- ngx_feature_path=
-@@ -882,7 +882,7 @@ ngx_feature_test="int  id;
- 
- ngx_feature="POSIX semaphores"
- ngx_feature_name="NGX_HAVE_POSIX_SEM"
--ngx_feature_run=yes
-+ngx_feature_run=no
- ngx_feature_incs="#include <semaphore.h>"
- ngx_feature_path=
- ngx_feature_libs=
diff --git a/nginx/patches/102-sizeof_test_fix.patch b/nginx/patches/102-sizeof_test_fix.patch
deleted file mode 100644
index 7d2430eab..000000000
--- a/nginx/patches/102-sizeof_test_fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/auto/types/sizeof
-+++ b/auto/types/sizeof
-@@ -25,8 +25,14 @@ $NGX_INCLUDE_UNISTD_H
- $NGX_INCLUDE_INTTYPES_H
- $NGX_INCLUDE_AUTO_CONFIG_H
- 
-+char object_code_block[] = {
-+	'\n', 'e', '4', 'V', 'A',
-+	'0', 'x', ('0' + sizeof($ngx_type)),
-+	'Y', '3', 'p', 'M', '\n'
-+};
-+
- int main(void) {
--    printf("%d", (int) sizeof($ngx_type));
-+    printf("dummy use of object_code_block to avoid gc-section: %c", object_code_block[0]);
-     return 0;
- }
- 
-@@ -40,7 +46,7 @@ eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&
- 
- 
- if [ -x $NGX_AUTOTEST ]; then
--    ngx_size=`$NGX_AUTOTEST`
-+    ngx_size=`sed -ne 's/^e4VA0x\(.\)Y3pM$/\1/p' < $NGX_AUTOTEST`
-     echo " $ngx_size bytes"
- fi
- 
diff --git a/nginx/patches/103-sys_nerr.patch b/nginx/patches/103-sys_nerr.patch
deleted file mode 100644
index 5f5d106fe..000000000
--- a/nginx/patches/103-sys_nerr.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/os/unix/ngx_errno.c
-+++ b/src/os/unix/ngx_errno.c
-@@ -8,6 +8,9 @@
- #include <ngx_config.h>
- #include <ngx_core.h>
- 
-+#ifndef NGX_SYS_NERR
-+#define NGX_SYS_NERR  128
-+#endif
- 
- /*
-  * The strerror() messages are copied because:
diff --git a/nginx/patches/104-endianness_fix.patch b/nginx/patches/104-endianness_fix.patch
deleted file mode 100644
index 4d8255e93..000000000
--- a/nginx/patches/104-endianness_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/auto/endianness
-+++ b/auto/endianness
-@@ -12,6 +12,16 @@ checking for system byte ordering
- 
- END
- 
-+if [ "${CONFIG_BIG_ENDIAN}" != "y" ]; then
-+    echo " little endian"
-+    have=NGX_HAVE_LITTLE_ENDIAN . auto/have
-+else
-+    echo " big endian"
-+fi
-+
-+return
-+
-+
- 
- cat << END > $NGX_AUTOTEST.c
- 
diff --git a/nginx/patches/200-config.patch b/nginx/patches/200-config.patch
deleted file mode 100644
index f35009576..000000000
--- a/nginx/patches/200-config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/conf/nginx.conf
-+++ b/conf/nginx.conf
-@@ -1,5 +1,5 @@
- 
--#user  nobody;
-+user nobody nogroup;
- worker_processes  1;
- 
- #error_log  logs/error.log;
-@@ -16,7 +16,7 @@ events {
- 
- http {
-     include       mime.types;
--    default_type  application/octet-stream;
-+    #default_type  application/octet-stream;
- 
-     #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-     #                  '$status $body_bytes_sent "$http_referer" '
diff --git a/nginx/patches/201-ignore-invalid-options.patch b/nginx/patches/201-ignore-invalid-options.patch
deleted file mode 100644
index d208bf507..000000000
--- a/nginx/patches/201-ignore-invalid-options.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/auto/options
-+++ b/auto/options
-@@ -400,8 +400,7 @@ $0: warning: the \"--with-sha1-asm\" opt
-         --test-build-solaris-sendfilev)  NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;;
- 
-         *)
--            echo "$0: error: invalid option \"$option\""
--            exit 1
-+            echo "$0: error: ignoring invalid option \"$option\""
-         ;;
-     esac
- done
diff --git a/openvpn/Config-mbedtls.in b/openvpn/Config-mbedtls.in
deleted file mode 100644
index 3cf233b8f..000000000
--- a/openvpn/Config-mbedtls.in
+++ /dev/null
@@ -1,54 +0,0 @@
-if PACKAGE_openvpn-mbedtls
-
-config OPENVPN_mbedtls_ENABLE_LZO
-	bool "Enable LZO compression support"
-	default n
-
-config OPENVPN_mbedtls_ENABLE_LZ4
-	bool "Enable LZ4 compression support"
-	default y
-
-#config OPENVPN_mbedtls_ENABLE_EUREPHIA
-#	bool "Enable support for the eurephia plug-in"
-#	default n
-
-config OPENVPN_mbedtls_ENABLE_MANAGEMENT
-	bool "Enable management server support"
-	default n
-
-#config OPENVPN_mbedtls_ENABLE_PKCS11
-#	bool "Enable pkcs11 support"
-#	default n
-
-config OPENVPN_mbedtls_ENABLE_FRAGMENT
-	bool "Enable internal fragmentation support (--fragment)"
-	default y
-
-config OPENVPN_mbedtls_ENABLE_MULTIHOME
-	bool "Enable multi-homed UDP server support (--multihome)"
-	default y
-
-config OPENVPN_mbedtls_ENABLE_PORT_SHARE
-	bool "Enable TCP server port-share support (--port-share)"
-	default y
-
-config OPENVPN_mbedtls_ENABLE_DEF_AUTH
-	bool "Enable deferred authentication"
-	default y
-
-config OPENVPN_mbedtls_ENABLE_PF
-	bool "Enable internal packet filter"
-	default y
-
-config OPENVPN_mbedtls_ENABLE_IPROUTE2
-	bool "Enable support for iproute2"
-	default n
-
-config OPENVPN_mbedtls_ENABLE_SMALL
-	bool "Enable size optimization"
-	default y
-	help
-	  enable smaller executable size (disable OCC, usage
-	  message, and verb 4 parm list)
-
-endif
diff --git a/openvpn/Config-openssl.in b/openvpn/Config-openssl.in
deleted file mode 100644
index 7a7be74db..000000000
--- a/openvpn/Config-openssl.in
+++ /dev/null
@@ -1,58 +0,0 @@
-if PACKAGE_openvpn-openssl
-
-config OPENVPN_openssl_ENABLE_LZO
-	bool "Enable LZO compression support"
-	default y
-
-config OPENVPN_openssl_ENABLE_LZ4
-	bool "Enable LZ4 compression support"
-	default y
-
-config OPENVPN_openssl_ENABLE_X509_ALT_USERNAME
-	bool "Enable the --x509-username-field feature"
-	default n
-
-#config OPENVPN_openssl_ENABLE_EUREPHIA
-#	bool "Enable support for the eurephia plug-in"
-#	default n
-
-config OPENVPN_openssl_ENABLE_MANAGEMENT
-	bool "Enable management server support"
-	default n
-
-#config OPENVPN_openssl_ENABLE_PKCS11
-#	bool "Enable pkcs11 support"
-#	default n
-
-config OPENVPN_openssl_ENABLE_FRAGMENT
-	bool "Enable internal fragmentation support (--fragment)"
-	default y
-
-config OPENVPN_openssl_ENABLE_MULTIHOME
-	bool "Enable multi-homed UDP server support (--multihome)"
-	default y
-
-config OPENVPN_openssl_ENABLE_PORT_SHARE
-	bool "Enable TCP server port-share support (--port-share)"
-	default y
-
-config OPENVPN_openssl_ENABLE_DEF_AUTH
-	bool "Enable deferred authentication"
-	default y
-
-config OPENVPN_openssl_ENABLE_PF
-	bool "Enable internal packet filter"
-	default y
-
-config OPENVPN_openssl_ENABLE_IPROUTE2
-	bool "Enable support for iproute2"
-	default n
-
-config OPENVPN_openssl_ENABLE_SMALL
-	bool "Enable size optimization"
-	default y
-	help
-	  enable smaller executable size (disable OCC, usage
-	  message, and verb 4 parm list)
-
-endif
diff --git a/openvpn/Makefile b/openvpn/Makefile
deleted file mode 100644
index 53ee5cd0f..000000000
--- a/openvpn/Makefile
+++ /dev/null
@@ -1,144 +0,0 @@
-#
-# Copyright (C) 2010-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=openvpn
-
-PKG_VERSION:=2.5.3
-PKG_RELEASE:=3
-
-PKG_SOURCE_URL:=\
-	https://build.openvpn.net/downloads/releases/ \
-	https://swupdate.openvpn.net/community/releases/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_HASH:=skip
-
-PKG_MAINTAINER:=Magnus Kroken <mkroken@gmail.com>
-
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
-PKG_BUILD_PARALLEL:=1
-PKG_LICENSE:=GPL-2.0
-PKG_CPE_ID:=cpe:/a:openvpn:openvpn
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/openvpn/Default
-  TITLE:=Open source VPN solution using $(2)
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=http://openvpn.net
-  SUBMENU:=VPN
-  MENU:=1
-  DEPENDS:=+kmod-tun +OPENVPN_$(1)_ENABLE_LZO:liblzo +OPENVPN_$(1)_ENABLE_IPROUTE2:ip $(3)
-  VARIANT:=$(1)
-  PROVIDES:=openvpn openvpn-crypto
-endef
-
-Package/openvpn-openssl=$(call Package/openvpn/Default,openssl,OpenSSL,+PACKAGE_openvpn-openssl:libopenssl)
-Package/openvpn-mbedtls=$(call Package/openvpn/Default,mbedtls,mbedTLS,+PACKAGE_openvpn-mbedtls:libmbedtls)
-
-define Package/openvpn/config/Default
-	source "$(SOURCE)/Config-$(1).in"
-endef
-
-Package/openvpn-openssl/config=$(call Package/openvpn/config/Default,openssl)
-Package/openvpn-mbedtls/config=$(call Package/openvpn/config/Default,mbedtls)
-
-ifeq ($(BUILD_VARIANT),mbedtls)
-CONFIG_OPENVPN_MBEDTLS:=y
-endif
-ifeq ($(BUILD_VARIANT),openssl)
-CONFIG_OPENVPN_OPENSSL:=y
-endif
-
-CONFIGURE_VARS += \
-	IPROUTE=/sbin/ip \
-	NETSTAT=/sbin/netstat
-
-TARGET_CFLAGS += -ffunction-sections -fdata-sections
-TARGET_LDFLAGS += -Wl,--gc-sections
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_SMALL),--enable-small) \
-		--disable-selinux \
-		--disable-systemd \
-		--disable-plugins \
-		--disable-debug \
-		--disable-pkcs11 \
-		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_LZO),--enable,--disable)-lzo \
-		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_LZ4),--enable,--disable)-lz4 \
-		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_X509_ALT_USERNAME),--enable,--disable)-x509-alt-username \
-		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_MANAGEMENT),--enable,--disable)-management \
-		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_FRAGMENT),--enable,--disable)-fragment \
-		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_MULTIHOME),--enable,--disable)-multihome \
-		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_IPROUTE2),--enable,--disable)-iproute2 \
-		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_DEF_AUTH),--enable,--disable)-def-auth \
-		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_PF),--enable,--disable)-pf \
-		$(if $(CONFIG_OPENVPN_$(BUILD_VARIANT)_ENABLE_PORT_SHARE),--enable,--disable)-port-share \
-		$(if $(CONFIG_OPENVPN_OPENSSL),--with-crypto-library=openssl) \
-		$(if $(CONFIG_OPENVPN_MBEDTLS),--with-crypto-library=mbedtls) \
-	)
-endef
-
-define Package/openvpn-$(BUILD_VARIANT)/conffiles
-/etc/config/openvpn
-/etc/openvpn.user
-endef
-
-define Package/openvpn-$(BUILD_VARIANT)/install
-	$(INSTALL_DIR) \
-		$(1)/usr/sbin \
-		$(1)/usr/share/openvpn \
-		$(1)/etc/init.d \
-		$(1)/etc/config \
-		$(1)/etc/openvpn \
-		$(1)/lib/functions \
-		$(1)/lib/upgrade/keep.d \
-		$(1)/usr/libexec \
-		$(1)/etc/hotplug.d/openvpn
-
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/sbin/openvpn \
-		$(1)/usr/sbin/
-
-	$(INSTALL_BIN) \
-		files/openvpn.init \
-		$(1)/etc/init.d/openvpn
-
-	$(INSTALL_BIN) \
-		files/usr/libexec/openvpn-hotplug \
-		$(1)/usr/libexec/openvpn-hotplug
-
-	$(INSTALL_DATA) \
-		files/lib/functions/openvpn.sh \
-		$(1)/lib/functions/openvpn.sh
-
-	$(INSTALL_DATA) \
-		files/etc/hotplug.d/openvpn/01-user \
-		$(1)/etc/hotplug.d/openvpn/01-user
-
-	$(INSTALL_DATA) \
-		files/etc/openvpn.user \
-		$(1)/etc/openvpn.user
-
-	$(INSTALL_DATA) \
-		files/openvpn.options \
-		$(1)/usr/share/openvpn/openvpn.options
-
-	$(INSTALL_CONF) files/openvpn.config \
-		$(1)/etc/config/openvpn
-
-	$(INSTALL_DATA) \
-		files/openvpn.upgrade \
-		$(1)/lib/upgrade/keep.d/openvpn
-endef
-
-$(eval $(call BuildPackage,openvpn-openssl))
-$(eval $(call BuildPackage,openvpn-mbedtls))
diff --git a/openvpn/files/etc/hotplug.d/openvpn/01-user b/openvpn/files/etc/hotplug.d/openvpn/01-user
deleted file mode 100644
index 4c72f1c4b..000000000
--- a/openvpn/files/etc/hotplug.d/openvpn/01-user
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-[ -e "/etc/openvpn.user" ] && {
-	env -i ACTION="$ACTION" INSTANCE="$INSTANCE" \
-		/bin/sh \
-		/etc/openvpn.user \
-		$*
-}
-
-# Wrap user defined scripts on up/down events
-case "$ACTION" in
-	up) command=$user_up ;;
-	down) command=$user_down ;;
-	*) command= ;;
-esac
-
-if [ -n "$command" ]; then
-	shift
-	exec /bin/sh -c "$command $*"
-fi
-
-exit 0
diff --git a/openvpn/files/etc/openvpn.user b/openvpn/files/etc/openvpn.user
deleted file mode 100644
index a77566556..000000000
--- a/openvpn/files/etc/openvpn.user
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# This file is interpreted as shell script.
-# Put your custom openvpn action here, they will
-# be executed with each opevnp event.
-#
-# $ACTION
-#      <down>    down action is generated after the TUN/TAP device is closed
-#      <up>      up action is generated after the TUN/TAP device is opened
-# $INSTANCE  Name of the openvpn instance which went up or down
-
diff --git a/openvpn/files/lib/functions/openvpn.sh b/openvpn/files/lib/functions/openvpn.sh
deleted file mode 100644
index 2de6fb730..000000000
--- a/openvpn/files/lib/functions/openvpn.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-get_openvpn_option() {
-	local config="$1"
-	local variable="$2"
-	local option="$3"
-
-	local value="$(sed -rne 's/^[ \t]*'"$option"'[ \t]+'"'([^']+)'"'[ \t]*$/\1/p' "$config" | tail -n1)"
-	[ -n "$value" ] || value="$(sed -rne 's/^[ \t]*'"$option"'[ \t]+"(([^"\\]|\\.)+)"[ \t]*$/\1/p' "$config" | tail -n1 | sed -re 's/\\(.)/\1/g')"
-	[ -n "$value" ] || value="$(sed -rne 's/^[ \t]*'"$option"'[ \t]+(([^ \t\\]|\\.)+)[ \t]*$/\1/p' "$config" | tail -n1 | sed -re 's/\\(.)/\1/g')"
-	[ -n "$value" ] || return 1
-
-	export -n "$variable=$value"
-	return 0
-}
-
diff --git a/openvpn/files/openvpn.config b/openvpn/files/openvpn.config
deleted file mode 100644
index ea442c765..000000000
--- a/openvpn/files/openvpn.config
+++ /dev/null
@@ -1,506 +0,0 @@
-package openvpn
-
-#################################################
-# Sample to include a custom config file.       #
-#################################################
-
-config openvpn custom_config
-
-	# Set to 1 to enable this instance:
-	option enabled 0
-
-	# Credentials to login
-	#option username 'login'
-	#option password 'password'
-
-	# Password for client certificate
-	#option cert_password 'cert_password'
-
-	# Include OpenVPN configuration
-	option config /etc/openvpn/my-vpn.conf
-
-
-#################################################
-# Sample OpenVPN 2.0 uci config for             #
-# multi-client server.                          #
-#################################################
-
-config openvpn sample_server
-
-	# Set to 1 to enable this instance:
-	option enabled 0
-
-	# Which local IP address should OpenVPN
-	# listen on? (optional)
-#	option local 0.0.0.0
-
-	# Which TCP/UDP port should OpenVPN listen on?
-	# If you want to run multiple OpenVPN instances
-	# on the same machine, use a different port
-	# number for each one.  You will need to
-	# open up this port on your firewall.
-	option port 1194
-
-	# TCP or UDP server?
-#	option proto tcp
-	option proto udp
-
-	# "dev tun" will create a routed IP tunnel,
-	# "dev tap" will create an ethernet tunnel.
-	# Use "dev tap0" if you are ethernet bridging
-	# and have precreated a tap0 virtual interface
-	# and bridged it with your ethernet interface.
-	# If you want to control access policies
-	# over the VPN, you must create firewall
-	# rules for the the TUN/TAP interface.
-	# On non-Windows systems, you can give
-	# an explicit unit number, such as tun0.
-	# On Windows, use "dev-node" for this.
-	# On most systems, the VPN will not function
-	# unless you partially or fully disable
-	# the firewall for the TUN/TAP interface.
-#	option dev tap
-	option dev tun
-
-	# SSL/TLS root certificate (ca), certificate
-	# (cert), and private key (key).  Each client
-	# and the server must have their own cert and
-	# key file.  The server and all clients will
-	# use the same ca file.
-	#
-	# See the "easy-rsa" directory for a series
-	# of scripts for generating RSA certificates
-	# and private keys.  Remember to use
-	# a unique Common Name for the server
-	# and each of the client certificates.
-	#
-	# Any X509 key management system can be used.
-	# OpenVPN can also use a PKCS #12 formatted key file
-	# (see "pkcs12" directive in man page).
-	option ca /etc/openvpn/ca.crt
-	option cert /etc/openvpn/server.crt
-	# This file should be kept secret:
-	option key /etc/openvpn/server.key
-
-	# Diffie hellman parameters.
-	# Generate your own with:
-	#   openssl dhparam -out dh2048.pem 2048
-	# Substitute 2048 for 1024 if you are using
-	# 1024 bit keys.
-	option dh /etc/openvpn/dh2048.pem
-
-	# Configure server mode and supply a VPN subnet
-	# for OpenVPN to draw client addresses from.
-	# The server will take 10.8.0.1 for itself,
-	# the rest will be made available to clients.
-	# Each client will be able to reach the server
-	# on 10.8.0.1. Comment this line out if you are
-	# ethernet bridging. See the man page for more info.
-	option server "10.8.0.0 255.255.255.0"
-
-	# Maintain a record of client <-> virtual IP address
-	# associations in this file.  If OpenVPN goes down or
-	# is restarted, reconnecting clients can be assigned
-	# the same virtual IP address from the pool that was
-	# previously assigned.
-	option ifconfig_pool_persist /tmp/ipp.txt
-
-	# Configure server mode for ethernet bridging.
-	# You must first use your OS's bridging capability
-	# to bridge the TAP interface with the ethernet
-	# NIC interface.  Then you must manually set the
-	# IP/netmask on the bridge interface, here we
-	# assume 10.8.0.4/255.255.255.0.  Finally we
-	# must set aside an IP range in this subnet
-	# (start=10.8.0.50 end=10.8.0.100) to allocate
-	# to connecting clients.  Leave this line commented
-	# out unless you are ethernet bridging.
-#	option server_bridge "10.8.0.4 255.255.255.0 10.8.0.50 10.8.0.100"
-
-	# Push routes to the client to allow it
-	# to reach other private subnets behind
-	# the server.  Remember that these
-	# private subnets will also need
-	# to know to route the OpenVPN client
-	# address pool (10.8.0.0/255.255.255.0)
-	# back to the OpenVPN server.
-#	list push "route 192.168.10.0 255.255.255.0"
-#	list push "route 192.168.20.0 255.255.255.0"
-
-	# To assign specific IP addresses to specific
-	# clients or if a connecting client has a private
-	# subnet behind it that should also have VPN access,
-	# use the subdirectory "ccd" for client-specific
-	# configuration files (see man page for more info).
-
-	# EXAMPLE: Suppose the client
-	# having the certificate common name "Thelonious"
-	# also has a small subnet behind his connecting
-	# machine, such as 192.168.40.128/255.255.255.248.
-	# First, uncomment out these lines:
-#	option client_config_dir /etc/openvpn/ccd
-#	list route "192.168.40.128 255.255.255.248"
-	# Then create a file ccd/Thelonious with this line:
-	#   iroute 192.168.40.128 255.255.255.248
-	# This will allow Thelonious' private subnet to
-	# access the VPN.  This example will only work
-	# if you are routing, not bridging, i.e. you are
-	# using "dev tun" and "server" directives.
-
-	# EXAMPLE: Suppose you want to give
-	# Thelonious a fixed VPN IP address of 10.9.0.1.
-	# First uncomment out these lines:
-#	option client_config_dir /etc/openvpn/ccd
-#	list route "10.9.0.0 255.255.255.252"
-#	list route "192.168.100.0 255.255.255.0"
-	# Then add this line to ccd/Thelonious:
-	#   ifconfig-push "10.9.0.1 10.9.0.2"
-
-	# Suppose that you want to enable different
-	# firewall access policies for different groups
-	# of clients.  There are two methods:
-	# (1) Run multiple OpenVPN daemons, one for each
-	#     group, and firewall the TUN/TAP interface
-	#     for each group/daemon appropriately.
-	# (2) (Advanced) Create a script to dynamically
-	#     modify the firewall in response to access
-	#     from different clients.  See man
-	#     page for more info on learn-address script.
-#	option learn_address /etc/openvpn/script
-
-	# If enabled, this directive will configure
-	# all clients to redirect their default
-	# network gateway through the VPN, causing
-	# all IP traffic such as web browsing and
-	# and DNS lookups to go through the VPN
-	# (The OpenVPN server machine may need to NAT
-	# the TUN/TAP interface to the internet in
-	# order for this to work properly).
-	# CAVEAT: May break client's network config if
-	# client's local DHCP server packets get routed
-	# through the tunnel.  Solution: make sure
-	# client's local DHCP server is reachable via
-	# a more specific route than the default route
-	# of 0.0.0.0/0.0.0.0.
-#	list push "redirect-gateway"
-
-	# Certain Windows-specific network settings
-	# can be pushed to clients, such as DNS
-	# or WINS server addresses.  CAVEAT:
-	# http://openvpn.net/faq.html#dhcpcaveats
-#	list push "dhcp-option DNS 10.8.0.1"
-#	list push "dhcp-option WINS 10.8.0.1"
-
-	# Uncomment this directive to allow different
-	# clients to be able to "see" each other.
-	# By default, clients will only see the server.
-	# To force clients to only see the server, you
-	# will also need to appropriately firewall the
-	# server's TUN/TAP interface.
-#	option client_to_client 1
-
-	# Uncomment this directive if multiple clients
-	# might connect with the same certificate/key
-	# files or common names.  This is recommended
-	# only for testing purposes.  For production use,
-	# each client should have its own certificate/key
-	# pair.
-	#
-	# IF YOU HAVE NOT GENERATED INDIVIDUAL
-	# CERTIFICATE/KEY PAIRS FOR EACH CLIENT,
-	# EACH HAVING ITS OWN UNIQUE "COMMON NAME",
-	# UNCOMMENT THIS LINE OUT.
-#	option duplicate_cn 1
-
-	# The keepalive directive causes ping-like
-	# messages to be sent back and forth over
-	# the link so that each side knows when
-	# the other side has gone down.
-	# Ping every 10 seconds, assume that remote
-	# peer is down if no ping received during
-	# a 120 second time period.
-	option keepalive "10 120"
-
-	# For extra security beyond that provided
-	# by SSL/TLS, create an "HMAC firewall"
-	# to help block DoS attacks and UDP port flooding.
-	#
-	# Generate with:
-	#   openvpn --genkey --secret ta.key
-	#
-	# The server and each client must have
-	# a copy of this key.
-	# The second parameter should be '0'
-	# on the server and '1' on the clients.
-	# This file is secret:
-#	option tls_auth "/etc/openvpn/ta.key 0"
-
-	# For additional privacy, a shared secret key
-	# can be used for both authentication (as in tls_auth)
-	# and encryption of the TLS control channel.
-	#
-	# Generate a shared secret with:
-	# openvpn --genkey --secret ta.key
-	#
-	# The server and each client must have
-	# a copy of this key.
-	#
-	# tls_auth and tls_crypt should NOT
-	# be combined, as tls_crypt implies tls_auth.
-	# Use EITHER tls_crypt, tls_auth, or neither option.
-#	option tls_crypt "/etc/openvpn/ta.key"
-
-	# Set the minimum required TLS protocol version
-	# for all connections.
-	#
-	# Require at least TLS 1.1
-#	option tls_version_min "1.1"
-	# Require at least TLS 1.2
-#	option tls_version_min "1.2"
-	# Require TLS 1.2, or the highest version supported
-	# on the system
-#	option tls_version_min "1.2 'or-highest'"
-
-	# List the preferred ciphers to use for the data channel.
-	# Run openvpn --show-ciphers to see all supported ciphers.
-#	list data_ciphers 'AES-256-GCM'
-#	list data_ciphers 'AES-128-GCM'
-#	list data_ciphers 'CHACHA20-POLY1305'
-
-	# Set a fallback cipher in order to be compatible with
-	# peers that do not support cipher negotiation.
-	#
-	# Use AES-256-CBC as fallback
-#	option data_ciphers_fallback 'AES-128-CBC'
-	# Use AES-128-CBC as fallback
-#	option data_ciphers_fallback 'AES-256-CBC'
-	# Use Triple-DES as fallback
-#	option data_ciphers_fallback 'DES-EDE3-CBC'
-	# Use BF-CBC as fallback
-#	option data_ciphers_fallback 'BF-CBC'
-
-	# OpenVPN versions 2.4 and later will attempt to
-	# automatically negotiate the most secure cipher
-	# between the client and server, regardless of a
-	# configured "option cipher" (see below).
-	# Automatic negotiation is recommended.
-	#
-	# Uncomment this option to disable this behavior,
-	# and force all OpenVPN peers to use the configured
-	# cipher option instead (not recommended).
-#	option ncp_disable
-
-	# Enable compression on the VPN link.
-	# If you enable it here, you must also
-	# enable it in the client config file.
-	#
-	# Compression is not recommended, as compression and
-	# encryption in combination can weaken the security
-	# of the connection.
-	#
-	# LZ4 requires OpenVPN 2.4+ client and server
-#	option compress lz4
-	# LZO is available by default only in openvpn-openssl variant
-	# LZO is compatible with most OpenVPN versions
-#	option compress lzo
-	
-	# Control how OpenVPN handles peers using compression
-	#
-	# Do not allow any connections using compression
-#	option allow_compression 'no'
-	# Allow incoming compressed packets, but do not send compressed packets to other peers
-	# This can be useful when migrating old configurations with compression activated
-#	option allow_compression 'asym'
-	# Both incoming and outgoing packets may be compressed
-#	option allow_compression 'yes'
-
-	# The maximum number of concurrently connected
-	# clients we want to allow.
-#	option max_clients 100
-
-	# The persist options will try to avoid
-	# accessing certain resources on restart
-	# that may no longer be accessible because
-	# of the privilege downgrade.
-	option persist_key 1
-	option persist_tun 1
-	option user nobody
-
-	# Output a short status file showing
-	# current connections, truncated
-	# and rewritten every minute.
-	option status /tmp/openvpn-status.log
-
-	# By default, log messages will go to the syslog (or
-	# on Windows, if running as a service, they will go to
-	# the "\Program Files\OpenVPN\log" directory).
-	# Use log or log-append to override this default.
-	# "log" will truncate the log file on OpenVPN startup,
-	# while "log-append" will append to it.  Use one
-	# or the other (but not both).
-#	option log         /tmp/openvpn.log
-#	option log_append  /tmp/openvpn.log
-
-	# Set the appropriate level of log
-	# file verbosity.
-	#
-	# 0 is silent, except for fatal errors
-	# 4 is reasonable for general usage
-	# 5 and 6 can help to debug connection problems
-	# 9 is extremely verbose
-	option verb 3
-
-	# Silence repeating messages.  At most 20
-	# sequential messages of the same message
-	# category will be output to the log.
-#	option mute 20
-
-
-##############################################
-# Sample client-side OpenVPN 2.0 uci config  #
-# for connecting to multi-client server.     #
-##############################################
-
-config openvpn sample_client
-
-	# Set to 1 to enable this instance:
-	option enabled 0
-
-	# Specify that we are a client and that we
-	# will be pulling certain config file directives
-	# from the server.
-	option client 1
-
-	# Use the same setting as you are using on
-	# the server.
-	# On most systems, the VPN will not function
-	# unless you partially or fully disable
-	# the firewall for the TUN/TAP interface.
-#	option dev tap
-	option dev tun
-
-	# Are we connecting to a TCP or
-	# UDP server?  Use the same setting as
-	# on the server.
-#	option proto tcp
-	option proto udp
-
-	# The hostname/IP and port of the server.
-	# You can have multiple remote entries
-	# to load balance between the servers.
-	list remote "my_server_1 1194"
-#	list remote "my_server_2 1194"
-
-	# Choose a random host from the remote
-	# list for load_balancing.  Otherwise
-	# try hosts in the order specified.
-#	option remote_random 1
-
-	# Keep trying indefinitely to resolve the
-	# host name of the OpenVPN server.  Very useful
-	# on machines which are not permanently connected
-	# to the internet such as laptops.
-	option resolv_retry infinite
-
-	# Most clients don't need to bind to
-	# a specific local port number.
-	option nobind 1
-
-	# Try to preserve some state across restarts.
-	option persist_key 1
-	option persist_tun 1
-	option user nobody
-
-	# If you are connecting through an
-	# HTTP proxy to reach the actual OpenVPN
-	# server, put the proxy server/IP and
-	# port number here.  See the man page
-	# if your proxy server requires
-	# authentication.
-	# retry on connection failures:
-#	option http_proxy_retry 1
-	# specify http proxy address and port:
-#	option http_proxy "192.168.1.100 8080"
-
-	# Wireless networks often produce a lot
-	# of duplicate packets.  Set this flag
-	# to silence duplicate packet warnings.
-#	option mute_replay_warnings 1
-
-	# SSL/TLS parms.
-	# See the server config file for more
-	# description.  It's best to use
-	# a separate .crt/.key file pair
-	# for each client.  A single ca
-	# file can be used for all clients.
-	option ca /etc/openvpn/ca.crt
-	option cert /etc/openvpn/client.crt
-	option key /etc/openvpn/client.key
-
-	# Verify server certificate by checking
-	# that the certicate has the key usage
-	# field set to "server".  This is an
-	# important precaution to protect against
-	# a potential attack discussed here:
-	#  http://openvpn.net/howto.html#mitm
-	#
-	# To use this feature, you will need to generate
-	# your server certificates with the nsCertType
-	# field set to "server".  The build_key_server
-	# script in the easy_rsa folder will do this.
-#	option remote_cert_tls server
-
-	# If a tls_auth key is used on the server
-	# then every client must also have the key.
-#	option tls_auth "/etc/openvpn/ta.key 1"
-
-	# If a tls_crypt key is used on the server
-	# every client must also have the key.
-#	option tls_crypt "/etc/openvpn/ta.key"
-
-	# Set the minimum required TLS protocol version
-	# for all connections.
-	#
-	# Require at least TLS 1.1
-#	option tls_version_min "1.1"
-	# Require at least TLS 1.2
-#	option tls_version_min "1.2"
-	# Require TLS 1.2, or the highest version supported
-	# on the system
-#	option tls_version_min "1.2 'or-highest'"
-
-	# List the preferred ciphers for the data channel.
-#	list data_ciphers 'AES-256-GCM'
-#	list data_ciphers 'AES-128-GCM'
-#	list data_ciphers 'CHACHA20-POLY1305'
-
-	# Set a fallback cipher if you connect to a peer that does
-	# not support cipher negotiation.
-	# Use AES-256-CBC as fallback
-#	option data_ciphers_fallback 'AES-128-CBC'
-	# Use AES-128-CBC as fallback
-#	option data_ciphers_fallback 'AES-256-CBC'
-	# Use Triple-DES as fallback
-#	option data_ciphers_fallback 'DES-EDE3-CBC'
-	# Use BF-CBC as fallback
-#	option data_ciphers_fallback 'BF-CBC'
-
-	# Enable compression on the VPN link.
-	# Don't enable this unless it is also
-	# enabled in the server config file.
-	#
-	# Compression is not recommended, as compression and
-	# encryption in combination can weaken the security
-	# of the connection.
-	#
-	# LZ4 requires OpenVPN 2.4+ on server and client
-#	option compress lz4
-	# LZO is available by default only in openvpn-openssl variant
-	# LZO is compatible with most OpenVPN versions
-#	option compress lzo
-
-	# Set log file verbosity.
-	option verb 3
-
-	# Silence repeating messages
-#	option mute 20
diff --git a/openvpn/files/openvpn.init b/openvpn/files/openvpn.init
deleted file mode 100644
index f7dc006ce..000000000
--- a/openvpn/files/openvpn.init
+++ /dev/null
@@ -1,253 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2008-2013 OpenWrt.org
-# Copyright (C) 2008 Jo-Philipp Wich
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-
-START=90
-STOP=10
-
-USE_PROCD=1
-PROG=/usr/sbin/openvpn
-
-LIST_SEP="
-"
-
-UCI_STARTED=
-UCI_DISABLED=
-
-append_param() {
-	local s="$1"
-	local v="$2"
-	case "$v" in
-		*_*_*_*) v=${v%%_*}-${v#*_}; v=${v%%_*}-${v#*_}; v=${v%%_*}-${v#*_} ;;
-		*_*_*)   v=${v%%_*}-${v#*_}; v=${v%%_*}-${v#*_} ;;
-		*_*)     v=${v%%_*}-${v#*_} ;;
-	esac
-	echo -n "$v" >> "/var/etc/openvpn-$s.conf"
-	return 0
-}
-
-append_bools() {
-	local p; local v; local s="$1"; shift
-	for p in $*; do
-		config_get_bool v "$s" "$p"
-		[ "$v" = 1 ] && append_param "$s" "$p" && echo >> "/var/etc/openvpn-$s.conf"
-	done
-}
-
-append_params() {
-	local p; local v; local s="$1"; shift
-	for p in $*; do
-		config_get v "$s" "$p"
-		IFS="$LIST_SEP"
-		for v in $v; do
-			[ -n "$v" ] && [ "$p" != "push" ] && append_param "$s" "$p" && echo " $v" >> "/var/etc/openvpn-$s.conf"
-			[ -n "$v" ] && [ "$p" = "push" ] && append_param "$s" "$p" && echo " \"$v\"" >> "/var/etc/openvpn-$s.conf"
-		done
-		unset IFS
-	done
-}
-
-append_list() {
-	local p; local v; local s="$1"; shift
-
-	list_cb_append() {
-		v="${v}:$1"
-	}
-
-	for p in $*; do
-		unset v
-		config_list_foreach "$s" "$p" list_cb_append
-		[ -n "$v" ] && append_param "$s" "$p" && echo " ${v:1}" >> "/var/etc/openvpn-$s.conf"
-	done
-}
-
-section_enabled() {
-	config_get_bool enable  "$1" 'enable'  0
-	config_get_bool enabled "$1" 'enabled' 0
-	[ $enable -gt 0 ] || [ $enabled -gt 0 ]
-}
-
-create_temp_file() {
-	mkdir -p "$(dirname "$1")"
-	rm -f "$1"
-	touch "$1"
-	chown root "$1"
-	chmod 0600 "$1"
-}
-
-openvpn_get_dev() {
-	local dev dev_type
-	local name="$1"
-	local conf="$2"
-
-	# Do override only for configurations with config_file
-	config_get config_file "$name" config
-	[ -n "$config_file" ] || return
-
-	# Check there is someething to override
-	config_get dev "$name" dev
-	config_get dev_type "$name" dev_type
-	[ -n "$dev" ] || return
-
-	# If there is a no dev_type, try to guess it
-	if [ -z "$dev_type" ]; then
-		. /lib/functions/openvpn.sh
-
-		local odev odev_type
-		get_openvpn_option "$conf" odev dev
-		get_openvpn_option "$conf" odev_type dev-type
-		[ -n "$odev_type" ] || odev_type="$odev"
-
-		case "$odev_type" in
-			tun*) dev_type="tun" ;;
-			tap*) dev_type="tap" ;;
-			*) return;;
-		esac
-	fi
-
-	# Return overrides
-	echo "--dev-type $dev_type --dev $dev"
-}
-
-openvpn_get_credentials() {
-	local name="$1"
-	local ret=""
-
-	config_get cert_password "$name" cert_password
-	config_get password "$name" password
-	config_get username "$name" username
-
-	if [ -n "$cert_password" ]; then
-		create_temp_file /var/run/openvpn.$name.pass
-		echo "$cert_password" > /var/run/openvpn.$name.pass
-		ret=" --askpass /var/run/openvpn.$name.pass "
-	fi
-
-	if [ -n "$username" ]; then
-		create_temp_file /var/run/openvpn.$name.userpass
-		echo "$username" > /var/run/openvpn.$name.userpass
-		echo "$password" >> /var/run/openvpn.$name.userpass
-		ret=" --auth-user-pass /var/run/openvpn.$name.userpass "
-	fi
-
-	# Return overrides
-	echo "$ret"
-}
-
-openvpn_add_instance() {
-	local name="$1"
-	local dir="$2"
-	local conf="$3"
-	local security="$4"
-	local up="$5"
-	local down="$6"
-
-	procd_open_instance "$name"
-	procd_set_param command "$PROG"	\
-		--syslog "openvpn($name)" \
-		--status "/var/run/openvpn.$name.status" \
-		--cd "$dir" \
-		--config "$conf" \
-		--up "/usr/libexec/openvpn-hotplug up $name" \
-		--down "/usr/libexec/openvpn-hotplug down $name" \
-		${up:+--setenv user_up "$up"} \
-		${down:+--setenv user_down "$down"} \
-		--script-security "${security:-2}" \
-		$(openvpn_get_dev "$name" "$conf") \
-		$(openvpn_get_credentials "$name" "$conf")
-	procd_set_param file "$dir/$conf"
-	procd_set_param term_timeout 15
-	procd_set_param respawn
-	procd_append_param respawn 3600
-	procd_append_param respawn 5
-	procd_append_param respawn -1
-	procd_close_instance
-}
-
-start_instance() {
-	local s="$1"
-
-	config_get config "$s" config
-	config="${config:+$(readlink -f "$config")}"
-
-	section_enabled "$s" || {
-		append UCI_DISABLED "$config" "$LIST_SEP"
-		return 1
-	}
-
-	local up down script_security
-	config_get up "$s" up
-	config_get down "$s" down
-	config_get script_security "$s" script_security
-
-	[ ! -d "/var/run" ] && mkdir -p "/var/run"
-
-	if [ ! -z "$config" ]; then
-		append UCI_STARTED "$config" "$LIST_SEP"
-		[ -n "$up" ] || get_openvpn_option "$config" up up
-		[ -n "$down" ] || get_openvpn_option "$config" down down
-		openvpn_add_instance "$s" "${config%/*}" "$config" "$script_security" "$up" "$down"
-		return
-	fi
-
-	create_temp_file "/var/etc/openvpn-$s.conf"
-
-	append_bools "$s" $OPENVPN_BOOLS
-	append_params "$s" $OPENVPN_PARAMS
-	append_list "$s" $OPENVPN_LIST
-
-	openvpn_add_instance "$s" "/var/etc" "openvpn-$s.conf" "$script_security" "$up" "$down"
-}
-
-start_service() {
-	local instance="$1"
-	local instance_found=0
-
-	config_cb() {
-		local type="$1"
-		local name="$2"
-		if [ "$type" = "openvpn" ]; then
-			if [ -n "$instance" -a "$instance" = "$name" ]; then
-				instance_found=1
-			fi
-		fi
-	}
-
-	. /lib/functions/openvpn.sh
-	. /usr/share/openvpn/openvpn.options
-	config_load 'openvpn'
-
-	if [ -n "$instance" ]; then
-		[ "$instance_found" -gt 0 ] || return
-		start_instance "$instance"
-	else
-		config_foreach start_instance 'openvpn'
-
-		local path name up down
-		for path in /etc/openvpn/*.conf; do
-			if [ -f "$path" ]; then
-				name="${path##*/}"; name="${name%.conf}"
-
-				# don't start configs again that are already started by uci
-				if echo "$UCI_STARTED" | grep -qxF "$path"; then
-					continue
-
-				# don't start configs which are set to disabled in uci
-				elif echo "$UCI_DISABLED" | grep -qxF "$path"; then
-					logger -t openvpn "$name.conf is disabled in /etc/config/openvpn"
-					continue
-				fi
-
-				get_openvpn_option "$path" up up || up=""
-				get_openvpn_option "$path" down down || down=""
-				openvpn_add_instance "$name" "${path%/*}" "$path" "" "$up" "$down"
-			fi
-		done
-	fi
-}
-
-service_triggers() {
-	procd_add_reload_trigger openvpn
-}
diff --git a/openvpn/files/openvpn.options b/openvpn/files/openvpn.options
deleted file mode 100644
index 5a7c756f7..000000000
--- a/openvpn/files/openvpn.options
+++ /dev/null
@@ -1,206 +0,0 @@
-OPENVPN_PARAMS='
-allow_compression
-askpass
-auth
-auth_retry
-auth_user_pass
-auth_user_pass_verify
-bcast_buffers
-bind_dev
-ca
-capath
-cd
-cert
-chroot
-cipher
-client_config_dir
-client_connect
-client_disconnect
-comp_lzo
-compress
-connect_freq
-connect_retry
-connect_retry_max
-connect_timeout
-crl_verify
-data_ciphers_fallback
-dev
-dev_node
-dev_type
-dh
-ecdh_curve
-echo
-engine
-explicit_exit_notify
-extra_certs
-fragment
-group
-hand_window
-hash_size
-http_proxy
-http_proxy_option
-http_proxy_timeout
-ifconfig
-ifconfig_ipv6
-ifconfig_ipv6_pool
-ifconfig_ipv6_push
-ifconfig_pool
-ifconfig_pool_persist
-ifconfig_push
-inactive
-ipchange
-iroute
-iroute_ipv6
-keepalive
-key
-key_direction
-keysize
-learn_address
-link_mtu
-lladdr
-local
-log
-log_append
-lport
-management
-management_log_cache
-max_clients
-max_routes_per_client
-mode
-mssfix
-mtu_disc
-mute
-nice
-ping
-ping_exit
-ping_restart
-pkcs12
-plugin
-port
-port_share
-prng
-proto
-pull_filter
-push
-rcvbuf
-redirect_gateway
-remap_usr1
-remote
-remote_cert_eku
-remote_cert_ku
-remote_cert_tls
-reneg_bytes
-reneg_pkts
-reneg_sec
-replay_persist
-replay_window
-resolv_retry
-route
-route_delay
-route_gateway
-route_ipv6
-route_metric
-route_pre_down
-route_up
-rport
-secret
-server
-server_bridge
-server_ipv6
-server_poll_timeout
-setenv
-shaper
-sndbuf
-socks_proxy
-status
-status_version
-syslog
-tcp_queue_limit
-tls_auth
-tls_crypt
-tls_crypt_v2
-tls_crypt_v2_verify
-tls_export_cert
-tls_timeout
-tls_verify
-tls_version_min
-tmp_dir
-topology
-tran_window
-tun_mtu
-tun_mtu_extra
-txqueuelen
-user
-verb
-verify_client_cert
-verify_x509_name
-vlan_accept
-vlan_pvid
-x509_username_field
-'
-
-OPENVPN_BOOLS='
-allow_recursive_routing
-auth_nocache
-auth_user_pass_optional
-bind
-block_ipv6
-ccd_exclusive
-client
-client_to_client
-comp_noadapt
-disable
-disable_occ
-down_pre
-duplicate_cn
-fast_io
-float
-http_proxy_retry
-ifconfig_noexec
-ifconfig_nowarn
-management_forget_disconnect
-management_hold
-management_query_passwords
-management_signal
-mktun
-mlock
-mtu_test
-multihome
-mute_replay_warnings
-ncp_disable
-nobind
-opt_verify
-passtos
-persist_key
-persist_local_ip
-persist_remote_ip
-persist_tun
-ping_timer_rem
-pull
-push_peer_info
-push_reset
-remote_random
-rmtun
-route_noexec
-route_nopull
-single_session
-socks_proxy_retry
-suppress_timestamps
-tcp_nodelay
-test_crypto
-tls_client
-tls_exit
-tls_server
-up_delay
-up_restart
-username_as_common_name
-vlan_tagging
-'
-
-OPENVPN_LIST='
-data_ciphers
-ncp_ciphers
-tls_cipher
-tls_ciphersuites
-tls_groups
-'
diff --git a/openvpn/files/openvpn.upgrade b/openvpn/files/openvpn.upgrade
deleted file mode 100644
index 6ae49d22d..000000000
--- a/openvpn/files/openvpn.upgrade
+++ /dev/null
@@ -1 +0,0 @@
-/etc/openvpn/
diff --git a/openvpn/files/usr/libexec/openvpn-hotplug b/openvpn/files/usr/libexec/openvpn-hotplug
deleted file mode 100644
index 9235fbacf..000000000
--- a/openvpn/files/usr/libexec/openvpn-hotplug
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-ACTION=$1
-shift
-INSTANCE=$1
-shift
-
-export ACTION=$ACTION
-export INSTANCE=$INSTANCE
-exec /sbin/hotplug-call openvpn "$@"
diff --git a/openvpn/patches/001-reproducible-remove_DATE.patch b/openvpn/patches/001-reproducible-remove_DATE.patch
deleted file mode 100644
index e4e6d3941..000000000
--- a/openvpn/patches/001-reproducible-remove_DATE.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/openvpn/options.c
-+++ b/src/openvpn/options.c
-@@ -105,7 +105,6 @@ const char title_string[] =
- #endif
- #endif
-     " [AEAD]"
--    " built on " __DATE__
- ;
- 
- #ifndef ENABLE_SMALL
diff --git a/openvpn/patches/100-mbedtls-disable-runtime-version-check.patch b/openvpn/patches/100-mbedtls-disable-runtime-version-check.patch
deleted file mode 100644
index 8d49d167c..000000000
--- a/openvpn/patches/100-mbedtls-disable-runtime-version-check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/openvpn/ssl_mbedtls.c
-+++ b/src/openvpn/ssl_mbedtls.c
-@@ -1538,7 +1538,7 @@ const char *
- get_ssl_library_version(void)
- {
-     static char mbedtls_version[30];
--    unsigned int pv = mbedtls_version_get_number();
-+    unsigned int pv = MBEDTLS_VERSION_NUMBER;
-     sprintf( mbedtls_version, "mbed TLS %d.%d.%d",
-              (pv>>24)&0xff, (pv>>16)&0xff, (pv>>8)&0xff );
-     return mbedtls_version;
diff --git a/openvpn/patches/210-build_always_use_internal_lz4.patch b/openvpn/patches/210-build_always_use_internal_lz4.patch
deleted file mode 100644
index a99f92364..000000000
--- a/openvpn/patches/210-build_always_use_internal_lz4.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1077,68 +1077,15 @@ dnl
- AC_ARG_VAR([LZ4_CFLAGS], [C compiler flags for lz4])
- AC_ARG_VAR([LZ4_LIBS], [linker flags for lz4])
- if test "$enable_lz4" = "yes" && test "$enable_comp_stub" = "no"; then
--    if test -z "${LZ4_CFLAGS}" -a -z "${LZ4_LIBS}"; then
--	# if the user did not explicitly specify flags, try to autodetect
--	PKG_CHECK_MODULES([LZ4],
--			  [liblz4 >= 1.7.1 liblz4 < 100],
--			  [have_lz4="yes"],
--			  [LZ4_LIBS="-llz4"] # If this fails, we will do another test next.
--					     # We also add set LZ4_LIBS otherwise the
--					     # linker will not know about the lz4 library
--	)
--    fi
- 
-     saved_CFLAGS="${CFLAGS}"
-     saved_LIBS="${LIBS}"
-     CFLAGS="${CFLAGS} ${LZ4_CFLAGS}"
-     LIBS="${LIBS} ${LZ4_LIBS}"
- 
--    # If pkgconfig check failed or LZ4_CFLAGS/LZ4_LIBS env vars
--    # are used, check the version directly in the LZ4 include file
--    if test "${have_lz4}" != "yes"; then
--	AC_CHECK_HEADERS([lz4.h],
--			 [have_lz4h="yes"],
--			 [])
--
--	if test "${have_lz4h}" = "yes" ; then
--	    AC_MSG_CHECKING([additionally if system LZ4 version >= 1.7.1])
--	    AC_COMPILE_IFELSE(
--		[AC_LANG_PROGRAM([[
--#include <lz4.h>
--				 ]],
--				 [[
--/* Version encoding: MMNNPP (Major miNor Patch) - see lz4.h for details */
--#if LZ4_VERSION_NUMBER < 10701L
--#error LZ4 is too old
--#endif
--				 ]]
--				)],
--		[
--		    AC_MSG_RESULT([ok])
--		    have_lz4="yes"
--		],
--		[AC_MSG_RESULT([system LZ4 library is too old])]
--	    )
--	fi
--    fi
--
--    # Double check we have a few needed functions
--    if test "${have_lz4}" = "yes" ; then
--	AC_CHECK_LIB([lz4],
--		     [LZ4_compress_default],
--		     [],
--		     [have_lz4="no"])
--	AC_CHECK_LIB([lz4],
--		     [LZ4_decompress_safe],
--		     [],
--		     [have_lz4="no"])
--    fi
--
--    if test "${have_lz4}" != "yes" ; then
--	AC_MSG_RESULT([		usable LZ4 library or header not found, using version in src/compat/compat-lz4.*])
--	AC_DEFINE([NEED_COMPAT_LZ4], [1], [use copy of LZ4 source in compat/])
--	LZ4_LIBS=""
--    fi
-+    AC_MSG_RESULT([		usable LZ4 library or header not found, using version in src/compat/compat-lz4.*])
-+    AC_DEFINE([NEED_COMPAT_LZ4], [1], [use copy of LZ4 source in compat/])
-+    LZ4_LIBS=""
-     OPTIONAL_LZ4_CFLAGS="${LZ4_CFLAGS}"
-     OPTIONAL_LZ4_LIBS="${LZ4_LIBS}"
-     AC_DEFINE(ENABLE_LZ4, [1], [Enable LZ4 compression library])
diff --git a/openvpn/patches/220-disable_des.patch b/openvpn/patches/220-disable_des.patch
deleted file mode 100644
index 9ddf1047b..000000000
--- a/openvpn/patches/220-disable_des.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/src/openvpn/syshead.h
-+++ b/src/openvpn/syshead.h
-@@ -572,7 +572,7 @@ socket_defined(const socket_descriptor_t
- /*
-  * Should we include NTLM proxy functionality
-  */
--#define NTLM 1
-+//#define NTLM 1
- 
- /*
-  * Should we include proxy digest auth functionality
---- a/src/openvpn/crypto_mbedtls.c
-+++ b/src/openvpn/crypto_mbedtls.c
-@@ -383,6 +383,7 @@ int
- key_des_num_cblocks(const mbedtls_cipher_info_t *kt)
- {
-     int ret = 0;
-+#ifdef MBEDTLS_DES_C
-     if (kt->type == MBEDTLS_CIPHER_DES_CBC)
-     {
-         ret = 1;
-@@ -395,6 +396,7 @@ key_des_num_cblocks(const mbedtls_cipher
-     {
-         ret = 3;
-     }
-+#endif
- 
-     dmsg(D_CRYPTO_DEBUG, "CRYPTO INFO: n_DES_cblocks=%d", ret);
-     return ret;
-@@ -403,6 +405,7 @@ key_des_num_cblocks(const mbedtls_cipher
- bool
- key_des_check(uint8_t *key, int key_len, int ndc)
- {
-+#ifdef MBEDTLS_DES_C
-     int i;
-     struct buffer b;
- 
-@@ -431,11 +434,15 @@ key_des_check(uint8_t *key, int key_len,
- 
- err:
-     return false;
-+#else
-+    return true;
-+#endif
- }
- 
- void
- key_des_fixup(uint8_t *key, int key_len, int ndc)
- {
-+#ifdef MBEDTLS_DES_C
-     int i;
-     struct buffer b;
- 
-@@ -450,6 +457,7 @@ key_des_fixup(uint8_t *key, int key_len,
-         }
-         mbedtls_des_key_set_parity(key);
-     }
-+#endif
- }
- 
- /*
-@@ -770,10 +778,12 @@ cipher_des_encrypt_ecb(const unsigned ch
-                        unsigned char *src,
-                        unsigned char *dst)
- {
-+#ifdef MBEDTLS_DES_C
-     mbedtls_des_context ctx;
- 
-     ASSERT(mbed_ok(mbedtls_des_setkey_enc(&ctx, key)));
-     ASSERT(mbed_ok(mbedtls_des_crypt_ecb(&ctx, src, dst)));
-+#endif
- }
- 
- 
diff --git a/openvpn/test.sh b/openvpn/test.sh
deleted file mode 100644
index b51ccd6a1..000000000
--- a/openvpn/test.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	"openvpn-mbedtls")
-		openvpn --version | grep "$2.*SSL (mbed TLS)"
-		;;
-	"openvpn-openssl")
-		openvpn --version | grep "$2.*SSL (OpenSSL)"
-		;;
-esac
diff --git a/uwsgi/Makefile b/uwsgi/Makefile
deleted file mode 100644
index 4cc077ee9..000000000
--- a/uwsgi/Makefile
+++ /dev/null
@@ -1,171 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=uwsgi
-PKG_VERSION:=2.0.19.1
-PKG_RELEASE:=1
-
-PYPI_NAME:=uWSGI
-PKG_HASH:=skip
-PKG_BUILD_DEPENDS:=python3/host
-PYTHON3_PKG_BUILD:=0
-
-PKG_LICENSE:=GPL-2.0-or-later
-PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=Ansuel Smith <ansuelsmth@gmail.com>
-
-include $(TOPDIR)/feeds/packages/lang/python/pypi.mk
-include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
-#for LINUX_UNAME_VERSION:
-include $(INCLUDE_DIR)/kernel.mk
-
-#the .tar.gz does not wrap it into a uWSGI dir; do not use "$(1)/..":
-TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
-
-define Package/uwsgi
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Web Servers/Proxies
-  TITLE:=The uWSGI server
-  URL:=https://uwsgi-docs.readthedocs.io/en/latest/
-  DEPENDS:=+libpcre +libcap +libuuid
-  MENU:=1
-endef
-
-define Package/uwsgi-logfile-plugin
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Web Servers/Proxies
-  TITLE:=The Logfile plugin for the uWSGI server
-  DEPENDS:=uwsgi
-  MDEPENDS:=uwsgi
-endef
-
-define Package/uwsgi-syslog-plugin
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Web Servers/Proxies
-  TITLE:=The Syslog plugin for the uWSGI server
-  DEPENDS:=uwsgi
-  MDEPENDS:=uwsgi
-endef
-
-define Package/uwsgi-cgi-plugin
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Web Servers/Proxies
-  TITLE:=The CGI plugin for the uWSGI server
-  DEPENDS:=uwsgi
-  MDEPENDS:=uwsgi
-endef
-
-define Package/uwsgi-python3-plugin
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Web Servers/Proxies
-  TITLE:=The Python3 plugin for the uWSGI server
-  DEPENDS:=uwsgi +python3-light
-  MDEPENDS:=uwsgi
-endef
-
-define Package/uwsgi-luci-support
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Web Servers/Proxies
-  TITLE:=Support files for LuCI on Nginx
-  DEPENDS:=uwsgi +uwsgi-syslog-plugin +uwsgi-cgi-plugin
-  MDEPENDS:=uwsgi
-endef
-
-define Package/uwsgi/description
-	The uWSGI project (to be used together with nginx or nginx-ssl).
-endef
-
-define Package/uwsgi-logfile-plugin/description
-	The Logfile plugin for the uWSGI project.
-endef
-
-define Package/uwsgi-syslog-plugin/description
-	The Syslog plugin for the uWSGI project.
-endef
-
-define Package/uwsgi-cgi-plugin/description
-	The CGI plugin for the uWSGI project.
-endef
-
-define Package/uwsgi-python3-plugin/description
-	The Python3 plugin for the uWSGI project.
-endef
-
-define Package/uwsgi-luci-support/description
-	Support files for LuCI on Nginx
-endef
-
-MAKE_VARS+=\
-	CPP=$(TARGET_CROSS)cpp \
-	PYTHON=$(STAGING_DIR_HOSTPKG)/bin/python3 \
-	LINUX_UNAME_VERSION=$(LINUX_UNAME_VERSION)
-
-define Build/Compile
-	$(call Build/Compile/Default,PROFILE=openwrt)
-	$(call Build/Compile/Default,plugin.logfile PROFILE=openwrt)
-	$(call Build/Compile/Default,plugin.syslog PROFILE=openwrt)
-	$(call Build/Compile/Default,plugin.cgi PROFILE=openwrt)
-	$(call Python3/Run, \
-		$(PKG_BUILD_DIR), \
-		uwsgiconfig.py --plugin plugins/python openwrt, \
-		CPP="$(TARGET_CROSS)cpp" \
-		LINUX_UNAME_VERSION=$(LINUX_UNAME_VERSION) \
-		CFLAGS="$(TARGET_CPPFLAGS) -I$(PYTHON3_INC_DIR) $(TARGET_CFLAGS)" \
-	)
-endef
-
-define Package/uwsgi/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uwsgi $(1)/usr/sbin/
-
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/uwsgi.init $(1)/etc/init.d/uwsgi
-
-	$(INSTALL_DIR) $(1)/etc/uwsgi
-	$(INSTALL_CONF) ./files/emperor.ini $(1)/etc/uwsgi/emperor.ini
-
-	$(INSTALL_DIR) $(1)/etc/uwsgi/vassals
-endef
-
-define Package/uwsgi/conffiles
-/etc/uwsgi/emperor.ini
-endef
-
-define Package/uwsgi-logfile-plugin/install
-	$(INSTALL_DIR) $(1)/usr/lib/uwsgi
-	$(CP) $(PKG_BUILD_DIR)/logfile_plugin.so $(1)/usr/lib/uwsgi/
-endef
-
-define Package/uwsgi-syslog-plugin/install
-	$(INSTALL_DIR) $(1)/usr/lib/uwsgi
-	$(CP) $(PKG_BUILD_DIR)/syslog_plugin.so $(1)/usr/lib/uwsgi/
-endef
-
-define Package/uwsgi-cgi-plugin/install
-	$(INSTALL_DIR) $(1)/usr/lib/uwsgi
-	$(CP) $(PKG_BUILD_DIR)/cgi_plugin.so $(1)/usr/lib/uwsgi/
-endef
-
-define Package/uwsgi-python3-plugin/install
-	$(INSTALL_DIR) $(1)/usr/lib/uwsgi
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/python_plugin.so $(1)/usr/lib/uwsgi/
-endef
-
-define Package/uwsgi-luci-support/install
-	$(INSTALL_DIR) $(1)/etc/uwsgi/vassals
-	$(INSTALL_DATA) ./files-luci-support/luci-webui.ini $(1)/etc/uwsgi/vassals/luci-webui.ini
-	$(INSTALL_DATA) ./files-luci-support/luci-cgi_io.ini $(1)/etc/uwsgi/vassals/luci-cgi_io.ini
-endef
-
-$(eval $(call BuildPackage,uwsgi))
-$(eval $(call BuildPackage,uwsgi-logfile-plugin))
-$(eval $(call BuildPackage,uwsgi-syslog-plugin))
-$(eval $(call BuildPackage,uwsgi-cgi-plugin))
-$(eval $(call BuildPackage,uwsgi-python3-plugin))
-$(eval $(call BuildPackage,uwsgi-luci-support))
diff --git a/uwsgi/files-luci-support/luci-cgi_io.ini b/uwsgi/files-luci-support/luci-cgi_io.ini
deleted file mode 100644
index 3c84284de..000000000
--- a/uwsgi/files-luci-support/luci-cgi_io.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[uwsgi]
-strict = true
-if-not-env = UWSGI_EMPEROR_FD
-socket = /var/run/luci-cgi_io.socket
-chmod-socket = 666
-cheap = true
-end-if =
-plugin = cgi
-cgi-mode = true
-cgi = /www/
-chdir = /usr/lib/lua/luci/
-buffer-size = 10000
-reload-mercy = 8
-max-requests = 2000
-limit-as = 1000
-reload-on-as = 256
-reload-on-rss = 192
-no-orphans = true
-post-buffering = 8192
-socket-timeout = 120
-thunder-lock = true
-plugin = syslog
-disable-logging = true
-req-logger = syslog:uwsgi-luci-cgi_io
-log-format=%(method) %(uri) => return %(status) (%(rsize) bytes in %(msecs) ms)
-chmod-socket = 666
-cgi-safe = /usr/libexec/cgi-io
-cgi-dontresolve = true
-cgi-close-stdin-on-eof = true
-cheap = true
-idle = 360
-cgi-timeout = 60
diff --git a/uwsgi/files-luci-support/luci-webui.ini b/uwsgi/files-luci-support/luci-webui.ini
deleted file mode 100644
index 1b280c5a6..000000000
--- a/uwsgi/files-luci-support/luci-webui.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[uwsgi]
-strict = true
-if-not-env = UWSGI_EMPEROR_FD
-socket = /var/run/luci-webui.socket
-chmod-socket = 666
-cheap = true
-end-if =
-plugin = cgi
-cgi-mode = true
-cgi = /www/
-chdir = /usr/lib/lua/luci/
-buffer-size = 10000
-reload-mercy = 8
-max-requests = 2000
-limit-as = 5000
-reload-on-as = 256
-reload-on-rss = 192
-enable-threads = true
-post-buffering = 8192
-socket-timeout = 120
-thunder-lock = true
-plugin = syslog
-logger = luci syslog:uwsgi-luci
-; the regular expression leaves for successful de/activation only one line each:
-log-route = luci ^(?!... Starting uWSGI |compiled with version: |os: Linux|nodename: |machine: |clock source: |pcre jit |detected number of CPU cores: |current working directory: |detected binary path: |uWSGI running as root, you can use |... WARNING: you are running uWSGI as root |chdir.. to |your processes number limit is |limiting address space of processes...|your process address space limit is |your memory page size is |detected max file descriptor number: |lock engine: |thunder lock: |uwsgi socket |your server socket listen backlog is limited to |your mercy for graceful operations on workers is |mapped .* bytes |... Operational MODE: |initialized CGI path: |... no app loaded. going in full dynamic mode ...|... uWSGI is running in multiple interpreter mode ...|spawned uWSGI worker |announcing my loyalty to the Emperor...|workers have been inactive for more than |SIGINT/SIGQUIT received...killing workers...|worker .* buried |goodbye to uWSGI.|...gracefully killing workers...|Gracefully killing worker|worker .* killed successfully)
-disable-logging = true
-req-logger = syslog:uwsgi-luci
-log-format=%(method) %(uri) => return %(status) (%(rsize) bytes in %(msecs) ms)
-threads = 1
-processes = 3
-cheaper-algo = spare
-cheaper = 1
-cheaper-initial = 1
-cheaper-step = 1
-master = true
-idle = 360
-cgi-timeout = 300
diff --git a/uwsgi/files/emperor.ini b/uwsgi/files/emperor.ini
deleted file mode 100644
index 9c245af1d..000000000
--- a/uwsgi/files/emperor.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[uwsgi]
-strict = true
-pidfile = /var/run/uwsgi.pid
-emperor = /etc/uwsgi/vassals/*.ini
-early-emperor = true
-vacuum = true
-emperor-on-demand-directory = /var/run/
-emperor-required-heartbeat = 99
-vassal-set = die-on-idle=true
diff --git a/uwsgi/files/uwsgi.init b/uwsgi/files/uwsgi.init
deleted file mode 100644
index cb4ec2ac5..000000000
--- a/uwsgi/files/uwsgi.init
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=79
-USE_PROCD=1
-
-start_service() {
-	procd_open_instance
-	procd_set_param command /usr/sbin/uwsgi --ini /etc/uwsgi/emperor.ini
-	procd_set_param stderr 0
-	procd_set_param file /etc/uwsgi/emperor.ini
-	procd_set_param respawn
-	procd_close_instance
-}
-
diff --git a/uwsgi/patches/001-dont-hardcode-zlib.patch b/uwsgi/patches/001-dont-hardcode-zlib.patch
deleted file mode 100644
index df007ce06..000000000
--- a/uwsgi/patches/001-dont-hardcode-zlib.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/uwsgiconfig.py
-+++ b/uwsgiconfig.py
-@@ -856,11 +856,11 @@ class uConf(object):
-                 self.cflags.append('-DUWSGI_HAS_EXECINFO')
-                 report['execinfo'] = True
- 
--        if self.has_include('zlib.h'):
--            self.cflags.append('-DUWSGI_ZLIB')
--            self.libs.append('-lz')
--            self.gcc_list.append('core/zlib')
--            report['zlib'] = True
-+#        if self.has_include('zlib.h'):
-+#            self.cflags.append('-DUWSGI_ZLIB')
-+#            self.libs.append('-lz')
-+#            self.gcc_list.append('core/zlib')
-+            report['zlib'] = False
- 
-         if uwsgi_os == 'OpenBSD':
-             try:
diff --git a/uwsgi/patches/002-dont-override-toolchain-optimization.patch b/uwsgi/patches/002-dont-override-toolchain-optimization.patch
deleted file mode 100644
index ff8de5df9..000000000
--- a/uwsgi/patches/002-dont-override-toolchain-optimization.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/uwsgiconfig.py
-+++ b/uwsgiconfig.py
-@@ -685,7 +685,7 @@ class uConf(object):
-             self.include_path += os.environ['UWSGI_INCLUDES'].split(',')
- 
- 
--        self.cflags = ['-O2', '-I.', '-Wall', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split() + self.get('cflags','').split()
-+        self.cflags = ['-I.', '-Wall', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split() + self.get('cflags','').split()
- 
-         report['kernel'] = uwsgi_os
- 
diff --git a/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch b/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch
deleted file mode 100644
index 6f496ef0d..000000000
--- a/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/uwsgiconfig.py
-+++ b/uwsgiconfig.py
-@@ -5,9 +5,9 @@ uwsgi_version = '2.0.19.1'
- import os
- import re
- import time
--uwsgi_os = os.uname()[0]
--uwsgi_os_k = re.split('[-+_]', os.uname()[2])[0]
--uwsgi_os_v = os.uname()[3]
-+uwsgi_os = "Linux"
-+uwsgi_os_k = os.environ['LINUX_UNAME_VERSION']
-+uwsgi_os_v = "Linux"
- uwsgi_cpu = os.uname()[4]
- 
- import sys
diff --git a/uwsgi/patches/010-uclibc-ng.patch b/uwsgi/patches/010-uclibc-ng.patch
deleted file mode 100644
index e12c3c514..000000000
--- a/uwsgi/patches/010-uclibc-ng.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/core/uwsgi.c
-+++ b/core/uwsgi.c
-@@ -1822,7 +1822,7 @@ void uwsgi_plugins_atexit(void) {
- 
- void uwsgi_backtrace(int depth) {
- 
--#if defined(__GLIBC__) || (defined(__APPLE__) && !defined(NO_EXECINFO)) || defined(UWSGI_HAS_EXECINFO)
-+#if (!defined(__UCLIBC__) && defined(__GLIBC__)) || (defined(__APPLE__) && !defined(NO_EXECINFO)) || defined(UWSGI_HAS_EXECINFO)
- 
- #include <execinfo.h>
- 
diff --git a/uwsgi/patches/020-uwsgiconfig-system-python3.patch b/uwsgi/patches/020-uwsgiconfig-system-python3.patch
deleted file mode 100644
index 7c7389269..000000000
--- a/uwsgi/patches/020-uwsgiconfig-system-python3.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,4 @@
--PYTHON := python
-+PYTHON ?= python3
- 
- all:
- 	$(PYTHON) uwsgiconfig.py --build $(PROFILE)
diff --git a/uwsgi/patches/030-plugins-cgi_adds_dontresolve_option.patch b/uwsgi/patches/030-plugins-cgi_adds_dontresolve_option.patch
deleted file mode 100644
index cd4572123..000000000
--- a/uwsgi/patches/030-plugins-cgi_adds_dontresolve_option.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From f259999d824b921a8a443e73d8c2b9e2d2170413 Mon Sep 17 00:00:00 2001
-From: Ansuel Smith <ansuelsmth@gmail.com>
-Date: Tue, 8 Oct 2019 02:10:43 +0200
-Subject: [PATCH] plugins/cgi: adds dontresolve option
-
-This option permit to call the simbolic link instead of the file the simbolic link points.
-All the security check are still done as the simbolic path is passed at the end after all the checks are passed. This is useful if some cgi app are used for multiple function based on the name they are called by.
-
-Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
----
- plugins/cgi/cgi_plugin.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/plugins/cgi/cgi_plugin.c
-+++ b/plugins/cgi/cgi_plugin.c
-@@ -15,6 +15,7 @@ struct uwsgi_cgi {
- 	struct uwsgi_string_list *loadlib;
- 	struct uwsgi_string_list *cgi_safe;
- 	int optimize;
-+	int dontresolve;
- 	int from_docroot;
- 	int has_mountpoints;
- 	struct uwsgi_dyn_dict *default_cgi;
-@@ -75,6 +76,8 @@ struct uwsgi_option uwsgi_cgi_options[]
- 
-         {"cgi-safe", required_argument, 0, "skip security checks if the cgi file is under the specified path", uwsgi_opt_add_string_list, &uc.cgi_safe, 0},
- 
-+        {"cgi-dontresolve", no_argument, 0 , "call symbolic link directly instead of the real path", uwsgi_opt_true,&uc.dontresolve, 0},
-+
-         {0, 0, 0, 0, 0, 0, 0},
- 
- };
-@@ -475,6 +478,7 @@ static int uwsgi_cgi_request(struct wsgi
- 
- 	char full_path[PATH_MAX];
- 	char tmp_path[PATH_MAX];
-+	char symbolic_path[PATH_MAX];
- 	struct stat cgi_stat;
- 	int need_free = 0;
- 	int is_a_file = 0;
-@@ -533,6 +537,10 @@ static int uwsgi_cgi_request(struct wsgi
- 			uwsgi_404(wsgi_req);
- 			return UWSGI_OK;
- 		}
-+		if (uc.dontresolve) {
-+			full_path_len = strlen(full_path);
-+			memcpy(symbolic_path, full_path, full_path_len+1);
-+		}
- 
- 		full_path_len = strlen(tmp_path);
- 		// add +1 to copy the null byte
-@@ -639,6 +647,11 @@ static int uwsgi_cgi_request(struct wsgi
- 		}
- 	}
- 
-+	if (uc.dontresolve) {
-+		full_path_len = strlen(symbolic_path);
-+		memcpy(full_path, symbolic_path, full_path_len+1);
-+	}
-+
- 	int ret = uwsgi_cgi_run(wsgi_req, docroot, docroot_len, full_path, helper, path_info, script_name, is_a_file, discard_base);
- 	if (need_free) free(docroot);
- 	return ret;
diff --git a/uwsgi/src/buildconf/openwrt.ini b/uwsgi/src/buildconf/openwrt.ini
deleted file mode 100644
index f9ea8344f..000000000
--- a/uwsgi/src/buildconf/openwrt.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-[uwsgi]
-xml = false
-yaml = false
-json = false
-ssl = false
-pcre = true
-routing = auto
-debug = false
-unbit = false
-malloc_implementation = libc
-extras =
-plugins =
-bin_name = uwsgi
-append_version =
-plugin_dir = /usr/lib/uwsgi
-plugin_build_dir = .
-embedded_plugins =
-as_shared_library = false
-
-locking = auto
-event = auto
-timer = auto
-filemonitor = auto
-
-blacklist =
-whitelist =
-
-embed_files =
-
-embed_config =
diff --git a/xray-core/Makefile b/xray-core/Makefile
index 61c9ad60e..4a457c62a 100644
--- a/xray-core/Makefile
+++ b/xray-core/Makefile
@@ -1,6 +1,6 @@
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=xray-core
+PKG_NAME:=Xray-core
 PKG_VERSION:=1.5.4
 PKG_RELEASE:=$(AUTORELEASE)
 
@@ -8,17 +8,27 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=skip
 
+#PKG_SOURCE_PROTO:=git
+#PKG_SOURCE_URL:=https://github.com/XTLS/xray-core.git
+#PKG_MIRROR_HASH:=skip
+#PKG_SOURCE_VERSION:=c345d4818efa763b07961d6c132afe1cf91845de
+#PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+
 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 PKG_LICENSE:=MPL-2.0
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/Xray-core-$(PKG_VERSION)
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_XRAY_CORE_COMPRESS_GOPROXY \
+	CONFIG_XRAY_CORE_COMPRESS_UPX \
+
 PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
 
 GO_PKG:=github.com/xtls/xray-core
 GO_PKG_BUILD_PKG:=github.com/xtls/xray-core/main
+GO_PKG_LDFLAGS:=-s -w
 GO_PKG_LDFLAGS_X:= \
 	$(GO_PKG)/core.build=OpenWrt \
 	$(GO_PKG)/core.version=$(PKG_VERSION)
@@ -45,13 +55,6 @@ define Package/xray-example
   PKGARCH:=all
 endef
 
-define Package/xray-geodata
-  $(call Package/xray/template)
-  TITLE+= (geodata files)
-  DEPENDS:=xray-core
-  PKGARCH:=all
-endef
-
 define Package/xray/description
   Xray, Penetrates Everything. It helps you to build your own computer network.
   It secures your network connections and thus protects your privacy.
@@ -67,10 +70,19 @@ define Package/xray-example/description
   This includes example configuration files for xray-core.
 endef
 
-define Package/xray-geodata/description
-  $(call Package/xray/description)
+define Package/xray-core/config
+menu "Xray-core Configuration"
+	depends on PACKAGE_xray-core
 
-  This includes GEO datas used for xray-core.
+config XRAY_CORE_COMPRESS_GOPROXY
+	bool "Compiling with GOPROXY proxy"
+	default n
+
+config XRAY_CORE_COMPRESS_UPX
+	bool "Compress executable files with UPX"
+	depends on !mips64
+	default n
+endmenu
 endef
 
 define Package/xray-core/conffiles
@@ -78,31 +90,15 @@ define Package/xray-core/conffiles
 /etc/config/xray
 endef
 
-GEOIP_VER:=202203170039
-GEOIP_FILE:=geoip.dat.$(GEOIP_VER)
+ifneq ($(CONFIG_XRAY_CORE_COMPRESS_GOPROXY),)
+	export GO111MODULE=on
+	export GOPROXY=https://goproxy.bj.bcebos.com
+endif
 
-define Download/geoip
-  URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/
-  URL_FILE:=geoip.dat
-  FILE:=$(GEOIP_FILE)
-  HASH:=12c183defbc052e6bd96eb088a7f955f9d3a62d662009d5fb63da040e954e6c8
-endef
-
-GEOSITE_VER:=20220313173740
-GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
-
-define Download/geosite
-  URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
-  URL_FILE:=dlc.dat
-  FILE:=$(GEOSITE_FILE)
-  HASH:=85ae4443a4192c0ff4c759e8a959dac02fac3628be62531939cc9059c3285ad0
-endef
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-ifneq ($(CONFIG_PACKAGE_xray-geodata),)
-	$(call Download,geoip)
-	$(call Download,geosite)
+define Build/Compile
+	$(call GoPackage/Build/Compile)
+ifneq ($(CONFIG_XRAY_CORE_COMPRESS_UPX),)
+	$(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/main
 endif
 endef
 
@@ -126,12 +122,5 @@ define Package/xray-example/install
 	$(INSTALL_DATA) $(CURDIR)/files/vpoint_vmess_freedom.json $(1)/etc/xray/
 endef
 
-define Package/xray-geodata/install
-	$(INSTALL_DIR) $(1)/usr/share/xray/
-	$(INSTALL_DATA) $(DL_DIR)/$(GEOIP_FILE) $(1)/usr/share/xray/geoip.dat
-	$(INSTALL_DATA) $(DL_DIR)/$(GEOSITE_FILE) $(1)/usr/share/xray/geosite.dat
-endef
-
 $(eval $(call BuildPackage,xray-core))
 $(eval $(call BuildPackage,xray-example))
-$(eval $(call BuildPackage,xray-geodata))
diff --git a/xray-core/files/xray.conf b/xray-core/files/xray.conf
index c967d106a..362fbac06 100644
--- a/xray-core/files/xray.conf
+++ b/xray-core/files/xray.conf
@@ -5,7 +5,7 @@ config xray 'enabled'
 config xray 'config'
 	option confdir '/etc/xray'
 	list conffiles '/etc/xray/config.json'
-	option datadir '/usr/share/xray'
+	option datadir '/usr/share/v2ray'
 	option dialer ''
 	option format 'json'
 
diff --git a/xray-core/files/xray.init b/xray-core/files/xray.init
index 04b00232b..1197255c4 100755
--- a/xray-core/files/xray.init
+++ b/xray-core/files/xray.init
@@ -21,7 +21,7 @@ start_service() {
 
 	config_get confdir "config" "confdir"
 	config_get conffiles "config" "conffiles"
-	config_get datadir "config" "datadir" "/usr/share/xray"
+	config_get datadir "config" "datadir" "/usr/share/v2ray"
 	config_get dialer "config" "dialer"
 	config_get format "config" "format" "json"
 
diff --git a/xray-core/test.sh b/xray-core/test.sh
deleted file mode 100644
index 8fcce26fe..000000000
--- a/xray-core/test.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	"xray-core")
-		xray version 2>&1 | grep "${2#*v}"
-		;;
-esac