From 9765c5fafe1c7a25133bfe0333f0e036f48a2d42 Mon Sep 17 00:00:00 2001
From: Colin Hebert <hebert.colin@gmail.com>
Date: Wed, 4 Jan 2023 07:51:25 +0100
Subject: [PATCH] Remove ddclient in favour of duckdns

---
 services/ddclient/configs/ddclient.conf.tpl   | 19 -----------
 services/ddclient/secrets/README.md           |  5 ---
 services/ddclient/volumes/config/.gitkeep     |  0
 services/ddclient/volumes/data/.gitignore     |  1 -
 .../volumes/data/postscript_gotify.sh         | 12 -------
 services/ddclient/volumes/init/.gitignore     |  1 -
 .../ddclient/volumes/init/fill_template.sh    |  3 --
 utilities.docker-compose.yml                  | 33 +++----------------
 8 files changed, 5 insertions(+), 69 deletions(-)
 delete mode 100644 services/ddclient/configs/ddclient.conf.tpl
 delete mode 100644 services/ddclient/secrets/README.md
 delete mode 100644 services/ddclient/volumes/config/.gitkeep
 delete mode 100644 services/ddclient/volumes/data/.gitignore
 delete mode 100755 services/ddclient/volumes/data/postscript_gotify.sh
 delete mode 100644 services/ddclient/volumes/init/.gitignore
 delete mode 100755 services/ddclient/volumes/init/fill_template.sh

diff --git a/services/ddclient/configs/ddclient.conf.tpl b/services/ddclient/configs/ddclient.conf.tpl
deleted file mode 100644
index 8a36ef4..0000000
--- a/services/ddclient/configs/ddclient.conf.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-daemon=300              # check every 300 seconds
-syslog=yes              # log update msgs to syslog
-pid=/var/run/ddclient/ddclient.pid # record PID in file.
-ssl=yes                 # use ssl-support.  Works with
-                        # ssl-library
-postscript=/data/postscript_gotify.sh # run script after updating.  The
-                        # new IP is added as argument.
-use=web
-web=googledomains
-
-##
-## CloudFlare (www.cloudflare.com)
-##
-protocol=cloudflare,       \
-zone=dedicated.contact,    \
-ttl=1,                     \
-login=token,               \
-password=$CLOUDFLARE_TOKEN \
-$CLOUDFLARE_DOMAIN
diff --git a/services/ddclient/secrets/README.md b/services/ddclient/secrets/README.md
deleted file mode 100644
index 1474f3a..0000000
--- a/services/ddclient/secrets/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Contains the file `gotify_token`
-Loadded in the postscript_gotify.sh to send a notification when a new IP is found
-
-Contains the file `clourflare_token`
-Token required to access the DNS API of cloudflare
diff --git a/services/ddclient/volumes/config/.gitkeep b/services/ddclient/volumes/config/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/services/ddclient/volumes/data/.gitignore b/services/ddclient/volumes/data/.gitignore
deleted file mode 100644
index 07b2f6d..0000000
--- a/services/ddclient/volumes/data/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!postscript_gotify.sh
diff --git a/services/ddclient/volumes/data/postscript_gotify.sh b/services/ddclient/volumes/data/postscript_gotify.sh
deleted file mode 100755
index 1dacce5..0000000
--- a/services/ddclient/volumes/data/postscript_gotify.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-if [ "$(cat /data/gotify_previous_ip || true)" != "$1" ]; then
-    echo -n "$1" > /data/gotify_previous_ip
-
-    curl -s "${GOTIFY_ADDRESS%/}/message" \
-        -X POST \
-        -H "X-Gotify-Key: $GOTIFY_TOKEN" \
-        -F "title=IP Address updated" \
-        -F "message=IP address detected as $1" \
-        -F "priority=5"
-fi
diff --git a/services/ddclient/volumes/init/.gitignore b/services/ddclient/volumes/init/.gitignore
deleted file mode 100644
index fad0801..0000000
--- a/services/ddclient/volumes/init/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!fill_template.sh
diff --git a/services/ddclient/volumes/init/fill_template.sh b/services/ddclient/volumes/init/fill_template.sh
deleted file mode 100755
index f1db6ef..0000000
--- a/services/ddclient/volumes/init/fill_template.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-apk add --update gettext
-envsubst < /config/ddclient.conf.tpl > /ddclient.conf
diff --git a/utilities.docker-compose.yml b/utilities.docker-compose.yml
index 0888dcb..af3ee07 100644
--- a/utilities.docker-compose.yml
+++ b/utilities.docker-compose.yml
@@ -31,31 +31,10 @@ services:
   duckdns:
     image: linuxserver/duckdns
     environment:
-      - FILE__SUBDOMAINS=subdomain1,subdomain2
-      - FILE__TOKEN=token
-    restart: unless-stopped
-
-  ddclient:
-    image: linuxserver/ddclient
-    environment:
-      GOTIFY_ADDRESS: http://gotify
-      FILE__GOTIFY_TOKEN: /run/secrets/gotify_token
-      CLOUDFLARE_DOMAIN: ${DDCLIENT_CLOUDFLARE_DOMAIN-test.dedicated.contact}
-      FILE__CLOUDFLARE_TOKEN: /run/secrets/cloudflare_token
-    networks:
-      - gotify
-    volumes:
-      - ddclient_data:/data/
-      - ddclient_config:/config/
-      - ddclient_init:/config/custom-cont-init.d/:ro #TODO: Move to /custom-cont-init.d/
-    configs:
-      - source: ddclient_config_tpl
-        target: /config/ddclient.conf.tpl
+      - SUBDOMAINS=${DUCK_DNS_DOMAIN?}
+      - FILE__TOKEN=/run/secrets/duckdns_token
     secrets:
-      - source: ddclient_gotify_token
-        target: gotify_token
-      - source: ddclient_cloudflare_token
-        target: cloudflare_token
+      - duckdns_token
     restart: unless-stopped
 
 networks:
@@ -100,7 +79,5 @@ configs:
 secrets:
   watchtower_gotify_token:
     file: ${SERVICES_DIR?}/watchtower/secrets/gotify_token
-  ddclient_gotify_token:
-    file: ${SERVICES_DIR?}/ddclient/secrets/gotify_token
-  ddclient_cloudflare_token:
-    file: ${SERVICES_DIR?}/ddclient/secrets/cloudflare_token
+  duckdns_token:
+    file: ${SERVICES_DIR?}/ddclient/secrets/duckdns_token