From: Alexandre Derumier <aderumier@odiso.com>
Date: Tue, 1 Apr 2014 14:06:14 +0000 (+0200)
Subject: rename netgroup to ipset
X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=commitdiff_plain;h=936af352661ca37851e1c7e47aa6649bf138b7d3

rename netgroup to ipset

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---

diff --git a/example/cluster.fw b/example/cluster.fw
index 8af85f6..3000985 100644
--- a/example/cluster.fw
+++ b/example/cluster.fw
@@ -20,7 +20,7 @@ IN  ACCEPT 10.0.0.1,10.0.0.2,10.0.0.3
 IN  ACCEPT +mynetgroup 
 
 
-[netgroup mynetgroup]
+[ipset myipset]
 
 192.168.0.1 #mycomment
 172.16.0.10
diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index 751cc9f..a72f57a 100644
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -935,7 +935,7 @@ sub ruleset_generate_cmdstr {
 
     if ($source){
         if($source =~ m/^(\+)(\S+)$/){
-	    die "no such netgroup $2" if !$cluster_conf->{ipset}->{$2};
+	    die "no such ipset $2" if !$cluster_conf->{ipset}->{$2};
 	    push @cmd, "-m set --match-set PVEFW-$2 src";
 
         }elsif ($source =~ m/^(\d+)\.(\d+).(\d+).(\d+)\-(\d+)\.(\d+).(\d+).(\d+)$/){
@@ -948,7 +948,7 @@ sub ruleset_generate_cmdstr {
 
     if ($dest){
         if($dest =~ m/^(\+)(\S+)$/){
-	    die "no such netgroup $2" if !$cluster_conf->{ipset}->{$2};
+	    die "no such ipset $2" if !$cluster_conf->{ipset}->{$2};
 	    push @cmd, "-m set --match-set PVEFW-$2 dst";
 
         }elsif ($dest =~ m/^(\d+)\.(\d+).(\d+).(\d+)\-(\d+)\.(\d+).(\d+).(\d+)$/){
@@ -1812,7 +1812,7 @@ sub parse_cluster_fw_rules {
 	    next;
 	}
     
-	if ($line =~ m/^\[netgroup\s+(\S+)\]\s*$/i) {
+	if ($line =~ m/^\[ipset\s+(\S+)\]\s*$/i) {
 	    $section = 'ipset';
 	    $group = lc($1);
 	    next;