From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-firewall 1/1] move clone_vmfw_conf && remove_vmfw_conf to a Helpers
Date: Wed, 29 Jun 2022 11:08:29 +0200 [thread overview]
Message-ID: <20220629090833.456340-3-aderumier@odiso.com> (raw)
In-Reply-To: <20220629090833.456340-1-aderumier@odiso.com>
Signed-off-by: Alexandre Derumier <aderumier@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
next prev parent reply other threads:[~2022-06-29 9:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-29 9:08 [pve-devel] [PATCH SERIES common/firewall/qemu-server/container 0/1] Cleanup use of PVE::Firewall Alexandre Derumier
2022-06-29 9:08 ` [pve-devel] [PATCH qemu-server 1/2] api2: use firewall helpers Alexandre Derumier
2022-06-29 9:08 ` Alexandre Derumier [this message]
2022-11-16 17:09 ` [pve-devel] applied: [PATCH pve-firewall 1/1] move clone_vmfw_conf && remove_vmfw_conf to a Helpers Thomas Lamprecht
2022-06-29 9:08 ` [pve-devel] [PATCH pve-container 1/2] remove unused use PVE::Firewall Alexandre Derumier
2022-06-29 9:08 ` [pve-devel] [PATCH pve-common 1/1] schema: add pve-targetstorage (moved from qemu-server) Alexandre Derumier
2022-06-29 9:34 ` Thomas Lamprecht
2022-06-29 9:46 ` Fabian Ebner
2022-06-29 9:48 ` Thomas Lamprecht
2022-06-30 7:30 ` DERUMIER, Alexandre
2022-06-30 7:51 ` Thomas Lamprecht
2022-06-29 9:08 ` [pve-devel] [PATCH pve-container 2/2] api2 : use firewall helpers Alexandre Derumier
2022-06-29 9:08 ` [pve-devel] [PATCH qemu-server 2/2] qemu-server: remove json schema pve-targetstorage (moved to pve-common) Alexandre Derumier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220629090833.456340-3-aderumier@odiso.com \
--to=aderumier@odiso.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox