From d7d1a07ab52aa09defcf29d769934f53b51c72a7 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Tue, 7 Apr 2015 20:29:06 +0000 Subject: [PATCH] cleanup configd usage --- src/etc/inc/gwlb.inc | 4 +-- src/etc/inc/system.inc | 2 +- src/etc/inc/vpn.inc | 2 +- src/opnsense/scripts/pkg_upgrade.sh | 2 +- .../conf/actions.d/actions_interface.conf | 32 +++++++++++++++++++ .../service/conf/actions_service.conf | 19 ----------- src/sbin/ppp-linkdown | 2 +- src/sbin/ppp-linkup | 4 +-- 8 files changed, 40 insertions(+), 27 deletions(-) diff --git a/src/etc/inc/gwlb.inc b/src/etc/inc/gwlb.inc index 1c6b01878..98035d044 100644 --- a/src/etc/inc/gwlb.inc +++ b/src/etc/inc/gwlb.inc @@ -98,8 +98,8 @@ rrd interval 60s; ## These parameters can be overridden in a specific alarm configuration alarm default { - command on "/usr/local/opnsense/service/configd_ctl.py 'service reload dyndns %T' 'service reload ipsecdns' 'service reload openvpn %T' 'filter reload' " - command off "/usr/local/opnsense/service/configd_ctl.py 'service reload dyndns %T' 'service reload ipsecdns' 'service reload openvpn %T' 'filter reload' " + command on "/usr/local/opnsense/service/configd_ctl.py 'dyndns reload %T' 'ipsecdns reload' 'openvpn reload %T' 'filter reload' " + command off "/usr/local/opnsense/service/configd_ctl.py 'dyndns reload %T' 'ipsecdns reload' 'openvpn reload %T' 'filter reload' " combine 10s } diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc index 755febaae..13a2945b9 100644 --- a/src/etc/inc/system.inc +++ b/src/etc/inc/system.inc @@ -548,7 +548,7 @@ function system_staticroutes_configure($interface = "", $update_dns = false) { $hostnames = ""; array_unique($filterdns_list); foreach ($filterdns_list as $hostname) - $hostnames .= "cmd {$hostname} '/usr/local/opnsense/service/configd_ctl.py \"service reload routedns\"'\n"; + $hostnames .= "cmd {$hostname} '/usr/local/opnsense/service/configd_ctl.py \"routedns reload\"'\n"; file_put_contents("{$g['varetc_path']}/filterdns-route.hosts", $hostnames); unset($hostnames); diff --git a/src/etc/inc/vpn.inc b/src/etc/inc/vpn.inc index f41cdc800..be8cd2914 100644 --- a/src/etc/inc/vpn.inc +++ b/src/etc/inc/vpn.inc @@ -836,7 +836,7 @@ EOD; $hostnames = ""; array_unique($filterdns_list); foreach ($filterdns_list as $hostname) - $hostnames .= "cmd {$hostname} '/usr/local/opnsense/service/configd_ctl.py \"service reload ipsecdns\"'\n"; + $hostnames .= "cmd {$hostname} '/usr/local/opnsense/service/configd_ctl.py \"ipsecdns reload\"'\n"; file_put_contents("/usr/local/etc/filterdns-ipsec.hosts", $hostnames); unset($hostnames); diff --git a/src/opnsense/scripts/pkg_upgrade.sh b/src/opnsense/scripts/pkg_upgrade.sh index 8d35ffb5d..d5571f1a9 100755 --- a/src/opnsense/scripts/pkg_upgrade.sh +++ b/src/opnsense/scripts/pkg_upgrade.sh @@ -41,7 +41,7 @@ if [ -z "$pkg_running" ]; then # update all installed packages pkg upgrade -y >> ${PKG_PROGRESS_FILE} # restart the web server - /usr/local/opnsense/service/configd_ctl.py 'service restart webgui' >> ${PKG_PROGRESS_FILE} + /usr/local/opnsense/service/configd_ctl.py 'webgui restart' >> ${PKG_PROGRESS_FILE} # remove no longer referenced packages pkg autoremove -y >> ${PKG_PROGRESS_FILE} elif [ "$package" == "pkg" ]; then diff --git a/src/opnsense/service/conf/actions.d/actions_interface.conf b/src/opnsense/service/conf/actions.d/actions_interface.conf index 7ddb5fd92..52cbc629c 100644 --- a/src/opnsense/service/conf/actions.d/actions_interface.conf +++ b/src/opnsense/service/conf/actions.d/actions_interface.conf @@ -15,3 +15,35 @@ command:/usr/local/etc/rc.newwanip parameters:%s type:script message:rc.newwanip starting %s + +[newipv6] +command:/usr/local/etc/rc.newwanipv6 +parameters:%s +type:script +message:rc.newwanip starting %s + + +[linkup.start] +command:/usr/local/etc/rc.linkup +parameters:start %s +type:script +message:Linkup starting %s + +[linkup.stop] +command:/usr/local/etc/rc.linkup +parameters:stop %s +type:script +message:Linkup stopping %s + +[carpmaster] +command:/usr/local/etc/rc.carpmaster +parameters:%s +type:script +message:Carp master event + +[carpbackup] +command:/usr/local/etc/rc.carpbackup +parameters:%s +type:script +message:Carp backup event + diff --git a/src/opnsense/service/conf/actions_service.conf b/src/opnsense/service/conf/actions_service.conf index ab2cbc355..2b7ad5cb1 100644 --- a/src/opnsense/service/conf/actions_service.conf +++ b/src/opnsense/service/conf/actions_service.conf @@ -3,22 +3,3 @@ command:/usr/local/etc/rc.reload_all parameters: type:script message:Reloading all - -[reload|restart.routedns] -command:/usr/local/etc/rc.newroutedns -parameters: -type:script -message:Updating static routes based on hostnames - -[reload|restart.openvpn] -command:/usr/local/etc/rc.openvpn -parameters:%s -type:script -message:Restarting OpenVPN tunnels/interfaces %s - -[reload|restart.ntpd] -command:/usr/bin/killall ntpd; /bin/sleep 3; /usr/local/sbin/ntpd -s -f /var/etc/ntpd.conf -parameters: -type:script -message:Starting nptd - diff --git a/src/sbin/ppp-linkdown b/src/sbin/ppp-linkdown index 119987ea9..dc6408eea 100755 --- a/src/sbin/ppp-linkdown +++ b/src/sbin/ppp-linkdown @@ -28,4 +28,4 @@ fi /bin/rm -f /tmp/${IF}_router /bin/rm -f /tmp/${IF}up /bin/rm -f /tmp/${IF}_ip -/usr/local/opnsense/service/configd_ctl.py 'service reload dns' +/usr/local/opnsense/service/configd_ctl.py 'dns reload' diff --git a/src/sbin/ppp-linkup b/src/sbin/ppp-linkup index e387100c1..40bc7fd3f 100755 --- a/src/sbin/ppp-linkup +++ b/src/sbin/ppp-linkup @@ -29,7 +29,7 @@ if [ "${2}" == "inet" ]; then echo "${DNS2}" >> /var/etc/nameserver_${1} route change "${DNS2}" ${4} fi - /usr/local/opnsense/service/configd_ctl.py 'service reload dns' + /usr/local/opnsense/service/configd_ctl.py 'dns reload' sleep 1 fi /usr/local/opnsense/service/configd_ctl.py "interface newip ${1}" @@ -53,7 +53,7 @@ elif [ "${2}" == "inet6" ]; then echo "${DNS2}" >> /var/etc/nameserver_v6${1} route change -inet6 "${DNS2}" ${4} fi - /usr/local/opnsense/service/configd_ctl.py 'service reload dns' + /usr/local/opnsense/service/configd_ctl.py 'dns reload' sleep 1 fi /usr/local/opnsense/service/configd_ctl.py "interface newipv6 ${1}"