Merge 7782633e1e into 92b4a10b71

ddclient

@@ -613,6 +613,7 @@ my %services = (
             { 'server'       => setv(T_FQDNP,  1, 0, 1, 'www.cloudflare.com', undef)          },
             { 'min-interval' => setv(T_DELAY,  0, 0, 1, interval('5m'), 0),},
             $variables{'cloudflare-common-defaults'},
+            $variables{'service-common-defaults'},
         ),
     },
     'googledomains' => {

sample-etc_rc.d_init.d_ddclient.ubuntu

@@ -16,9 +16,9 @@ test -f $CONF || exit 0
 case "$1" in
 start)
 log_begin_msg "Starting ddclient..."
-DELAY=`grep -v '^\s*#' $CONF | grep -i -m 1 "daemon" | awk -F '=' '{print $2}'`
+DELAY=`grep -v '^\s*#' $CONF | grep -i -m 1 "daemon" | awk -F '#' '{print $1}' | awk -F '=' '{print $2}'`
 if [ -z "$DELAY" ] ; then
-DELAY="-daemon 300"
+DELAY="-daemon $DELAY"
 else
 DELAY=''
 fi