[git.ipfire.org] IPFire 2.x development tree branch, master, updated. b3f401fba4b69ea06a1987a971f8f7ff59b3ee33

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. b3f401fba4b69ea06a1987a971f8f7ff59b3ee33

[git]

[-- Attachment #1: Type: text/plain, Size: 2786 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  b3f401fba4b69ea06a1987a971f8f7ff59b3ee33 (commit)
      from  cea4fc3aaf3fb9b776a2209ccdaff6452e099f8e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b3f401fba4b69ea06a1987a971f8f7ff59b3ee33
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date:   Tue Jul 29 22:29:28 2014 +0200

    ids.cgi fix snort rules download url.
    
    fixes: 10579

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/80/filelists/files | 1 +
 html/cgi-bin/ids.cgi                     | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/80/filelists/files b/config/rootfiles/core/80/filelists/files
index a12048d..cdddaac 100644
--- a/config/rootfiles/core/80/filelists/files
+++ b/config/rootfiles/core/80/filelists/files
@@ -8,6 +8,7 @@ etc/rc.d/init.d/firewall
 etc/rc.d/init.d/networking/red.up/30-ddns
 etc/rc.d/init.d/rngd
 srv/web/ipfire/cgi-bin/ddns.cgi
+srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
 srv/web/ipfire/cgi-bin/logs.cgi/log.dat
 srv/web/ipfire/cgi-bin/netexternal.cgi
diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 5a28daa..ff72b78 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -263,11 +263,11 @@ if (-e "/etc/snort/snort.conf") {
 #######################  End added for snort rules control  #################################
 
 if ($snortsettings{'RULES'} eq 'subscripted') {
-	$url=" http://www.snort.org/sub-rules/snortrules-snapshot-2961.tar.gz/$snortsettings{'OINKCODE'}";
+	$url=" https://www.snort.org/rules/snortrules-snapshot-2961.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
 } elsif ($snortsettings{'RULES'} eq 'registered') {
-	$url=" http://www.snort.org/reg-rules/snortrules-snapshot-2960.tar.gz/$snortsettings{'OINKCODE'}";
+	$url=" https://www.snort.org/rules/snortrules-snapshot-2961.tar.gz?oinkcode=$snortsettings{'OINKCODE'}";
 } elsif ($snortsettings{'RULES'} eq 'community') {
-	$url=" http://s3.amazonaws.com/snort-org/www/rules/community/community-rules.tar.gz";
+	$url=" https://www.snort.org/rules/community";
 } else {
 	$url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz";
 }


hooks/post-receive
--
IPFire 2.x development tree