From 7e3324500a8938f9a6b9c9e8db4bc46fc05f4bf2 Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Fri, 25 May 2012 13:40:56 -0700 Subject: [PATCH] Fix up shorewall module to local standards --- makedist.pl | 1 + shorewall6/CHANGELOG | 45 ++------------------------------------ shorewall6/check.cgi | 2 +- shorewall6/clear.cgi | 2 +- shorewall6/delete.cgi | 2 +- shorewall6/down.cgi | 2 +- shorewall6/dump.cgi | 2 +- shorewall6/edit.cgi | 2 +- shorewall6/editcmt.cgi | 2 +- shorewall6/index.cgi | 2 +- shorewall6/list.cgi | 2 +- shorewall6/manual_form.cgi | 2 +- shorewall6/manual_save.cgi | 2 +- shorewall6/refresh.cgi | 2 +- shorewall6/restart.cgi | 2 +- shorewall6/save.cgi | 2 +- shorewall6/savecmt.cgi | 2 +- shorewall6/start.cgi | 2 +- shorewall6/status.cgi | 2 +- shorewall6/stop.cgi | 2 +- shorewall6/up.cgi | 2 +- 21 files changed, 22 insertions(+), 62 deletions(-) diff --git a/makedist.pl b/makedist.pl index 57e763f8e..c61d109f4 100755 --- a/makedist.pl +++ b/makedist.pl @@ -72,6 +72,7 @@ else { "mailcap", "blue-theme", "ldap-client", "phpini", "filter", "bacula-backup", "ldap-server", "exim", "tcpwrappers", "package-updates", "system-status", "webmincron", "ajaxterm", + "shorewall6", ); } @dirlist = ( "Webmin" ); diff --git a/shorewall6/CHANGELOG b/shorewall6/CHANGELOG index 879361776..780027ab3 100644 --- a/shorewall6/CHANGELOG +++ b/shorewall6/CHANGELOG @@ -1,43 +1,2 @@ ----- Changes since 1.360 ---- -(Updates by Paul Gear .) -BUG: Corrected mis-handling of nested zones introduced in 1.350. -Removed debugging cruft added in 1.350. -Added support for end-of-line comments in zones, params, and shorewall6.conf. -Added support for display of long zone names under the new zones format. -Added module option to disable display of long zone names in the rules file. ----- Changes since 1.350 ---- -(Updates by Paul Gear .) -Corrected name to "Shoreline Firewall". -Correctly determine Shorewall version for beta releases. -Corrected zones file support on version 3 or greater when IPSECFILE=ipsec. -Added bug compatibility with IPSECFILE on Shorewall 3.4.0-3.4.4. -Added support for renaming firewall zone. -Added support for editing of params & shorewall6.conf. ----- Changes since 1.140 ---- -Added buttons for adding rules or other table entries above or below an existing entry. -Added support for OpenVPN and generic tunnels. ----- Changes since 1.150 ---- -Added the ability to edit the blacklist table. ----- Changes since 1.160 ---- -Added a button for manually editing a table file. -Added simple access control, written by Stephen Carville. ----- Changes since 1.170 ---- -Improved access control, to limit which Shorewall tables a user can edit. ----- Changes since 1.180 ---- -Added Module Config page options for commands to run before and after starting, applying and refreshing Shorewall. ----- Changes since 1.200 ---- -Added support for standard Shorewall actions on the rules page. ----- Changes since 1.240 ---- -Added support for the providers Shorewall table. ----- Changes since 1.250 ---- -Updated the module to support new options and columns in Shorewall version 3, such as macros, the new zones table and so on. -Several records can be deleted at once from any table using checkboxes next to them. ----- Changes since 1.320 ---- -Comments can now be created and edited in the rules table (and a few others), when running Shorewall 3.3.3 or higher. -Added logging so that changes made using the module show up in the Webmin Actions Log module. ----- Changes since 1.390 ---- -Blacklist rules can now match any host. ----- Changes since 1.480 ---- -Added a button to create a shorewall6 dump, thanks to a patch by Paul Gear. ----- Changes since 1.500 ---- -New rules are added after the SECTION NEW line, if there is one. +---- Changes since 1.580 ---- +First version of this module, a fork of the existing Shorewall module but for IPv6. Contributed by Wouter van Bommel. diff --git a/shorewall6/check.cgi b/shorewall6/check.cgi index 32d1d97ab..f4a635534 100755 --- a/shorewall6/check.cgi +++ b/shorewall6/check.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl # check.cgi # Check if the firewall is valid diff --git a/shorewall6/clear.cgi b/shorewall6/clear.cgi index 409e5fca7..1845d2b06 100755 --- a/shorewall6/clear.cgi +++ b/shorewall6/clear.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl # clear.cgi # Clear out all rules diff --git a/shorewall6/delete.cgi b/shorewall6/delete.cgi index 45d8a66ad..0f28dbf78 100755 --- a/shorewall6/delete.cgi +++ b/shorewall6/delete.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl # Delete a bunch of table rows require './shorewall6-lib.pl'; diff --git a/shorewall6/down.cgi b/shorewall6/down.cgi index 1b8049b31..673416a43 100755 --- a/shorewall6/down.cgi +++ b/shorewall6/down.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl # down.cgi # Move a row in a table down diff --git a/shorewall6/dump.cgi b/shorewall6/dump.cgi index 2b22d0d67..7d276ebc0 100755 --- a/shorewall6/dump.cgi +++ b/shorewall6/dump.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl # dump.cgi # Show a shorewall6 dump diff --git a/shorewall6/edit.cgi b/shorewall6/edit.cgi index 9a6de5992..3a21bd30b 100755 --- a/shorewall6/edit.cgi +++ b/shorewall6/edit.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl # edit.cgi # Display a form for editing or creating a table entry diff --git a/shorewall6/editcmt.cgi b/shorewall6/editcmt.cgi index 12510331d..79733b59d 100755 --- a/shorewall6/editcmt.cgi +++ b/shorewall6/editcmt.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl # Display a form for editing or creating a comment require './shorewall6-lib.pl'; diff --git a/shorewall6/index.cgi b/shorewall6/index.cgi index 85eb65337..c50329f56 100755 --- a/shorewall6/index.cgi +++ b/shorewall6/index.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl # index.cgi # Display icons for the various shorewall6 configuration files diff --git a/shorewall6/list.cgi b/shorewall6/list.cgi index 9a4200f68..c39cffeb2 100755 --- a/shorewall6/list.cgi +++ b/shorewall6/list.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl # list.cgi # Display the contents of some table diff --git a/shorewall6/manual_form.cgi b/shorewall6/manual_form.cgi index 2e5f4b7e5..07b527e30 100755 --- a/shorewall6/manual_form.cgi +++ b/shorewall6/manual_form.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl # Display the contents of a table file require './shorewall6-lib.pl'; diff --git a/shorewall6/manual_save.cgi b/shorewall6/manual_save.cgi index 616a45a60..53666a85e 100755 --- a/shorewall6/manual_save.cgi +++ b/shorewall6/manual_save.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl # Save the contents of a table file require './shorewall6-lib.pl'; diff --git a/shorewall6/refresh.cgi b/shorewall6/refresh.cgi index 9a8fc282d..60eb82bee 100755 --- a/shorewall6/refresh.cgi +++ b/shorewall6/refresh.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl # refresh.cgi # Activate the current config diff --git a/shorewall6/restart.cgi b/shorewall6/restart.cgi index d136a4ae9..2a09cbd56 100755 --- a/shorewall6/restart.cgi +++ b/shorewall6/restart.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl # restart.cgi # Activate the current config diff --git a/shorewall6/save.cgi b/shorewall6/save.cgi index 28c1b299e..bee3a33db 100755 --- a/shorewall6/save.cgi +++ b/shorewall6/save.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl # save.cgi # Updated, modify or delete a table entry diff --git a/shorewall6/savecmt.cgi b/shorewall6/savecmt.cgi index b2134cfa7..4cc7d9214 100755 --- a/shorewall6/savecmt.cgi +++ b/shorewall6/savecmt.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl # Updated, modify or delete a comment require './shorewall6-lib.pl'; diff --git a/shorewall6/start.cgi b/shorewall6/start.cgi index 653f6a64f..e15b773ad 100755 --- a/shorewall6/start.cgi +++ b/shorewall6/start.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl # start.cgi # Make the firewall active diff --git a/shorewall6/status.cgi b/shorewall6/status.cgi index c3c028bd1..064514d29 100755 --- a/shorewall6/status.cgi +++ b/shorewall6/status.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl # status.cgi # Show the status diff --git a/shorewall6/stop.cgi b/shorewall6/stop.cgi index 1b1a8083c..0b2af90ed 100755 --- a/shorewall6/stop.cgi +++ b/shorewall6/stop.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl # stop.cgi # Shut down the firewall diff --git a/shorewall6/up.cgi b/shorewall6/up.cgi index cae569a82..fd9609edd 100755 --- a/shorewall6/up.cgi +++ b/shorewall6/up.cgi @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl # up.cgi # Move a row in a table up