services: finish rework by removing last custom glue

(cherry picked from commit 918df6ea)

src/etc/inc/gwlb.inc

@@ -42,6 +42,12 @@ function return_apinger_defaults()
 	);
 }
 
+function setup_gateways_monitor_full()
+{
+	killbypid('/var/run/apinger.pid');
+	setup_gateways_monitor();
+}
+
 /*
  * Creates monitoring configuration file and
  * adds appropriate static routes.

src/etc/inc/services.inc

@@ -2595,6 +2595,7 @@ function services_get()
         $pconfig = array();
         $pconfig['name'] = "apinger";
         $pconfig['description'] = gettext("Gateway Monitoring Daemon");
+        $pconfig['php']['restart'] = array('setup_gateways_monitor_full');
         $pconfig['php']['start'] = array('setup_gateways_monitor');
         $pconfig['pidfile'] = '/var/run/apinger.pid';
         $services[] = $pconfig;
@@ -2675,6 +2676,7 @@ function services_get()
           $pconfig = array();
           $pconfig['name'] = "relayd";
           $pconfig['description'] = gettext("Server load balancing daemon");
+          $pconfig['php']['restart'] = array('relayd_configure_full', 'filter_configure');
           $pconfig['php']['start'] = array('relayd_configure', 'filter_configure');
           $services[] = $pconfig;
     }

src/etc/inc/vslb.inc

@@ -125,6 +125,10 @@ class SendMonitor extends Monitor {
 	}
 }
 
+function relady_configure_full()
+{
+    relayd_configure(true);
+}
 
 function relayd_configure($kill_first = false)
 {

src/www/status_services.php

@@ -141,18 +141,8 @@ function service_control_restart($name, $extras)
 {
     $msg = sprintf(gettext("%s has been restarted."), htmlspecialchars($name));
 
-    /* XXX clean this up */
-    switch($name) {
-        case 'apinger':
-            killbypid("/var/run/apinger.pid");
-            setup_gateways_monitor();
-            return $msg;
-        case 'relayd':
-            relayd_configure(true);
-            filter_configure();
-            return $msg;
-        default:
-            break;
+    if ($name == 'openvpn') {
+        $filter['vpnid'] = $extras['id'];
     }
 
     $service = find_service_by_name($name);