lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 01:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup configd usage

Browse Source
This commit is contained in:
Ad Schellevis 2015-04-07 20:29:06 +00:00
parent 64e8208ea7
commit d7d1a07ab5
8 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/etc/inc/gwlb.inc
View File

@ -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
}

2
src/etc/inc/system.inc
View File

@ -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);

2
src/etc/inc/vpn.inc
View File

@ -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);

2
src/opnsense/scripts/pkg_upgrade.sh
View File

@ -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

32
src/opnsense/service/conf/actions.d/actions_interface.conf
View File

@ -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

19
src/opnsense/service/conf/actions_service.conf
View File

@ -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

2
src/sbin/ppp-linkdown
View File

@ -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'

4
src/sbin/ppp-linkup
View File

@ -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}"