rename netgroup to ipset

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

diff --git a/example/cluster.fw b/example/cluster.fw
index 8af85f65d1efc7b12cc98d454ef5798a59017212..30009853468a599590ed1aaf4f8ff77f883eb6c6 100644 (file)
--- 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 751cc9f8082855c9e236e45e7afac6181efbcf84..a72f57a1e8b6550d72b5e6d9f1e1ae43400ca615 100644 (file)
--- 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;