minor tweaks

install-comitup.sh

@@ -24,6 +24,8 @@ if [[ ! "${INSTALLER_DIR}" =~ "little-backup-box" ]]; then
     INSTALLER_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/little-backup-box"
 fi
 
+const_WEB_ROOT_LBB="/var/www/little-backup-box"
+
 echo "Installing comitup..."
 
 # Installing comitup*: install comitup sources
@@ -62,7 +64,7 @@ sudo systemctl mask dhcpcd.service
 sudo systemctl mask wpa-supplicant.service
 
 # create config
-sudo python3 "${INSTALLER_DIR}/scripts/lib_comitup.py"
+sudo python3 "${const_WEB_ROOT_LBB}/lib_comitup.py"
 
 echo "All done. Connect to the little-backup-box-<nn> network and open http://10.41.0.1/"
 echo "comitup will be available after reboot."

scripts/apache_ports.py

@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+
+# Author: Stefan Saam, [email protected]
+
+#######################################################################
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#######################################################################
+
+import subprocess
+import sys
+
+ApachePortsConf	= '/etc/apache2/ports.conf'
+
+BasicPorts	= [
+	8000,
+	443,
+	81,
+	8443
+]
+
+with open(ApachePortsConf,'w') as f:
+	for Port in BasicPorts:
+		f.write(f'Listen {Port}\n')
+
+	if len(sys.argv) > 1:
+		if sys.argv[1] == 'CONNECTED':
+			f.write(f'Listen 80\n')
+
+subprocess.run('service apache2 restart || service apache2 start', shell=True)
+
+

scripts/apache_ports.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Author: Stefan Saam, [email protected]
+
+#######################################################################
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#######################################################################
+
+# catches the command from comitup and executes apache_ports.py
+
+sudo python3 /var/www/little-backup-box/apache_ports.py "${1}"

scripts/cmd-runner.php

@@ -273,9 +273,9 @@
 						break;
 
 					case 'comitup_reset':
-						$MAIN_COMMAND	= "comitup-cli d";
+						$MAIN_COMMAND	= "$WORKING_DIR/comitup-reset.sh";
 
-						$COMMAND_LINE	= "echo 'sudo $MAIN_COMMAND'";
+						$COMMAND_LINE	= "cat $MAIN_COMMAND | grep '^[^# ]'";
 						$COMMAND_LINE	.= ";echo ''";
 						$COMMAND_LINE	.= ";sudo $MAIN_COMMAND";
 						$COMMAND_LINE	.= ";echo ''";

scripts/comitup-reset.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+# Author: Stefan Saam, [email protected]
+
+#######################################################################
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#######################################################################
+
+# resets the comitup wifi settings and reconfigures apache
+
+comitup-cli d
+sudo python3 /var/www/little-backup-box/apache_ports.py ${1}

scripts/displaymenu.py

@@ -174,7 +174,7 @@ def __init__(self,DISPLAY_LINES,setup):
 			{
 				'type':		'item',
 				'title':	self.__lan.l('box_menu_comitup_reset'),
-				'action':	self.create_confirmed_shell_action(self.__lan.l('box_menu_comitup_reset'),[['sudo','comitup-cli','d']]),
+				'action':	self.create_confirmed_shell_action(self.__lan.l('box_menu_comitup_reset'),[['sudo',f'{self.WORKING_DIR}/comitup-reset.sh']]),
 			},
 
 			{

scripts/lib_comitup.py

@@ -36,7 +36,7 @@ def run(self):
 			with open(self.configfile,'w') as f:
 				f.write('ap_name: little-backup-box-<nnnn>\n')
 				f.write('web_service: apache2.service\n')
-				f.write('external_callback: /var/www/little-backup-box/handle_port_80.sh\n')
+				f.write('external_callback: /var/www/little-backup-box/apache_ports.sh\n')
 				if self.Password:
 					if (
 						(len(self.Password) >= 8) and