Signed-off-by: Alexandre Derumier <aderum...@odiso.com>
---
src/PVE/Firewall.pm | 25 ----------------------
src/PVE/Firewall/Helpers.pm | 41 +++++++++++++++++++++++++++++++++++++
src/PVE/Firewall/Makefile | 12 +++++++++++
src/PVE/Makefile | 2 ++
4 files changed, 55 insertions(+), 25 deletions(-)
create mode 100644 src/PVE/Firewall/Helpers.pm
create mode 100644 src/PVE/Firewall/Makefile
diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index 71746d2..e6cf4cd 100644
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -3340,31 +3340,6 @@ sub save_vmfw_conf {
}
}
-sub remove_vmfw_conf {
- my ($vmid) = @_;
-
- my $vmfw_conffile = "$pvefw_conf_dir/$vmid.fw";
-
- unlink $vmfw_conffile;
-}
-
-sub clone_vmfw_conf {
- my ($vmid, $newid) = @_;
-
- my $sourcevm_conffile = "$pvefw_conf_dir/$vmid.fw";
- my $clonevm_conffile = "$pvefw_conf_dir/$newid.fw";
-
- lock_vmfw_conf($newid, 10, sub {
- if (-f $clonevm_conffile) {
- unlink $clonevm_conffile;
- }
- if (-f $sourcevm_conffile) {
- my $data = PVE::Tools::file_get_contents($sourcevm_conffile);
- PVE::Tools::file_set_contents($clonevm_conffile, $data);
- }
- });
-}
-
sub read_vm_firewall_configs {
my ($cluster_conf, $vmdata, $dir) = @_;
diff --git a/src/PVE/Firewall/Helpers.pm b/src/PVE/Firewall/Helpers.pm
new file mode 100644
index 0000000..3112ebc
--- /dev/null
+++ b/src/PVE/Firewall/Helpers.pm
@@ -0,0 +1,41 @@
+package PVE::Firewall::Helpers;
+
+use strict;
+use warnings;
+
+use PVE::Tools qw(file_get_contents file_set_contents);
+
+use base 'Exporter';
+our @EXPORT_OK = qw(
+remove_vmfw_conf
+clone_vmfw_conf
+);
+
+my $pvefw_conf_dir = "/etc/pve/firewall";
+
+sub remove_vmfw_conf {
+ my ($vmid) = @_;
+
+ my $vmfw_conffile = "$pvefw_conf_dir/$vmid.fw";
+
+ unlink $vmfw_conffile;
+}
+
+sub clone_vmfw_conf {
+ my ($vmid, $newid) = @_;
+
+ my $sourcevm_conffile = "$pvefw_conf_dir/$vmid.fw";
+ my $clonevm_conffile = "$pvefw_conf_dir/$newid.fw";
+
+ lock_vmfw_conf($newid, 10, sub {
+ if (-f $clonevm_conffile) {
+ unlink $clonevm_conffile;
+ }
+ if (-f $sourcevm_conffile) {
+ my $data = file_get_contents($sourcevm_conffile);
+ file_set_contents($clonevm_conffile, $data);
+ }
+ });
+}
+
+1;
\ No newline at end of file
diff --git a/src/PVE/Firewall/Makefile b/src/PVE/Firewall/Makefile
new file mode 100644
index 0000000..1707cb5
--- /dev/null
+++ b/src/PVE/Firewall/Makefile
@@ -0,0 +1,12 @@
+DESTDIR=
+PREFIX=/usr
+PERLDIR=${DESTDIR}/${PREFIX}/share/perl5
+
+SOURCES=Helpers.pm
+
+.PHONY: install
+install: ${SOURCES}
+ install -d -m 0755 ${PERLDIR}/PVE/Firewall
+ for i in ${SOURCES}; do install -D -m 0644 $$i
${PERLDIR}/PVE/Firewall/$$i; done
+
+clean:
diff --git a/src/PVE/Makefile b/src/PVE/Makefile
index 9fdfd9b..4edde9e 100644
--- a/src/PVE/Makefile
+++ b/src/PVE/Makefile
@@ -14,9 +14,11 @@ install:
for i in ${LIB_SOURCES}; do install -D -m 0644 $$i ${PERLDIR}/PVE/$$i;
done
make -C API2 install
make -C Service install
+ make -C Firewall install
.PHONY: clean
clean:
rm -rf *~
make -C API2 clean
make -C Service clean
+ make -C Firewall clean
--
2.30.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
