From a05030b9ca76c5c6bf73a7b8c720cb531fcf8853 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 28 Sep 2020 09:03:43 +0200 Subject: [PATCH 01/16] ddns-scripts: rename ddns-scripts_service package to ddns-scripts-services Signed-off-by: Florian Eckert --- net/ddns-scripts/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index 30bb4e93a2..bea2b08f7d 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -46,13 +46,13 @@ define Package/ddns-scripts/conffiles endef -define Package/ddns-scripts_service +define Package/ddns-scripts-services $(call Package/ddns-scripts/Default) TITLE:=Common ddns providers DEPENDS:=ddns-scripts endef -define Package/ddns-scripts_service/description +define Package/ddns-scripts-services/description Dynamic DNS Client definitions for supported services endef @@ -224,7 +224,7 @@ exit 0 endef -define Package/ddns-scripts_service/install +define Package/ddns-scripts-services/install $(INSTALL_DIR) $(1)/usr/share/ddns/services $(INSTALL_DATA) ./files/usr/share/ddns/services/* \ $(1)/usr/share/ddns/services @@ -384,7 +384,7 @@ endef $(eval $(call BuildPackage,ddns-scripts)) -$(eval $(call BuildPackage,ddns-scripts_service)) +$(eval $(call BuildPackage,ddns-scripts-services)) $(eval $(call BuildPackage,ddns-scripts_cloudflare.com-v4)) $(eval $(call BuildPackage,ddns-scripts_freedns_42_pl)) $(eval $(call BuildPackage,ddns-scripts_godaddy.com-v1)) From 5e0836a5382a6227a75c7f4346878129c0cfd314 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 28 Sep 2020 09:05:09 +0200 Subject: [PATCH 02/16] ddns-scripts: rename cloudflare package Signed-off-by: Florian Eckert --- net/ddns-scripts/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index bea2b08f7d..6e13bf7068 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -57,13 +57,13 @@ define Package/ddns-scripts-services/description endef -define Package/ddns-scripts_cloudflare.com-v4 +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.com-v4/description +define Package/ddns-scripts-cloudflare/description Dynamic DNS Client scripts extension for cloudflare.com API v4 (require curl) endef @@ -231,7 +231,7 @@ define Package/ddns-scripts-services/install endef -define Package/ddns-scripts_cloudflare.com-v4/install +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 @@ -241,7 +241,7 @@ define Package/ddns-scripts_cloudflare.com-v4/install $(1)/usr/share/ddns/services/ endef -define Package/ddns-scripts_cloudflare.com-v4/prerm +define Package/ddns-scripts-cloudflare/prerm #!/bin/sh if [ -z "$${IPKG_INSTROOT}" ]; then /etc/init.d/ddns stop @@ -385,7 +385,7 @@ endef $(eval $(call BuildPackage,ddns-scripts)) $(eval $(call BuildPackage,ddns-scripts-services)) -$(eval $(call BuildPackage,ddns-scripts_cloudflare.com-v4)) +$(eval $(call BuildPackage,ddns-scripts-cloudflare)) $(eval $(call BuildPackage,ddns-scripts_freedns_42_pl)) $(eval $(call BuildPackage,ddns-scripts_godaddy.com-v1)) $(eval $(call BuildPackage,ddns-scripts_digitalocean.com-v2)) From a01c6fa1390a2bddd338055a87f6782178c5c2cb Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 28 Sep 2020 09:06:22 +0200 Subject: [PATCH 03/16] ddns-scripts: rename freedns package Signed-off-by: Florian Eckert --- net/ddns-scripts/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index 6e13bf7068..9792ab9625 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -68,13 +68,13 @@ define Package/ddns-scripts-cloudflare/description endef -define Package/ddns-scripts_freedns_42_pl +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_42_pl/description +define Package/ddns-scripts-freedns/description Dynamic DNS Client scripts extension for "freedns.42.pl". endef @@ -250,7 +250,7 @@ exit 0 endef -define Package/ddns-scripts_freedns_42_pl/install +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 @@ -260,7 +260,7 @@ define Package/ddns-scripts_freedns_42_pl/install $(1)/usr/share/ddns/services endef -define Package/ddns-scripts_freedns_42_pl/prerm +define Package/ddns-scripts-freedns/prerm #!/bin/sh if [ -z "$${IPKG_INSTROOT}" ]; then /etc/init.d/ddns stop @@ -386,7 +386,7 @@ endef $(eval $(call BuildPackage,ddns-scripts)) $(eval $(call BuildPackage,ddns-scripts-services)) $(eval $(call BuildPackage,ddns-scripts-cloudflare)) -$(eval $(call BuildPackage,ddns-scripts_freedns_42_pl)) +$(eval $(call BuildPackage,ddns-scripts-freedns)) $(eval $(call BuildPackage,ddns-scripts_godaddy.com-v1)) $(eval $(call BuildPackage,ddns-scripts_digitalocean.com-v2)) $(eval $(call BuildPackage,ddns-scripts_no-ip_com)) From e81929eeb12fbb6931bf2f9541841ac253804bc9 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 28 Sep 2020 09:07:47 +0200 Subject: [PATCH 04/16] ddns-scripts: rename godaddy package Signed-off-by: Florian Eckert --- net/ddns-scripts/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index 9792ab9625..e139d6d375 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -79,13 +79,13 @@ define Package/ddns-scripts-freedns/description endef -define Package/ddns-scripts_godaddy.com-v1 +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.com-v1/description +define Package/ddns-scripts-godaddy/description Dynamic DNS Client scripts extension for "godaddy.com API v1". endef @@ -269,7 +269,7 @@ exit 0 endef -define Package/ddns-scripts_godaddy.com-v1/install +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 @@ -279,7 +279,7 @@ define Package/ddns-scripts_godaddy.com-v1/install $(1)/usr/share/ddns/services endef -define Package/ddns-scripts_godaddy.com-v1/prerm +define Package/ddns-scripts-godaddy/prerm #!/bin/sh if [ -z "$${IPKG_INSTROOT}" ]; then /etc/init.d/ddns stop @@ -387,7 +387,7 @@ $(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.com-v1)) +$(eval $(call BuildPackage,ddns-scripts-godaddy)) $(eval $(call BuildPackage,ddns-scripts_digitalocean.com-v2)) $(eval $(call BuildPackage,ddns-scripts_no-ip_com)) $(eval $(call BuildPackage,ddns-scripts_nsupdate)) From 9a1341b5309f9ed6ec5b725bf608bc4ea8c5addf Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 28 Sep 2020 09:08:58 +0200 Subject: [PATCH 05/16] ddns-scripts: rename digitalocean package Signed-off-by: Florian Eckert --- net/ddns-scripts/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index e139d6d375..8a657ffaa1 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -90,13 +90,13 @@ define Package/ddns-scripts-godaddy/description endef -define Package/ddns-scripts_digitalocean.com-v2 +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.com-v2/description +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: @@ -288,7 +288,7 @@ exit 0 endef -define Package/ddns-scripts_digitalocean.com-v2/install +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 @@ -298,7 +298,7 @@ define Package/ddns-scripts_digitalocean.com-v2/install $(1)/usr/share/ddns/services endef -define Package/ddns-scripts_digitalocean.com-v2/prerm +define Package/ddns-scripts-digitalocean/prerm #!/bin/sh if [ -z "$${IPKG_INSTROOT}" ]; then /etc/init.d/ddns stop @@ -388,7 +388,7 @@ $(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.com-v2)) +$(eval $(call BuildPackage,ddns-scripts-digitalocean)) $(eval $(call BuildPackage,ddns-scripts_no-ip_com)) $(eval $(call BuildPackage,ddns-scripts_nsupdate)) $(eval $(call BuildPackage,ddns-scripts_route53-v1)) From c3c269c48b25e5016ebfaae70ec28d2b7ecc07b2 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 28 Sep 2020 09:10:08 +0200 Subject: [PATCH 06/16] ddns-scripts: rename noip package Signed-off-by: Florian Eckert --- net/ddns-scripts/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index 8a657ffaa1..1cfcca8e80 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -108,13 +108,13 @@ define Package/ddns-scripts-digitalocean/description endef -define Package/ddns-scripts_no-ip_com +define Package/ddns-scripts-noip $(call Package/ddns-scripts/Default) TITLE:=Extension for no-ip.com DEPENDS:=ddns-scripts endef -define Package/ddns-scripts_no-ip_com/description +define Package/ddns-scripts-noip/description Dynamic DNS Client scripts extension for "no-ip.com". endef @@ -307,7 +307,7 @@ exit 0 endef -define Package/ddns-scripts_no-ip_com/install +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 @@ -317,7 +317,7 @@ define Package/ddns-scripts_no-ip_com/install $(1)/usr/share/ddns/services endef -define Package/ddns-scripts_no-ip_com/prerm +define Package/ddns-scripts-noip/prerm #!/bin/sh if [ -z "$${IPKG_INSTROOT}" ]; then /etc/init.d/ddns stop @@ -389,7 +389,7 @@ $(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_no-ip_com)) +$(eval $(call BuildPackage,ddns-scripts-noip)) $(eval $(call BuildPackage,ddns-scripts_nsupdate)) $(eval $(call BuildPackage,ddns-scripts_route53-v1)) $(eval $(call BuildPackage,ddns-scripts_cnkuai_cn)) From c2ccf8aff6e90d7e5deefea2fce49198f478fed7 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 28 Sep 2020 09:11:00 +0200 Subject: [PATCH 07/16] ddns-scripts: rename nsupdate package Signed-off-by: Florian Eckert --- net/ddns-scripts/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index 1cfcca8e80..46649ef363 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -119,13 +119,13 @@ define Package/ddns-scripts-noip/description endef -define Package/ddns-scripts_nsupdate +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 +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. @@ -326,7 +326,7 @@ exit 0 endef -define Package/ddns-scripts_nsupdate/install +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 @@ -336,7 +336,7 @@ define Package/ddns-scripts_nsupdate/install $(1)/usr/share/ddns/services endef -define Package/ddns-scripts_nsupdate/prerm +define Package/ddns-scripts-nsupdate/prerm #!/bin/sh if [ -z "$${IPKG_INSTROOT}" ]; then /etc/init.d/ddns stop @@ -390,6 +390,6 @@ $(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-nsupdate)) $(eval $(call BuildPackage,ddns-scripts_route53-v1)) $(eval $(call BuildPackage,ddns-scripts_cnkuai_cn)) From b036c506ccae56ff0849acdcf02f900990b96e0e Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 28 Sep 2020 09:11:48 +0200 Subject: [PATCH 08/16] ddns-scripts: rename route53 package Signed-off-by: Florian Eckert --- net/ddns-scripts/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index 46649ef363..4fa15f0db2 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -136,13 +136,13 @@ define Package/ddns-scripts-nsupdate/description endef -define Package/ddns-scripts_route53-v1 +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-v1/description +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: @@ -345,7 +345,7 @@ exit 0 endef -define Package/ddns-scripts_route53-v1/install +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 @@ -355,7 +355,7 @@ define Package/ddns-scripts_route53-v1/install $(1)/usr/share/ddns/services endef -define Package/ddns-scripts_route53-v1/prerm +define Package/ddns-scripts-route53/prerm #!/bin/sh if [ -z "$${IPKG_INSTROOT}" ]; then /etc/init.d/ddns stop @@ -391,5 +391,5 @@ $(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-v1)) +$(eval $(call BuildPackage,ddns-scripts-route53)) $(eval $(call BuildPackage,ddns-scripts_cnkuai_cn)) From 2290df3aa86a549bdc74d310e5d72efd2149dddc Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 28 Sep 2020 09:12:58 +0200 Subject: [PATCH 09/16] ddns-scripts: rename cnkuai package Signed-off-by: Florian Eckert --- net/ddns-scripts/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index 4fa15f0db2..1550f577b9 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -152,13 +152,13 @@ define Package/ddns-scripts-route53/description endef -define Package/ddns-scripts_cnkuai_cn +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_cn/description +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 @@ -364,7 +364,7 @@ exit 0 endef -define Package/ddns-scripts_cnkuai_cn/install +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 @@ -374,7 +374,7 @@ define Package/ddns-scripts_cnkuai_cn/install $(1)/usr/share/ddns/services endef -define Package/ddns-scripts_cnkuai_cn/prerm +define Package/ddns-scripts-cnkuai/prerm #!/bin/sh if [ -z "$${IPKG_INSTROOT}" ]; then /etc/init.d/ddns stop @@ -392,4 +392,4 @@ $(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_cn)) +$(eval $(call BuildPackage,ddns-scripts-cnkuai)) From b985835748641c80bfe702f2949a91a2c46bba6b Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 28 Sep 2020 09:17:43 +0200 Subject: [PATCH 10/16] ddns-scripts: remove special service json files from ddns-scripts-servies package Signed-off-by: Florian Eckert --- net/ddns-scripts/Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index 1550f577b9..1952804846 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -228,6 +228,16 @@ define Package/ddns-scripts-services/install $(INSTALL_DIR) $(1)/usr/share/ddns/services $(INSTALL_DATA) ./files/usr/share/ddns/services/* \ $(1)/usr/share/ddns/services + + # Remove special services + rm $(1)/usr/share/ddns/services/cloudflare.com-v4.json + rm $(1)/usr/share/ddns/services/freedns.42.pl.json + rm $(1)/usr/share/ddns/services/godaddy.com-v1.json + rm $(1)/usr/share/ddns/services/digitalocean.com-v2.json + rm $(1)/usr/share/ddns/services/no-ip.com.json + rm $(1)/usr/share/ddns/services/bind-nsupdate.json + rm $(1)/usr/share/ddns/services/route53-v1.json + rm $(1)/usr/share/ddns/services/cnkuai.cn.json endef From cde01dc150c4aa27b0e3460f52155f98d8501f93 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 28 Sep 2020 09:18:51 +0200 Subject: [PATCH 11/16] ddns-scripts: remove list file from ddns-scripts install This is not needed. The file get installed on demand with the new ddns script. Signed-off-by: Florian Eckert --- net/ddns-scripts/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index 1952804846..31bf5874d8 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -189,8 +189,6 @@ define Package/ddns-scripts/install $(INSTALL_DIR) $(1)/usr/share/ddns echo "$(PKG_VERSION)-$(PKG_RELEASE)" > $(1)/usr/share/ddns/version - $(INSTALL_DATA) ./files/usr/share/ddns/list \ - $(1)/usr/share/ddns $(INSTALL_DIR) $(1)/usr/lib/ddns $(INSTALL_DATA) ./files/usr/lib/ddns/dynamic_dns_functions.sh \ From 3ec59622e9aeadb0fa008bdb07eeade561cd77a4 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 28 Sep 2020 09:49:33 +0200 Subject: [PATCH 12/16] ddns-scripts: change install path of custom service providers Signed-off-by: Florian Eckert --- net/ddns-scripts/files/usr/bin/ddns.sh | 41 +++++++++++++------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/net/ddns-scripts/files/usr/bin/ddns.sh b/net/ddns-scripts/files/usr/bin/ddns.sh index a2b93b0338..b4d861ed68 100644 --- a/net/ddns-scripts/files/usr/bin/ddns.sh +++ b/net/ddns-scripts/files/usr/bin/ddns.sh @@ -20,15 +20,15 @@ usage() { echo "Usage: $(basename "$0") " echo "" echo "Supported ddns :" - echo " service: Command for ddns service provider" + echo " service: Command for custom ddns service providers" echo "" echo "Supported ddns 'service' command :" - echo " update: Update local ddns service list" - echo " list-available: List all available service providers" - echo " list-installed: List all installed service providers" - echo " install : Install service provider" - echo " remove : Remove service provider" - echo " purge: Remove local ddns serivces" + 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 : Install custom service provider" + echo " remove : Remove custom service provider" + echo " purge: Remove local custom ddns services" exit "$code" } @@ -63,16 +63,16 @@ action_list_available() { if [ -f "${DDNS_PACKAGE_DIR}/list" ]; then cat "${DDNS_PACKAGE_DIR}/list" else - echo "No service file found please download first" + echo "No custom service list file found. Please download first" exit 3 fi } action_list_installed() { - if [ -d "${DDNS_PACKAGE_DIR}/services" ]; then - ls "${DDNS_PACKAGE_DIR}/services" + if [ -d "${DDNS_PACKAGE_DIR}/custom" ]; then + ls "${DDNS_PACKAGE_DIR}/custom" else - echo "No services installed" + echo "No custom services installed" exit 4 fi } @@ -83,25 +83,26 @@ action_install() { local url cacert config_load ddns - config_get url global 'url' "${URL}${DDNS_PACKAGE_DIR}" + config_get url global 'url' "${URL}${DDNS_PACKAGE_DIR}/services" config_get cacert global 'cacert' "IGNORE" - url="${url}/services/${service}.json" + url="${url}/${service}.json" if [ -z "$service" ]; then - usage "4" "No service specified" + usage "4" "No custom service specified" fi - mkdir -p "${DDNS_PACKAGE_DIR}/services" + mkdir -p "${DDNS_PACKAGE_DIR}/custom" + if [ "$cacert" = "IGNORE" ]; then uclient-fetch \ --no-check-certificate \ "${url}" \ - -O "${DDNS_PACKAGE_DIR}/services/${service}.json" + -O "${DDNS_PACKAGE_DIR}/custom/${service}.json" elif [ -f "$cacert" ]; then uclient-fetch \ --ca-certifcate="${cacert}" \ "${url}" \ - -O "${DDNS_PACKAGE_DIR}/services/${service}.json" + -O "${DDNS_PACKAGE_DIR}/custom/${service}.json" elif [ -n "$cacert" ]; then echo "Certification file not found ($cacert)" exit 5 @@ -111,14 +112,14 @@ action_install() { action_remove() { local service="$1" if [ -z "$service" ]; then - usage "4" "No service specified" + usage "4" "No custom service specified" fi - rm "${DDNS_PACKAGE_DIR}/services/${service}.json" + rm "${DDNS_PACKAGE_DIR}/custom/${service}.json" } action_purge() { - rm -rf "${DDNS_PACKAGE_DIR}/services" + rm -rf "${DDNS_PACKAGE_DIR}/custom" rm -rf "${DDNS_PACKAGE_DIR}/list" } From b67240f7ce4371270b6e9782d34c6dd5838c5cba Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 28 Sep 2020 14:35:13 +0200 Subject: [PATCH 13/16] ddns-scripts: add dependency for ddns-scripts-services on ddns-scripts If we install ddns-scripts we also install the default ddns-scripts-services package. So the behabviour for the user does not change. Signed-off-by: Florian Eckert --- net/ddns-scripts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index 31bf5874d8..5358698c6b 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -25,6 +25,7 @@ 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 @@ -49,7 +50,6 @@ endef define Package/ddns-scripts-services $(call Package/ddns-scripts/Default) TITLE:=Common ddns providers - DEPENDS:=ddns-scripts endef define Package/ddns-scripts-services/description From 8be604072cbe9652f608dcd6671ae8b029f3fbaa Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 28 Sep 2020 14:45:49 +0200 Subject: [PATCH 14/16] ddns-scripts: move all json files to default Since we can also install custom ddns services, the name for the default services is not optimally chosen. To emphasize this the folder with the standard services for the package feed will be renamed to default. Signed-off-by: Florian Eckert --- net/ddns-scripts/Makefile | 70 +++++++++---------- net/ddns-scripts/files/usr/bin/ddns.sh | 2 +- .../usr/lib/ddns/dynamic_dns_functions.sh | 6 +- .../ddns/{services => default}/3322.org.json | 0 .../{services => default}/able.or.kr.json | 0 .../afraid.org-basicauth.json | 0 .../afraid.org-keyauth.json | 0 .../afraid.org-v2-basic.json | 0 .../afraid.org-v2-token.json | 0 .../{services => default}/all-inkl.com.json | 0 .../{services => default}/bind-nsupdate.json | 0 .../{services => default}/changeip.com.json | 0 .../cloudflare.com-v4.json | 0 .../ddns/{services => default}/cnkuai.cn.json | 0 .../core-networks.de.json | 0 .../{services => default}/ddns.com.br.json | 0 .../ddns/{services => default}/ddnss.de.json | 0 .../ddns/{services => default}/ddo.jp.json | 0 .../ddns/{services => default}/desec.io.json | 0 .../ddns/{services => default}/dhis.org.json | 0 .../digitalocean.com-v2.json | 0 .../{services => default}/dnsdynamic.org.json | 0 .../{services => default}/dnsever.com.json | 0 .../{services => default}/dnsexit.com.json | 0 .../{services => default}/dnshome.de.json | 0 .../dnsmadeeasy.com.json | 0 .../{services => default}/dnsmax.com.json | 0 .../{services => default}/dnsomatic.com.json | 0 .../{services => default}/dnspark.com.json | 0 .../ddns/{services => default}/do.de.json | 0 .../{services => default}/domopoli.de.json | 0 .../ddns/{services => default}/dtdns.com.json | 0 .../{services => default}/duckdns.org.json | 0 .../{services => default}/duiadns.net.json | 0 .../ddns/{services => default}/dy.fi.json | 0 .../ddns/{services => default}/dyn.com.json | 0 .../ddns/{services => default}/dyndns.it.json | 0 .../{services => default}/dyndns.org.json | 0 .../{services => default}/dyndnss.net.json | 0 .../ddns/{services => default}/dyns.net.json | 0 .../{services => default}/dynsip.org.json | 0 .../ddns/{services => default}/dynu.com.json | 0 .../ddns/{services => default}/dynv6.com.json | 0 .../{services => default}/easydns.com.json | 0 .../{services => default}/editdns.net.json | 0 .../{services => default}/freedns.42.pl.json | 0 .../{services => default}/godaddy.com-v1.json | 0 .../ddns/{services => default}/goip.de.json | 0 .../{services => default}/google.com.json | 0 .../ddns/{services => default}/he.net.json | 0 .../ddns/{services => default}/inwx.de.json | 0 .../ddns/{services => default}/joker.com.json | 0 .../ddns/{services => default}/loopia.se.json | 0 .../{services => default}/moniker.com.json | 0 .../ddns/{services => default}/mydns.ip.json | 0 .../{services => default}/myip.co.ua.json | 0 .../myonlineportal.net.json | 0 .../mythic-beasts.com.json | 0 .../{services => default}/namecheap.com.json | 0 .../{services => default}/nettica.com.json | 0 .../ddns/{services => default}/no-ip.com.json | 0 .../ddns/{services => default}/no-ip.pl.json | 0 .../{services => default}/now-dns.com.json | 0 .../{services => default}/nsupdate.info.json | 0 .../ddns/{services => default}/nubem.com.json | 0 .../{services => default}/opendns.com.json | 0 .../ddns/{services => default}/oray.com.json | 0 .../ddns/{services => default}/ovh.com.json | 0 .../{services => default}/regfish.de.json | 0 .../{services => default}/route53-v1.json | 0 .../{services => default}/schokokeks.org.json | 0 .../{services => default}/selfhost.de.json | 0 .../sitelutions.com.json | 0 .../ddns/{services => default}/spdyn.de.json | 0 .../{services => default}/strato.com.json | 0 .../{services => default}/system-ns.com.json | 0 .../{services => default}/thatip.com.json | 0 .../ddns/{services => default}/twodns.de.json | 0 .../{services => default}/udmedia.de.json | 0 .../{services => default}/variomedia.de.json | 0 .../ddns/{services => default}/xlhost.de.json | 0 .../{services => default}/zerigo.com.json | 0 .../{services => default}/zoneedit.com.json | 0 .../ddns/{services => default}/zzzz.io.json | 0 84 files changed, 38 insertions(+), 40 deletions(-) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/3322.org.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/able.or.kr.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/afraid.org-basicauth.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/afraid.org-keyauth.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/afraid.org-v2-basic.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/afraid.org-v2-token.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/all-inkl.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/bind-nsupdate.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/changeip.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/cloudflare.com-v4.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/cnkuai.cn.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/core-networks.de.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/ddns.com.br.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/ddnss.de.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/ddo.jp.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/desec.io.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/dhis.org.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/digitalocean.com-v2.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/dnsdynamic.org.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/dnsever.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/dnsexit.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/dnshome.de.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/dnsmadeeasy.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/dnsmax.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/dnsomatic.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/dnspark.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/do.de.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/domopoli.de.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/dtdns.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/duckdns.org.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/duiadns.net.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/dy.fi.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/dyn.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/dyndns.it.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/dyndns.org.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/dyndnss.net.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/dyns.net.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/dynsip.org.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/dynu.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/dynv6.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/easydns.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/editdns.net.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/freedns.42.pl.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/godaddy.com-v1.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/goip.de.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/google.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/he.net.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/inwx.de.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/joker.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/loopia.se.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/moniker.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/mydns.ip.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/myip.co.ua.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/myonlineportal.net.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/mythic-beasts.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/namecheap.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/nettica.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/no-ip.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/no-ip.pl.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/now-dns.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/nsupdate.info.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/nubem.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/opendns.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/oray.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/ovh.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/regfish.de.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/route53-v1.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/schokokeks.org.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/selfhost.de.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/sitelutions.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/spdyn.de.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/strato.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/system-ns.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/thatip.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/twodns.de.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/udmedia.de.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/variomedia.de.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/xlhost.de.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/zerigo.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/zoneedit.com.json (100%) rename net/ddns-scripts/files/usr/share/ddns/{services => default}/zzzz.io.json (100%) diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index 5358698c6b..cb11c62f0e 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -223,19 +223,19 @@ endef define Package/ddns-scripts-services/install - $(INSTALL_DIR) $(1)/usr/share/ddns/services - $(INSTALL_DATA) ./files/usr/share/ddns/services/* \ - $(1)/usr/share/ddns/services + $(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/services/cloudflare.com-v4.json - rm $(1)/usr/share/ddns/services/freedns.42.pl.json - rm $(1)/usr/share/ddns/services/godaddy.com-v1.json - rm $(1)/usr/share/ddns/services/digitalocean.com-v2.json - rm $(1)/usr/share/ddns/services/no-ip.com.json - rm $(1)/usr/share/ddns/services/bind-nsupdate.json - rm $(1)/usr/share/ddns/services/route53-v1.json - rm $(1)/usr/share/ddns/services/cnkuai.cn.json + 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 endef @@ -244,9 +244,9 @@ define Package/ddns-scripts-cloudflare/install $(INSTALL_BIN) ./files/usr/lib/ddns/update_cloudflare_com_v4.sh \ $(1)/usr/lib/ddns - $(INSTALL_DIR) $(1)/usr/share/ddns/services - $(INSTALL_DATA) ./files/usr/share/ddns/services/cloudflare.com-v4.json \ - $(1)/usr/share/ddns/services/ + $(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 @@ -263,9 +263,9 @@ define Package/ddns-scripts-freedns/install $(INSTALL_BIN) ./files/usr/lib/ddns/update_freedns_42_pl.sh \ $(1)/usr/lib/ddns - $(INSTALL_DIR) $(1)/usr/share/ddns/services - $(INSTALL_DATA) ./files/usr/share/ddns/services/freedns.42.pl.json \ - $(1)/usr/share/ddns/services + $(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 @@ -282,9 +282,9 @@ define Package/ddns-scripts-godaddy/install $(INSTALL_BIN) ./files/usr/lib/ddns/update_godaddy_com_v1.sh \ $(1)/usr/lib/ddns - $(INSTALL_DIR) $(1)/usr/share/ddns/services - $(INSTALL_DATA) ./files/usr/share/ddns/services/godaddy.com-v1.json \ - $(1)/usr/share/ddns/services + $(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 @@ -301,9 +301,9 @@ define Package/ddns-scripts-digitalocean/install $(INSTALL_BIN) ./files/usr/lib/ddns/update_digitalocean_com_v2.sh \ $(1)/usr/lib/ddns - $(INSTALL_DIR) $(1)/usr/share/ddns/services - $(INSTALL_DATA) ./files/usr/share/ddns/services/digitalocean.com-v2.json \ - $(1)/usr/share/ddns/services + $(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 @@ -320,9 +320,9 @@ define Package/ddns-scripts-noip/install $(INSTALL_BIN) ./files/usr/lib/ddns/update_no-ip_com.sh \ $(1)/usr/lib/ddns - $(INSTALL_DIR) $(1)/usr/share/ddns/services - $(INSTALL_DATA) ./files/usr/share/ddns/services/no-ip.com.json \ - $(1)/usr/share/ddns/services + $(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 @@ -339,9 +339,9 @@ define Package/ddns-scripts-nsupdate/install $(INSTALL_BIN) ./files/usr/lib/ddns/update_nsupdate.sh \ $(1)/usr/lib/ddns - $(INSTALL_DIR) $(1)/usr/share/ddns/services - $(INSTALL_DATA) ./files/usr/share/ddns/services/bind-nsupdate.json \ - $(1)/usr/share/ddns/services + $(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 @@ -358,9 +358,9 @@ define Package/ddns-scripts-route53/install $(INSTALL_BIN) ./files/usr/lib/ddns/update_route53_v1.sh \ $(1)/usr/lib/ddns - $(INSTALL_DIR) $(1)/usr/share/ddns/services - $(INSTALL_DATA) ./files/usr/share/ddns/services/route53-v1.json \ - $(1)/usr/share/ddns/services + $(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 @@ -377,9 +377,9 @@ define Package/ddns-scripts-cnkuai/install $(INSTALL_BIN) ./files/usr/lib/ddns/update_cnkuai_cn.sh \ $(1)/usr/lib/ddns - $(INSTALL_DIR) $(1)/usr/share/ddns/services - $(INSTALL_DATA) ./files/usr/share/ddns/services/cnkuai.cn.json \ - $(1)/usr/share/ddns/services + $(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 diff --git a/net/ddns-scripts/files/usr/bin/ddns.sh b/net/ddns-scripts/files/usr/bin/ddns.sh index b4d861ed68..921465f7e4 100644 --- a/net/ddns-scripts/files/usr/bin/ddns.sh +++ b/net/ddns-scripts/files/usr/bin/ddns.sh @@ -83,7 +83,7 @@ action_install() { local url cacert config_load ddns - config_get url global 'url' "${URL}${DDNS_PACKAGE_DIR}/services" + config_get url global 'url' "${URL}${DDNS_PACKAGE_DIR}/default" config_get cacert global 'cacert' "IGNORE" url="${url}/${service}.json" diff --git a/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh b/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh index 4a994ebc7e..d59fed4408 100644 --- a/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh +++ b/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh @@ -317,9 +317,7 @@ urlencode() { } # extract url or script for given DDNS Provider from -# directory /usr/share/ddns/services/ipv4/ for IPv4 -# or from -# directory /usr/share/ddns/services/ipv6/ for IPv6 +# directory /usr/share/ddns/default # $1 Name of the provider # $1 Name of Variable to store url to # $2 Name of Variable to store script to @@ -329,7 +327,7 @@ get_service_data() { shift . /usr/share/libubox/jshn.sh - local dir="/usr/share/ddns/services" + local dir="/usr/share/ddns/default" local name data url answer script [ $# -ne 3 ] && write_log 12 "Error calling 'get_service_data()' - wrong number of parameters" diff --git a/net/ddns-scripts/files/usr/share/ddns/services/3322.org.json b/net/ddns-scripts/files/usr/share/ddns/default/3322.org.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/3322.org.json rename to net/ddns-scripts/files/usr/share/ddns/default/3322.org.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/able.or.kr.json b/net/ddns-scripts/files/usr/share/ddns/default/able.or.kr.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/able.or.kr.json rename to net/ddns-scripts/files/usr/share/ddns/default/able.or.kr.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/afraid.org-basicauth.json b/net/ddns-scripts/files/usr/share/ddns/default/afraid.org-basicauth.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/afraid.org-basicauth.json rename to net/ddns-scripts/files/usr/share/ddns/default/afraid.org-basicauth.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/afraid.org-keyauth.json b/net/ddns-scripts/files/usr/share/ddns/default/afraid.org-keyauth.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/afraid.org-keyauth.json rename to net/ddns-scripts/files/usr/share/ddns/default/afraid.org-keyauth.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/afraid.org-v2-basic.json b/net/ddns-scripts/files/usr/share/ddns/default/afraid.org-v2-basic.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/afraid.org-v2-basic.json rename to net/ddns-scripts/files/usr/share/ddns/default/afraid.org-v2-basic.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/afraid.org-v2-token.json b/net/ddns-scripts/files/usr/share/ddns/default/afraid.org-v2-token.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/afraid.org-v2-token.json rename to net/ddns-scripts/files/usr/share/ddns/default/afraid.org-v2-token.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/all-inkl.com.json b/net/ddns-scripts/files/usr/share/ddns/default/all-inkl.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/all-inkl.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/all-inkl.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/bind-nsupdate.json b/net/ddns-scripts/files/usr/share/ddns/default/bind-nsupdate.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/bind-nsupdate.json rename to net/ddns-scripts/files/usr/share/ddns/default/bind-nsupdate.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/changeip.com.json b/net/ddns-scripts/files/usr/share/ddns/default/changeip.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/changeip.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/changeip.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/cloudflare.com-v4.json b/net/ddns-scripts/files/usr/share/ddns/default/cloudflare.com-v4.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/cloudflare.com-v4.json rename to net/ddns-scripts/files/usr/share/ddns/default/cloudflare.com-v4.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/cnkuai.cn.json b/net/ddns-scripts/files/usr/share/ddns/default/cnkuai.cn.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/cnkuai.cn.json rename to net/ddns-scripts/files/usr/share/ddns/default/cnkuai.cn.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/core-networks.de.json b/net/ddns-scripts/files/usr/share/ddns/default/core-networks.de.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/core-networks.de.json rename to net/ddns-scripts/files/usr/share/ddns/default/core-networks.de.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/ddns.com.br.json b/net/ddns-scripts/files/usr/share/ddns/default/ddns.com.br.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/ddns.com.br.json rename to net/ddns-scripts/files/usr/share/ddns/default/ddns.com.br.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/ddnss.de.json b/net/ddns-scripts/files/usr/share/ddns/default/ddnss.de.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/ddnss.de.json rename to net/ddns-scripts/files/usr/share/ddns/default/ddnss.de.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/ddo.jp.json b/net/ddns-scripts/files/usr/share/ddns/default/ddo.jp.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/ddo.jp.json rename to net/ddns-scripts/files/usr/share/ddns/default/ddo.jp.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/desec.io.json b/net/ddns-scripts/files/usr/share/ddns/default/desec.io.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/desec.io.json rename to net/ddns-scripts/files/usr/share/ddns/default/desec.io.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/dhis.org.json b/net/ddns-scripts/files/usr/share/ddns/default/dhis.org.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/dhis.org.json rename to net/ddns-scripts/files/usr/share/ddns/default/dhis.org.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/digitalocean.com-v2.json b/net/ddns-scripts/files/usr/share/ddns/default/digitalocean.com-v2.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/digitalocean.com-v2.json rename to net/ddns-scripts/files/usr/share/ddns/default/digitalocean.com-v2.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/dnsdynamic.org.json b/net/ddns-scripts/files/usr/share/ddns/default/dnsdynamic.org.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/dnsdynamic.org.json rename to net/ddns-scripts/files/usr/share/ddns/default/dnsdynamic.org.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/dnsever.com.json b/net/ddns-scripts/files/usr/share/ddns/default/dnsever.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/dnsever.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/dnsever.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/dnsexit.com.json b/net/ddns-scripts/files/usr/share/ddns/default/dnsexit.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/dnsexit.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/dnsexit.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/dnshome.de.json b/net/ddns-scripts/files/usr/share/ddns/default/dnshome.de.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/dnshome.de.json rename to net/ddns-scripts/files/usr/share/ddns/default/dnshome.de.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/dnsmadeeasy.com.json b/net/ddns-scripts/files/usr/share/ddns/default/dnsmadeeasy.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/dnsmadeeasy.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/dnsmadeeasy.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/dnsmax.com.json b/net/ddns-scripts/files/usr/share/ddns/default/dnsmax.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/dnsmax.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/dnsmax.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/dnsomatic.com.json b/net/ddns-scripts/files/usr/share/ddns/default/dnsomatic.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/dnsomatic.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/dnsomatic.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/dnspark.com.json b/net/ddns-scripts/files/usr/share/ddns/default/dnspark.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/dnspark.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/dnspark.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/do.de.json b/net/ddns-scripts/files/usr/share/ddns/default/do.de.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/do.de.json rename to net/ddns-scripts/files/usr/share/ddns/default/do.de.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/domopoli.de.json b/net/ddns-scripts/files/usr/share/ddns/default/domopoli.de.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/domopoli.de.json rename to net/ddns-scripts/files/usr/share/ddns/default/domopoli.de.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/dtdns.com.json b/net/ddns-scripts/files/usr/share/ddns/default/dtdns.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/dtdns.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/dtdns.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/duckdns.org.json b/net/ddns-scripts/files/usr/share/ddns/default/duckdns.org.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/duckdns.org.json rename to net/ddns-scripts/files/usr/share/ddns/default/duckdns.org.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/duiadns.net.json b/net/ddns-scripts/files/usr/share/ddns/default/duiadns.net.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/duiadns.net.json rename to net/ddns-scripts/files/usr/share/ddns/default/duiadns.net.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/dy.fi.json b/net/ddns-scripts/files/usr/share/ddns/default/dy.fi.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/dy.fi.json rename to net/ddns-scripts/files/usr/share/ddns/default/dy.fi.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/dyn.com.json b/net/ddns-scripts/files/usr/share/ddns/default/dyn.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/dyn.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/dyn.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/dyndns.it.json b/net/ddns-scripts/files/usr/share/ddns/default/dyndns.it.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/dyndns.it.json rename to net/ddns-scripts/files/usr/share/ddns/default/dyndns.it.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/dyndns.org.json b/net/ddns-scripts/files/usr/share/ddns/default/dyndns.org.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/dyndns.org.json rename to net/ddns-scripts/files/usr/share/ddns/default/dyndns.org.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/dyndnss.net.json b/net/ddns-scripts/files/usr/share/ddns/default/dyndnss.net.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/dyndnss.net.json rename to net/ddns-scripts/files/usr/share/ddns/default/dyndnss.net.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/dyns.net.json b/net/ddns-scripts/files/usr/share/ddns/default/dyns.net.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/dyns.net.json rename to net/ddns-scripts/files/usr/share/ddns/default/dyns.net.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/dynsip.org.json b/net/ddns-scripts/files/usr/share/ddns/default/dynsip.org.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/dynsip.org.json rename to net/ddns-scripts/files/usr/share/ddns/default/dynsip.org.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/dynu.com.json b/net/ddns-scripts/files/usr/share/ddns/default/dynu.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/dynu.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/dynu.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/dynv6.com.json b/net/ddns-scripts/files/usr/share/ddns/default/dynv6.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/dynv6.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/dynv6.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/easydns.com.json b/net/ddns-scripts/files/usr/share/ddns/default/easydns.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/easydns.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/easydns.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/editdns.net.json b/net/ddns-scripts/files/usr/share/ddns/default/editdns.net.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/editdns.net.json rename to net/ddns-scripts/files/usr/share/ddns/default/editdns.net.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/freedns.42.pl.json b/net/ddns-scripts/files/usr/share/ddns/default/freedns.42.pl.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/freedns.42.pl.json rename to net/ddns-scripts/files/usr/share/ddns/default/freedns.42.pl.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/godaddy.com-v1.json b/net/ddns-scripts/files/usr/share/ddns/default/godaddy.com-v1.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/godaddy.com-v1.json rename to net/ddns-scripts/files/usr/share/ddns/default/godaddy.com-v1.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/goip.de.json b/net/ddns-scripts/files/usr/share/ddns/default/goip.de.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/goip.de.json rename to net/ddns-scripts/files/usr/share/ddns/default/goip.de.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/google.com.json b/net/ddns-scripts/files/usr/share/ddns/default/google.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/google.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/google.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/he.net.json b/net/ddns-scripts/files/usr/share/ddns/default/he.net.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/he.net.json rename to net/ddns-scripts/files/usr/share/ddns/default/he.net.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/inwx.de.json b/net/ddns-scripts/files/usr/share/ddns/default/inwx.de.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/inwx.de.json rename to net/ddns-scripts/files/usr/share/ddns/default/inwx.de.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/joker.com.json b/net/ddns-scripts/files/usr/share/ddns/default/joker.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/joker.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/joker.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/loopia.se.json b/net/ddns-scripts/files/usr/share/ddns/default/loopia.se.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/loopia.se.json rename to net/ddns-scripts/files/usr/share/ddns/default/loopia.se.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/moniker.com.json b/net/ddns-scripts/files/usr/share/ddns/default/moniker.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/moniker.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/moniker.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/mydns.ip.json b/net/ddns-scripts/files/usr/share/ddns/default/mydns.ip.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/mydns.ip.json rename to net/ddns-scripts/files/usr/share/ddns/default/mydns.ip.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/myip.co.ua.json b/net/ddns-scripts/files/usr/share/ddns/default/myip.co.ua.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/myip.co.ua.json rename to net/ddns-scripts/files/usr/share/ddns/default/myip.co.ua.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/myonlineportal.net.json b/net/ddns-scripts/files/usr/share/ddns/default/myonlineportal.net.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/myonlineportal.net.json rename to net/ddns-scripts/files/usr/share/ddns/default/myonlineportal.net.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/mythic-beasts.com.json b/net/ddns-scripts/files/usr/share/ddns/default/mythic-beasts.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/mythic-beasts.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/mythic-beasts.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/namecheap.com.json b/net/ddns-scripts/files/usr/share/ddns/default/namecheap.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/namecheap.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/namecheap.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/nettica.com.json b/net/ddns-scripts/files/usr/share/ddns/default/nettica.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/nettica.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/nettica.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/no-ip.com.json b/net/ddns-scripts/files/usr/share/ddns/default/no-ip.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/no-ip.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/no-ip.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/no-ip.pl.json b/net/ddns-scripts/files/usr/share/ddns/default/no-ip.pl.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/no-ip.pl.json rename to net/ddns-scripts/files/usr/share/ddns/default/no-ip.pl.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/now-dns.com.json b/net/ddns-scripts/files/usr/share/ddns/default/now-dns.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/now-dns.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/now-dns.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/nsupdate.info.json b/net/ddns-scripts/files/usr/share/ddns/default/nsupdate.info.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/nsupdate.info.json rename to net/ddns-scripts/files/usr/share/ddns/default/nsupdate.info.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/nubem.com.json b/net/ddns-scripts/files/usr/share/ddns/default/nubem.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/nubem.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/nubem.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/opendns.com.json b/net/ddns-scripts/files/usr/share/ddns/default/opendns.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/opendns.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/opendns.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/oray.com.json b/net/ddns-scripts/files/usr/share/ddns/default/oray.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/oray.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/oray.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/ovh.com.json b/net/ddns-scripts/files/usr/share/ddns/default/ovh.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/ovh.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/ovh.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/regfish.de.json b/net/ddns-scripts/files/usr/share/ddns/default/regfish.de.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/regfish.de.json rename to net/ddns-scripts/files/usr/share/ddns/default/regfish.de.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/route53-v1.json b/net/ddns-scripts/files/usr/share/ddns/default/route53-v1.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/route53-v1.json rename to net/ddns-scripts/files/usr/share/ddns/default/route53-v1.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/schokokeks.org.json b/net/ddns-scripts/files/usr/share/ddns/default/schokokeks.org.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/schokokeks.org.json rename to net/ddns-scripts/files/usr/share/ddns/default/schokokeks.org.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/selfhost.de.json b/net/ddns-scripts/files/usr/share/ddns/default/selfhost.de.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/selfhost.de.json rename to net/ddns-scripts/files/usr/share/ddns/default/selfhost.de.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/sitelutions.com.json b/net/ddns-scripts/files/usr/share/ddns/default/sitelutions.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/sitelutions.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/sitelutions.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/spdyn.de.json b/net/ddns-scripts/files/usr/share/ddns/default/spdyn.de.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/spdyn.de.json rename to net/ddns-scripts/files/usr/share/ddns/default/spdyn.de.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/strato.com.json b/net/ddns-scripts/files/usr/share/ddns/default/strato.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/strato.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/strato.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/system-ns.com.json b/net/ddns-scripts/files/usr/share/ddns/default/system-ns.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/system-ns.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/system-ns.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/thatip.com.json b/net/ddns-scripts/files/usr/share/ddns/default/thatip.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/thatip.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/thatip.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/twodns.de.json b/net/ddns-scripts/files/usr/share/ddns/default/twodns.de.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/twodns.de.json rename to net/ddns-scripts/files/usr/share/ddns/default/twodns.de.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/udmedia.de.json b/net/ddns-scripts/files/usr/share/ddns/default/udmedia.de.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/udmedia.de.json rename to net/ddns-scripts/files/usr/share/ddns/default/udmedia.de.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/variomedia.de.json b/net/ddns-scripts/files/usr/share/ddns/default/variomedia.de.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/variomedia.de.json rename to net/ddns-scripts/files/usr/share/ddns/default/variomedia.de.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/xlhost.de.json b/net/ddns-scripts/files/usr/share/ddns/default/xlhost.de.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/xlhost.de.json rename to net/ddns-scripts/files/usr/share/ddns/default/xlhost.de.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/zerigo.com.json b/net/ddns-scripts/files/usr/share/ddns/default/zerigo.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/zerigo.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/zerigo.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/zoneedit.com.json b/net/ddns-scripts/files/usr/share/ddns/default/zoneedit.com.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/zoneedit.com.json rename to net/ddns-scripts/files/usr/share/ddns/default/zoneedit.com.json diff --git a/net/ddns-scripts/files/usr/share/ddns/services/zzzz.io.json b/net/ddns-scripts/files/usr/share/ddns/default/zzzz.io.json similarity index 100% rename from net/ddns-scripts/files/usr/share/ddns/services/zzzz.io.json rename to net/ddns-scripts/files/usr/share/ddns/default/zzzz.io.json From 8d10cdda08445123067847aa748bcece528664c0 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 28 Sep 2020 15:12:03 +0200 Subject: [PATCH 15/16] ddns-scripts: also read providers from custom directory The provider could also be read from the custom directory. To get always the latest version of the provider config json file, we read first the custom directory and after that we also check the default directory, if we could not find the provider file Signed-off-by: Florian Eckert --- .../files/usr/lib/ddns/dynamic_dns_functions.sh | 11 ++++++----- .../files/usr/lib/ddns/dynamic_dns_updater.sh | 6 +++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh b/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh index d59fed4408..a5698d7f29 100644 --- a/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh +++ b/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh @@ -317,17 +317,18 @@ urlencode() { } # extract url or script for given DDNS Provider from -# directory /usr/share/ddns/default # $1 Name of the provider -# $1 Name of Variable to store url to -# $2 Name of Variable to store script to -# $3 Name of Variable to store service answer to +# $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 dir="/usr/share/ddns/default" local name data url answer script [ $# -ne 3 ] && write_log 12 "Error calling 'get_service_data()' - wrong number of parameters" diff --git a/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh b/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh index 9e75552d99..41bc6f8256 100644 --- a/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh +++ b/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh @@ -233,7 +233,11 @@ esac # otherwise update_url is set inside configuration (custom update url) # or update_script is set inside configuration (custom update script) [ -n "$service_name" ] && { - get_service_data "$service_name" update_url update_script UPD_ANSWER + # 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!" From 42eb5cc0c3c1b477943d3679b483a9867110bde3 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 28 Sep 2020 09:23:25 +0200 Subject: [PATCH 16/16] ddns-scripts: update PKG_VERSION to 2.8.1 Signed-off-by: Florian Eckert --- net/ddns-scripts/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index cb11c62f0e..e9987b056e 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-scripts -PKG_VERSION:=2.8.0 -PKG_RELEASE:=24 +PKG_VERSION:=2.8.1 +PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0