projects
/
pve-firewall.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
921dfb3
)
correctly save aliases
author
Dietmar Maurer
<dietmar@proxmox.com>
Tue, 22 Apr 2014 07:37:53 +0000
(09:37 +0200)
committer
Dietmar Maurer
<dietmar@proxmox.com>
Tue, 22 Apr 2014 07:37:53 +0000
(09:37 +0200)
src/PVE/Firewall.pm
patch
|
blob
|
blame
|
history
diff --git
a/src/PVE/Firewall.pm
b/src/PVE/Firewall.pm
index 0d9dcdebaa9b7a356ad5988a754a9f6d71297370..7ac8a4a92bc1fbdb36585a7ccdf0b9a9b1d58ac5 100644
(file)
--- a/
src/PVE/Firewall.pm
+++ b/
src/PVE/Firewall.pm
@@
-2299,6
+2299,20
@@
my $format_options = sub {
return $raw;
};
return $raw;
};
+my $format_aliases = sub {
+ my ($aliases) = @_;
+
+ my $raw = '';
+
+ $raw .= "[ALIASES]\n\n";
+ foreach my $k (keys %$aliases) {
+ $raw .= "$k $aliases->{$k}\n";
+ }
+ $raw .= "\n";
+
+ return $raw;
+};
+
my $format_ipset = sub {
my ($options) = @_;
my $format_ipset = sub {
my ($options) = @_;
@@
-2531,6
+2545,9
@@
sub save_clusterfw_conf {
my $options = $cluster_conf->{options};
$raw .= &$format_options($options) if scalar(keys %$options);
my $options = $cluster_conf->{options};
$raw .= &$format_options($options) if scalar(keys %$options);
+ my $aliases = $cluster_conf->{aliases};
+ $raw .= &$format_aliases($aliases) if scalar(keys %$aliases);
+
foreach my $ipset (sort keys %{$cluster_conf->{ipset}}) {
if (my $comment = $cluster_conf->{ipset_comments}->{$ipset}) {
my $utf8comment = encode('utf8', $comment);
foreach my $ipset (sort keys %{$cluster_conf->{ipset}}) {
if (my $comment = $cluster_conf->{ipset_comments}->{$ipset}) {
my $utf8comment = encode('utf8', $comment);