frodovdr
/
raspap-webgui
mirror of https://github.com/billz/raspap-webgui.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Replace /etc.init.d with service

This commit is contained in:
Joe Haig 2016-10-22 22:02:39 +01:00
parent 5f748c4b84
commit 58bd439b4d
5 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -40,11 +40,12 @@ The installer will complete the steps in the manual installation (below) for you
Start off by installing lighttpd, php5 and hostapd.
```sh
$ sudo apt-get install lighttpd php5-cgi hostapd
$ sudo apt-get install rfkill zd1211-firmware hostap-utils iw dnsmasq
```
After that, enable PHP for lighttpd and restart it for the settings to take effect.
```sh
sudo lighty-enable-mod fastcgi-php
sudo /etc/init.d/lighttpd restart
sudo service lighttpd restart
```
Now comes the fun part. For security reasons, the `www-data` user which lighttpd runs under is not allowed to start or stop daemons, or run commands like ifdown and ifup, all of which we want our page to do.
So what I have done is added the `www-data` user to the sudoers file, but with restrictions on what commands the user can run.
@ -59,10 +60,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:/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:service hostapd start
www-data ALL=(ALL) NOPASSWD:service hostapd stop
www-data ALL=(ALL) NOPASSWD:service dnsmasq start
www-data ALL=(ALL) NOPASSWD:service 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

4
includes/dhcp.php
View File

@ -35,7 +35,7 @@ function DisplayDHCPConfig() {
if ($dnsmasq_state) {
$status->addMessage('dnsmasq already running', 'info');
} else {
exec('sudo /etc/init.d/dnsmasq start', $dnsmasq, $return);
exec('sudo service 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 /etc/init.d/dnsmasq stop', $dnsmasq, $return);
exec('sudo service dnsmasq stop', $dnsmasq, $return);
if ($return == 0) {
$status->addMessage('Successfully stopped dnsmasq', 'success');
$dnsmasq_state = false;

8
includes/functions.php
View File

@ -412,25 +412,25 @@ function SaveTORAndVPNConfig(){
// TODO
} elseif( isset($_POST['StartOpenVPN']) ) {
echo "Attempting to start openvpn";
exec( 'sudo /etc/init.d/openvpn start', $return );
exec( 'sudo service openvpn start', $return );
foreach( $return as $line ) {
echo $line."<br />";
}
} elseif( isset($_POST['StopOpenVPN']) ) {
echo "Attempting to stop openvpn";
exec( 'sudo /etc/init.d/openvpn stop', $return );
exec( 'sudo service openvpn stop', $return );
foreach( $return as $line ) {
echo $line."<br />";
}
} elseif( isset($_POST['StartTOR']) ) {
echo "Attempting to start TOR";
exec( 'sudo /etc/init.d/tor start', $return );
exec( 'sudo service tor start', $return );
foreach( $return as $line ) {
echo $line."<br />";
}
} elseif( isset($_POST['StopTOR']) ) {
echo "Attempting to stop TOR";
exec( 'sudo /etc/init.d/tor stop', $return );
exec( 'sudo service tor stop', $return );
foreach( $return as $line ) {
echo $line."<br />";
}

4
includes/hostapd.php
View File

@ -26,7 +26,7 @@ function DisplayHostAPDConfig(){
} elseif( isset($_POST['StartHotspot']) ) {
if (CSRFValidate()) {
$status->addMessage('Attempting to start hotspot', 'info');
exec( 'sudo /etc/init.d/hostapd start', $return );
exec( 'sudo service 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 /etc/init.d/hostapd stop', $return );
exec( 'sudo service hostapd stop', $return );
foreach( $return as $line ) {
$status->addMessage($line, 'info');
}

10
installers/common.sh
View File

@ -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 /etc/init.d/lighttpd restart || install_error "Unable to restart lighttpd"
sudo service lighttpd restart || install_error "Unable to restart lighttpd"
}
# Verifies existence and permissions of RaspAP directory
@ -121,10 +121,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 '/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 'service hostapd start'
sudo_add 'service hostapd stop'
sudo_add 'service dnsmasq start'
sudo_add 'service dnsmasq stop'
sudo_add '/bin/cp /tmp/dhcpddata /etc/dnsmasq.conf'
sudo_add '/sbin/shutdown -h now'
sudo_add '/sbin/reboot'