diff options
| -rw-r--r-- | packages/tinydns/tinydns.inc | 20 | ||||
| -rw-r--r-- | packages/tinydns/tinydns.xml | 6 |
2 files changed, 3 insertions, 23 deletions
diff --git a/packages/tinydns/tinydns.inc b/packages/tinydns/tinydns.inc index ed024680..4ee32325 100644 --- a/packages/tinydns/tinydns.inc +++ b/packages/tinydns/tinydns.inc @@ -88,11 +88,14 @@ svscan_start () { /usr/bin/env \ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \ /usr/sbin/daemon -f /bin/sh -c "\$command \$svscan_servicedir 2>&1 | /usr/local/bin/readproctitle service errors: ................................................................................................................................................................................................................................................................................................................................................................................................................ &" > /dev/null + minicron 1 /var/run/ping_hosts.pid /etc/ping_hosts.sh } svscan_stop_post () { echo "Stopping svscan." find -L "\$svscan_servicedir" -mindepth 1 -maxdepth 2 -type d \( \! -path "\$svscan_servicedir/*/*" -or -name 'log' \) -print0 | xargs -0 /usr/local/bin/svc -dx + PIDTOKILL=`cat /var/run/ping_hosts.pid` + kill $PIDTOKILL } run_rc_command "\$1" @@ -132,23 +135,6 @@ function tinydns_custom_php_changeip_command() { exec("/usr/local/bin/tinydns-conf Gtinydns Gdnslog /etc/tinydns {$ip}"); exec("/bin/mkdir /service"); exec("/bin/ln -s /etc/tinydns /service/"); - if($updatecron) { - $text_1 = "*/1 * * * * root /etc/ping_hosts.sh"; - $text_5 = "*/5 * * * * root /etc/ping_hosts.sh"; - $filenamea = "/etc/crontab"; - remove_text_from_file($filenamea, $text_1); - remove_text_from_file($filenamea, $text_5); - add_text_to_file($filenamea, $text_1); - } else { - $text_1 = "*/1 * * * * root /etc/ping_hosts.sh"; - $text_5 = "*/5 * * * * root /etc/ping_hosts.sh"; - $filenamea = "/etc/crontab"; - remove_text_from_file($filenamea, $text_1); - remove_text_from_file($filenamea, $text_5); - add_text_to_file($filenamea, $text_5); - } - - exec("killall -HUP cron"); conf_mount_ro(); filter_configure(); } diff --git a/packages/tinydns/tinydns.xml b/packages/tinydns/tinydns.xml index bc7e2c40..864859b9 100644 --- a/packages/tinydns/tinydns.xml +++ b/packages/tinydns/tinydns.xml @@ -82,12 +82,6 @@ <type>input</type> </field> <field> - <fieldname>updatecron</fieldname> - <fielddescr>Update cron</fielddescr> - <description>Changes cron to ping hosts every minute from 5.</description> - <type>checkbox</type> - </field> - <field> <fieldname>syncxmlrpc</fieldname> <fielddescr>XMLRPC Sync</fielddescr> <description>Sync TinyDNS configuration to backup firewalls</description> |