Commit 535d1c31 authored by Ad Schellevis's avatar Ad Schellevis

(configd) fix usage to changed implementation

parent e4cd84cb
......@@ -6,11 +6,11 @@
notify 100 {
match "system" "CARP";
match "type" "MASTER";
action "/usr/local/opnsense/service/configd_ctl.py 'interface carpmaster $subsystem'";
action "/usr/local/opnsense/service/configd_ctl.py interface carpmaster $subsystem";
};
notify 100 {
match "system" "CARP";
match "type" "BACKUP";
action "/usr/local/opnsense/service/configd_ctl.py 'interface carpbackup $subsystem'";
action "/usr/local/opnsense/service/configd_ctl.py interface carpbackup $subsystem";
};
......@@ -7,28 +7,28 @@ notify 101 {
match "system" "IFNET";
match "type" "LINK_UP";
media-type "ethernet";
action "/usr/local/opnsense/service/configd_ctl.py 'interface linkup start $subsystem'";
action "/usr/local/opnsense/service/configd_ctl.py interface linkup start $subsystem";
};
notify 101 {
match "system" "IFNET";
match "type" "LINK_DOWN";
media-type "ethernet";
action "/usr/local/opnsense/service/configd_ctl.py 'interface linkup stop $subsystem'";
action "/usr/local/opnsense/service/configd_ctl.py interface linkup stop $subsystem";
};
notify 101 {
match "system" "IFNET";
match "type" "LINK_UP";
media-type "802.11";
action "/usr/local/opnsense/service/configd_ctl.py 'interface linkup start $subsystem'";
action "/usr/local/opnsense/service/configd_ctl.py interface linkup start $subsystem";
};
notify 101 {
match "system" "IFNET";
match "type" "LINK_DOWN";
media-type "802.11";
action "/usr/local/opnsense/service/configd_ctl.py 'interface linkup stop $subsystem'";
action "/usr/local/opnsense/service/configd_ctl.py interface linkup stop $subsystem";
};
#
......
......@@ -103,8 +103,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 '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' "
command on "/usr/local/opnsense/service/configd_ctl.py -m 'dyndns reload %T' 'ipsecdns reload' 'openvpn reload %T' 'filter reload' "
command off "/usr/local/opnsense/service/configd_ctl.py -m 'dyndns reload %T' 'ipsecdns reload' 'openvpn reload %T' 'filter reload' "
combine 10s
}
......
......@@ -5198,7 +5198,7 @@ function interface_setup_pppoe_reset_file($pppif, $iface = '')
if(!empty($iface) && !empty($pppif)){
$cron_cmd = <<<EOD
#!/bin/sh
/usr/local/opnsense/service/configd_ctl.py 'interface reconfigure {$iface}'
/usr/local/opnsense/service/configd_ctl.py interface reconfigure {$iface}
/usr/bin/logger -t {$pppif} "PPPoE periodic reset executed on {$iface}"
EOD;
......
......@@ -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 \"routedns reload\"'\n";
$hostnames .= "cmd {$hostname} '/usr/local/opnsense/service/configd_ctl.py routedns reload'\n";
file_put_contents("/var/etc/filterdns-route.hosts", $hostnames);
unset($hostnames);
......
......@@ -826,7 +826,7 @@ EOD;
$hostnames = "";
array_unique($filterdns_list);
foreach ($filterdns_list as $hostname)
$hostnames .= "cmd {$hostname} '/usr/local/opnsense/service/configd_ctl.py \"ipsecdns reload\"'\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);
......
......@@ -4,4 +4,4 @@
/bin/rm -f /var/etc/nameserver_$1
/bin/rm -f /tmp/$1_router
/bin/rm -f /tmp/$1up
/usr/local/opnsense/service/configd_ctl.py 'filter reload'
/usr/local/opnsense/service/configd_ctl.py filter reload
#!/bin/sh
# let the configuration system know that the ip has changed.
# /usr/local/opnsense/service/configd_ctl.py "interface newip $interface"
# /usr/local/opnsense/service/configd_ctl.py interface newip $interface
if [ "${dev_type}" = "tun" ]; then
if [ "" != "$route_vpn_gateway" ]; then
......@@ -13,5 +13,5 @@ fi
/usr/bin/touch /tmp/$1up
# reload filter
/usr/local/opnsense/service/configd_ctl.py "interface newip $1"
/usr/local/opnsense/service/configd_ctl.py interface newip $1
exit 0
......@@ -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 'dns reload'
/usr/local/opnsense/service/configd_ctl.py dns reload
......@@ -29,10 +29,10 @@ if [ "${2}" == "inet" ]; then
echo "${DNS2}" >> /var/etc/nameserver_${1}
route change "${DNS2}" ${4}
fi
/usr/local/opnsense/service/configd_ctl.py 'dns reload'
/usr/local/opnsense/service/configd_ctl.py dns reload
sleep 1
fi
/usr/local/opnsense/service/configd_ctl.py "interface newip ${1}"
/usr/local/opnsense/service/configd_ctl.py interface newip ${1}
elif [ "${2}" == "inet6" ]; then
# let the configuration system know that the ipv6 has changed.
......@@ -53,10 +53,10 @@ elif [ "${2}" == "inet6" ]; then
echo "${DNS2}" >> /var/etc/nameserver_v6${1}
route change -inet6 "${DNS2}" ${4}
fi
/usr/local/opnsense/service/configd_ctl.py 'dns reload'
/usr/local/opnsense/service/configd_ctl.py dns reload
sleep 1
fi
/usr/local/opnsense/service/configd_ctl.py "interface newipv6 ${1}"
/usr/local/opnsense/service/configd_ctl.py interface newipv6 ${1}
fi
exit 0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment