From dba3a964de0a407c0e8d0a6f233d491c49e27a2a Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 29 Apr 2019 13:53:26 +0200
Subject: [PATCH] system: remove rc.monitor in favour of pluggable rc.syshook
 facility

---
 plist                                                |  2 +-
 src/etc/inc/plugins.inc.d/dpinger.inc                |  2 +-
 .../{rc.monitor => rc.syshook.d/monitor/10-dpinger}  | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename src/etc/{rc.monitor => rc.syshook.d/monitor/10-dpinger} (84%)

diff --git a/plist b/plist
index 1250aacc8..d5637416e 100644
--- a/plist
+++ b/plist
@@ -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
diff --git a/src/etc/inc/plugins.inc.d/dpinger.inc b/src/etc/inc/plugins.inc.d/dpinger.inc
index b5523c7cb..950af58db 100644
--- a/src/etc/inc/plugins.inc.d/dpinger.inc
+++ b/src/etc/inc/plugins.inc.d/dpinger.inc
@@ -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 ',
diff --git a/src/etc/rc.monitor b/src/etc/rc.syshook.d/monitor/10-dpinger
similarity index 84%
rename from src/etc/rc.monitor
rename to src/etc/rc.syshook.d/monitor/10-dpinger
index b12c2061f..bba45b9ef 100755
--- a/src/etc/rc.monitor
+++ b/src/etc/rc.syshook.d/monitor/10-dpinger
@@ -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