[Astlinux-commits] SF.net SVN: astlinux:[7854] branches/1.0/package

[<abe...@us...>]

Revision: 7854
          http://sourceforge.net/p/astlinux/code/7854
Author:   abelbeck
Date:     2016-09-21 20:17:34 +0000 (Wed, 21 Sep 2016)
Log Message:
-----------
web interface, Edit tab, add 'Reload Firewall Blocklist' action menu item

Modified Paths:
--------------
    branches/1.0/package/iptables/iptables.init
    branches/1.0/package/webinterface/altweb/admin/edit.php
    branches/1.0/package/webinterface/altweb/common/functions.php

Modified: branches/1.0/package/iptables/iptables.init
===================================================================
--- branches/1.0/package/iptables/iptables.init	2016-09-21 11:50:29 UTC (rev 7853)
+++ branches/1.0/package/iptables/iptables.init	2016-09-21 20:17:34 UTC (rev 7854)
@@ -7,7 +7,6 @@
   if [ ! -e /tmp/etc/arno-iptables-firewall ]; then
     ln -s /mnt/kd/arno-iptables-firewall /tmp/etc/arno-iptables-firewall
   fi
-
 }
 
 start () {
@@ -21,37 +20,34 @@
   files, and create a firewall configuration corresponding to this version of Arno's Firewall.
   NO FIREWALL IS ACTIVE!!!"
     fi
-
   else
-
     echo "Firewall is disabled."
-
   fi
-
 }
 
 stop () {
 
   if [ "$FWVERS" = "arno" ] || [ -z "$FWVERS" ]; then
-
     /usr/sbin/arno-iptables-firewall stop
-
   fi
-
 }
 
 restart () {
 
   if [ "$FWVERS" = "arno" ]; then
-
     /usr/sbin/arno-iptables-firewall restart
-
   else
-
     /usr/sbin/arno-iptables-firewall stop
+  fi
+}
 
+reload () {
+
+  if [ "$FWVERS" = "arno" ]; then
+    /usr/sbin/arno-iptables-firewall force-reload
+  else
+    echo "Firewall is disabled."
   fi
-
 }
 
 case $1 in
@@ -73,8 +69,12 @@
   restart
   ;;
 
+reload)
+  reload
+  ;;
+
 *)
-  echo "Usage: start|stop|restart"
+  echo "Usage: start|stop|restart|reload"
   ;;
 
 esac

Modified: branches/1.0/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/edit.php	2016-09-21 11:50:29 UTC (rev 7853)
+++ branches/1.0/package/webinterface/altweb/admin/edit.php	2016-09-21 20:17:34 UTC (rev 7854)
@@ -12,6 +12,7 @@
 // 02-18-2013, Added OpenVPN Client Config editing
 // 09-06-2013, Added Shortcut support
 // 06-07-2016, Added Avahi mDNS/DNS-SD support
+// 09-21-2016, Added Reload Firewall Blocklist
 //
 
 $myself = $_SERVER['PHP_SELF'];
@@ -50,6 +51,7 @@
 if (is_file('/etc/init.d/kamailio')) {
   $select_reload['kamailio'] = 'Restart Kamailio';
 }
+$select_reload['IPTABLES'] = 'Reload Firewall Blocklist';
 $select_reload['cron'] = 'Reload Cron for root';
 
 $sys_label = array (
@@ -260,6 +262,8 @@
         $result = restartPROCESS($process, 47, $result, 'init');
       } elseif ($process === 'avahi') {
         $result = restartPROCESS($process, 48, $result, 'init');
+      } elseif ($process === 'IPTABLES') {
+        $result = restartPROCESS('iptables', 66, $result, 'reload');
       } elseif ($process === 'cron') {
         $result = updateCRON('root', 30, $result);
       }
@@ -401,6 +405,8 @@
       putHtml('<p style="color: green;">Fossil Server'.statusPROCESS('fossil').'.</p>');
     } elseif ($result == 48) {
       putHtml('<p style="color: green;">mDNS/DNS-SD (Avahi)'.statusPROCESS('avahi').'.</p>');
+    } elseif ($result == 66) {
+      putHtml('<p style="color: green;">Firewall Blocklist has been Reloaded.</p>');
     } elseif ($result == 99) {
       putHtml('<p style="color: red;">Action Failed.</p>');
     } elseif ($result == 999) {

Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php	2016-09-21 11:50:29 UTC (rev 7853)
+++ branches/1.0/package/webinterface/altweb/common/functions.php	2016-09-21 20:17:34 UTC (rev 7854)
@@ -65,11 +65,11 @@
     $cmd .= ';sleep '.$wait;
     $cmd .= ';/usr/sbin/gen-rc-conf';
     $cmd .= ';service '.$process.' '.$start.' >/dev/null 2>/dev/null';
+  } elseif ($start === 'reload') {
+    $cmd .= ';service '.$process.' '.$start.' >/dev/null 2>/dev/null';
   } elseif ($process === 'iptables') {
     $cmd .= ';/usr/sbin/gen-rc-conf';
     $cmd .= ';service iptables restart >/dev/null 2>/dev/null';
-  } elseif ($start === 'reload') {
-    $cmd .= ';service '.$process.' '.$start.' >/dev/null 2>/dev/null';
   } else {
     $cmd .= ';service '.$process.' stop >/dev/null 2>/dev/null';
     $cmd .= ';sleep '.$wait;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.