Allow setting custom IP service URLs

README.md

@@ -35,6 +35,7 @@ dynamic DNS needs.
 * Creation of a DNS record if it doesn't already exist
 * Multi host support (nice when you need to update both `@` and `*`) 
 * IPv6 support
+* Allow setting custom IP service
 
 If you need additional features please open up an
 [Issue](https://github.com/Hentra/dyndns-netcup-go/issues).

config/example.yml

@@ -14,6 +14,11 @@ IP-CACHE: '/home/user/.cache/dyndns.cache'
 # To disable the cache set the value to 0.
 IP-CACHE-TIMEOUT: 3600
 
+# Services to query for the current IPv4 or IPv6 address.
+# The differentiation between IPv4 and IPv6 has to be made by the service.
+IPV4-SERVICE: "https://api.ipify.org?format=text"
+IPV6-SERVICE: "https://api6.ipify.org?format=text"
+
 DOMAINS: 
     - NAME: 'example.de' # Your domain name without any subdomains.
       IPV6: true # Whether the 'AAAA' entries of this host should be

internal/config.go

@@ -13,6 +13,8 @@ type Config struct {
 	APIPassword    string   `yaml:"APIPASSWORD"`
 	IPCache        string   `yaml:"IP-CACHE"`
 	IPCacheTimeout int      `yaml:"IP-CACHE-TIMEOUT"`
+	IPv4Service    string   `yaml:"IPV4-SERVICE"`
+	IPv6Service    string   `yaml:"IPV6-SERVICE"`
 	Domains        []Domain `yaml:"DOMAINS"`
 }
 

internal/dns_configurator.go

@@ -29,7 +29,7 @@ func NewDNSConfigurator(config *Config, cache *Cache, logger *Logger) *DNSConfig
 func (dnsc *DNSConfiguratorService) Configure() {
 	dnsc.login()
 
-	ipAddresses, err := GetAddrInfo(dnsc.config.IPv4Enabled(), dnsc.config.IPv6Enabled())
+	ipAddresses, err := GetAddrInfo(dnsc.config.IPv4Enabled(), dnsc.config.IPv6Enabled(), dnsc.config.IPv4Service, dnsc.config.IPv6Service)
 	if err != nil {
 		dnsc.logger.Error(err)
 	}

internal/ip.go

@@ -12,19 +12,19 @@ type AddrInfo struct {
 }
 
 // GetAddrInfo retrieves an AddrInfo instance
-func GetAddrInfo(ipv4 bool, ipv6 bool) (*AddrInfo, error) {
+func GetAddrInfo(ipv4 bool, ipv6 bool, ipv4service string, ipv6service string) (*AddrInfo, error) {
 	adresses := &AddrInfo{}
 
 	if ipv4 {
-		address, err := getIPv4()
+		address, err := getIP(ipv4service)
 		if err != nil {
 			return nil, err
 		}
 		adresses.IPv4 = address
 	}
 
 	if ipv6 {
-		address, err := getIPv6()
+		address, err := getIP(ipv6service)
 		if err != nil {
 			return nil, err
 		}
@@ -35,15 +35,7 @@ func GetAddrInfo(ipv4 bool, ipv6 bool) (*AddrInfo, error) {
 	return adresses, nil
 }
 
-func getIPv4() (string, error) {
-	return do("https://api.ipify.org?format=text")
-}
-
-func getIPv6() (string, error) {
-	return do("https://api6.ipify.org?format=text")
-}
-
-func do(url string) (string, error) {
+func getIP(url string) (string, error) {
 	resp, err := http.Get(url)
 	if err != nil {
 		return "", err