lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 08:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

system: remove rc.monitor in favour of pluggable rc.syshook facility

Browse Source
This commit is contained in:
Franco Fichtner 2019-04-29 13:53:26 +02:00
parent 1bc478fbaa
commit dba3a964de
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plist
View File

@ -95,7 +95,6 @@
/usr/local/etc/rc.loader.d/20-modules
/usr/local/etc/rc.loader.d/20-netgraph
/usr/local/etc/rc.loader.d/20-zfs
/usr/local/etc/rc.monitor
/usr/local/etc/rc.newwanip
/usr/local/etc/rc.newwanipv6
/usr/local/etc/rc.reboot
@ -122,6 +121,7 @@
/usr/local/etc/rc.syshook.d/early/10-configd
/usr/local/etc/rc.syshook.d/early/15-templates
/usr/local/etc/rc.syshook.d/early/20-backup
/usr/local/etc/rc.syshook.d/monitor/10-dpinger
/usr/local/etc/rc.syshook.d/start/10-newwanip
/usr/local/etc/rc.syshook.d/start/20-freebsd
/usr/local/etc/rc.syshook.d/start/90-carp

2
src/etc/inc/plugins.inc.d/dpinger.inc
View File

@ -233,7 +233,7 @@ function dpinger_configure_do($verbose = false, $gwname = null)
$params .= exec_safe('-u %s ', "/var/run/dpinger_{$name}.sock");
/* command to run on alarm */
$params .= '-C /usr/local/etc/rc.monitor ';
$params .= '-C "/usr/local/etc/rc.syshook monitor" ';
$params .= exec_safe(
'-s %ss ',

12
src/etc/rc.monitor → src/etc/rc.syshook.d/monitor/10-dpinger
View File

@ -1,6 +1,6 @@
#!/bin/sh
# Copyright (c) 2018 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2018-2019 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -34,10 +34,10 @@ fi
/usr/bin/logger -t dpinger "GATEWAY ALARM: ${GATEWAY} (Addr: ${2} Alarm: ${3} RTT: ${4}ms RTTd: ${5}ms Loss: ${6}%)"
# XXX we should use configctl plugins configure here
/usr/local/opnsense/service/configd_ctl.py -m \
"filter reload" \
"dyndns reload ${GATEWAY}" \
"rfc2136 reload ${GATEWAY}"
/usr/local/opnsense/service/configd_ctl.py filter reload
# XXX move to plugins
/usr/local/opnsense/service/configd_ctl.py dyndns reload ${GATEWAY}
/usr/local/opnsense/service/configd_ctl.py rfc2136 reload ${GATEWAY}
exit 0