From 77696bd81e4f13e4a154ca7369b5cb1e2ce5a950 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 20 Feb 2016 12:38:49 +0100
Subject: [PATCH] services: tracer code for start logic into service array

---
 src/etc/inc/services.inc    |  2 ++
 src/www/status_services.php | 17 +++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index 515210fce..1bb0319b9 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -2606,6 +2606,7 @@ function services_get()
         $pconfig = array();
         $pconfig['name'] = "apinger";
         $pconfig['description'] = gettext("Gateway Monitoring Daemon");
+        $pconfig['php']['start'] = 'setup_gateways_monitor';
         $services[] = $pconfig;
     }
 
@@ -2642,6 +2643,7 @@ function services_get()
         $pconfig = array();
         $pconfig['name'] = 'sshd';
         $pconfig['description'] = gettext('Secure Shell Daemon');
+        $pconfig['configd']['start'] = 'sshd restart';
         $services[] = $pconfig;
     }
 
diff --git a/src/www/status_services.php b/src/www/status_services.php
index 8576b570b..fae412abb 100644
--- a/src/www/status_services.php
+++ b/src/www/status_services.php
@@ -90,6 +90,17 @@ function service_control_start($name, $extras)
         return sprintf(gettext("Could not start unknown service `%s'"), htmlspecialchars($name));
     }
 
+    if (isset($service['configd']['start'])) {
+        configd_run($service['configd']['start']);
+        /* XXX fall through later */
+        return sprintf(gettext('%s has been started via configd.'), htmlspecialchars($name));
+    } elseif (isset($service['php']['start'])) {
+        $service['php']['start']();
+        /* XXX fall through later */
+        return sprintf(gettext('%s has been started via php.'), htmlspecialchars($name));
+    }
+
+   /* XXX migrate all of those */
     switch ($service['name']) {
         case 'radvd':
             services_radvd_configure();
@@ -97,9 +108,6 @@ function service_control_start($name, $extras)
         case 'ntpd':
             system_ntp_configure();
             break;
-        case 'apinger':
-            setup_gateways_monitor();
-            break;
         case 'bsnmpd':
             services_snmpd_configure();
             break;
@@ -127,9 +135,6 @@ function service_control_start($name, $extras)
         case 'ipsec':
             vpn_ipsec_force_reload();
             break;
-        case 'sshd':
-            configd_run("sshd restart");
-            break;
         case 'relayd':
             relayd_configure();
             filter_configure();