From 2d992fb4ac8d6b3688a8e0a31d16d4caad82b599 Mon Sep 17 00:00:00 2001
From: Joe Haig <josephhaig@gmail.com>
Date: Sun, 23 Oct 2016 20:08:17 +0100
Subject: [PATCH] Revert back to using /etc/init.d

Don't change too many things at once.
---
 README.md              |  8 ++++----
 includes/dhcp.php      |  4 ++--
 includes/functions.php |  8 ++++----
 includes/hostapd.php   |  4 ++--
 installers/common.sh   | 10 +++++-----
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index c18f320..d97f606 100644
--- a/README.md
+++ b/README.md
@@ -59,10 +59,10 @@ www-data ALL=(ALL) NOPASSWD:/sbin/wpa_cli scan_results
 www-data ALL=(ALL) NOPASSWD:/sbin/wpa_cli scan
 www-data ALL=(ALL) NOPASSWD:/sbin/wpa_cli reconfigure
 www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/hostapddata /etc/hostapd/hostapd.conf
-www-data ALL=(ALL) NOPASSWD:/usr/sbin/service hostapd start
-www-data ALL=(ALL) NOPASSWD:/usr/sbin/service hostapd stop
-www-data ALL=(ALL) NOPASSWD:/usr/sbin/service dnsmasq start
-www-data ALL=(ALL) NOPASSWD:/usr/sbin/service dnsmasq stop
+www-data ALL=(ALL) NOPASSWD:/etc/init.d/hostapd start
+www-data ALL=(ALL) NOPASSWD:/etc/init.d/hostapd stop
+www-data ALL=(ALL) NOPASSWD:/etc/init.d/dnsmasq start
+www-data ALL=(ALL) NOPASSWD:/etc/init.d/dnsmasq stop
 www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dhcpddata /etc/dnsmasq.conf
 www-data ALL=(ALL) NOPASSWD:/sbin/shutdown -h now
 www-data ALL=(ALL) NOPASSWD:/sbin/reboot
diff --git a/includes/dhcp.php b/includes/dhcp.php
index 2de9ab8..d173547 100755
--- a/includes/dhcp.php
+++ b/includes/dhcp.php
@@ -35,7 +35,7 @@ function DisplayDHCPConfig() {
       if ($dnsmasq_state) {
         $status->addMessage('dnsmasq already running', 'info');
       } else {
-        exec('sudo service dnsmasq start', $dnsmasq, $return);
+        exec('sudo /etc/init.d/dnsmasq start', $dnsmasq, $return);
         if ($return == 0) {
           $status->addMessage('Successfully started dnsmasq', 'success');
           $dnsmasq_state = true;
@@ -49,7 +49,7 @@ function DisplayDHCPConfig() {
   } elseif( isset($_POST['stopdhcpd'] ) ) {
     if (CSRFValidate()) {
       if ($dnsmasq_state) {
-        exec('sudo service dnsmasq stop', $dnsmasq, $return);
+        exec('sudo /etc/init.d/dnsmasq stop', $dnsmasq, $return);
         if ($return == 0) {
           $status->addMessage('Successfully stopped dnsmasq', 'success');
           $dnsmasq_state = false;
diff --git a/includes/functions.php b/includes/functions.php
index d5cb0b3..f391e46 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -412,25 +412,25 @@ function SaveTORAndVPNConfig(){
     // TODO
   } elseif( isset($_POST['StartOpenVPN']) ) {
     echo "Attempting to start openvpn";
-    exec( 'sudo service openvpn start', $return );
+    exec( 'sudo /etc/init.d/openvpn start', $return );
     foreach( $return as $line ) {
       echo $line."<br />";
     }
   } elseif( isset($_POST['StopOpenVPN']) ) {
     echo "Attempting to stop openvpn";
-    exec( 'sudo service openvpn stop', $return );
+    exec( 'sudo /etc/init.d/openvpn stop', $return );
     foreach( $return as $line ) {
       echo $line."<br />";
     }
   } elseif( isset($_POST['StartTOR']) ) {
     echo "Attempting to start TOR";
-    exec( 'sudo service tor start', $return );
+    exec( 'sudo /etc/init.d/tor start', $return );
     foreach( $return as $line ) {
       echo $line."<br />";
     }
   } elseif( isset($_POST['StopTOR']) ) {
     echo "Attempting to stop TOR";
-    exec( 'sudo service tor stop', $return );
+    exec( 'sudo /etc/init.d/tor stop', $return );
     foreach( $return as $line ) {
       echo $line."<br />";
     }
diff --git a/includes/hostapd.php b/includes/hostapd.php
index 0b9c65e..bd9e3c4 100755
--- a/includes/hostapd.php
+++ b/includes/hostapd.php
@@ -26,7 +26,7 @@ function DisplayHostAPDConfig(){
   } elseif( isset($_POST['StartHotspot']) ) {
     if (CSRFValidate()) {
       $status->addMessage('Attempting to start hotspot', 'info');
-      exec( 'sudo service hostapd start', $return );
+      exec( 'sudo /etc/init.d/hostapd start', $return );
       foreach( $return as $line ) {
         $status->addMessage($line, 'info');
       }
@@ -36,7 +36,7 @@ function DisplayHostAPDConfig(){
   } elseif( isset($_POST['StopHotspot']) ) {
     if (CSRFValidate()) {
       $status->addMessage('Attempting to stop hotspot', 'info');
-      exec( 'sudo service hostapd stop', $return );
+      exec( 'sudo /etc/init.d/hostapd stop', $return );
       foreach( $return as $line ) {
         $status->addMessage($line, 'info');
       }
diff --git a/installers/common.sh b/installers/common.sh
index 19bdd51..7080a20 100644
--- a/installers/common.sh
+++ b/installers/common.sh
@@ -58,7 +58,7 @@ function enable_php_lighttpd() {
     install_log "Enabling PHP for lighttpd"
 
     sudo lighty-enable-mod fastcgi-php || install_error "Cannot enable fastcgi-php for lighttpd"
-    sudo service lighttpd restart || install_error "Unable to restart lighttpd"
+    sudo /etc/init.d/lighttpd restart || install_error "Unable to restart lighttpd"
 }
 
 # Verifies existence and permissions of RaspAP directory
@@ -134,10 +134,10 @@ function patch_system_files() {
     sudo_add '/sbin/wpa_cli scan'
     sudo_add '/sbin/wpa_cli reconfigure'
     sudo_add '/bin/cp /tmp/hostapddata /etc/hostapd/hostapd.conf'
-    sudo_add '/usr/sbin/service hostapd start'
-    sudo_add '/usr/sbin/service hostapd stop'
-    sudo_add '/usr/sbin/service dnsmasq start'
-    sudo_add '/usr/sbin/service dnsmasq stop'
+    sudo_add '/etc/init.d/hostapd start'
+    sudo_add '/etc/init.d/hostapd stop'
+    sudo_add '/etc/init.d/dnsmasq start'
+    sudo_add '/etc/init.d/dnsmasq stop'
     sudo_add '/bin/cp /tmp/dhcpddata /etc/dnsmasq.conf'
     sudo_add '/sbin/shutdown -h now'
     sudo_add '/sbin/reboot'