[pve-devel] [PATCH pmg-api] tree-wide: change /var/run to /run and /var/lock to /run/lock

[Jing Luo via pve-devel <pve-devel@lists.proxmox.com>]

[-- Attachment #1: Type: message/rfc822, Size: 15638 bytes --]

From: Jing Luo <jing@jing.rocks>
To: pve-devel@lists.proxmox.com
Cc: Jing Luo <jing@jing.rocks>
Subject: [PATCH pmg-api] tree-wide: change /var/run to /run and /var/lock to /run/lock
Date: Sun, 23 Mar 2025 00:17:11 +0900
Message-ID: <20250322152004.1646886-4-jing@jing.rocks>

"/var/run" and "/var/lock" are deprecated.

This is to comply with Debian Policy 9.1.4 "/run and /run/lock".
(https://www.debian.org/doc/debian-policy/ch-opersys.html#run-and-run-lock)

Signed-off-by: Jing Luo <jing@jing.rocks>
---
 src/PMG/API2/ACMEPlugin.pm       | 2 +-
 src/PMG/API2/SACustom.pm         | 6 +++---
 src/PMG/Auth/Plugin.pm           | 2 +-
 src/PMG/CertHelpers.pm           | 4 ++--
 src/PMG/ClusterConfig.pm         | 2 +-
 src/PMG/Config.pm                | 2 +-
 src/PMG/DBTools.pm               | 2 +-
 src/PMG/LDAPConfig.pm            | 2 +-
 src/PMG/NodeConfig.pm            | 2 +-
 src/PMG/PBSConfig.pm             | 2 +-
 src/PMG/Service/pmgdaemon.pm     | 2 +-
 src/PMG/Service/pmgproxy.pm      | 2 +-
 src/PMG/Service/pmgtunnel.pm     | 2 +-
 src/PMG/UserConfig.pm            | 4 ++--
 src/PMG/Utils.pm                 | 2 +-
 src/templates/clamd.conf.in      | 4 ++--
 src/templates/freshclam.conf.in  | 2 +-
 src/templates/postgresql.conf.in | 4 ++--
 18 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/PMG/API2/ACMEPlugin.pm b/src/PMG/API2/ACMEPlugin.pm
index 25d3a04..056bf88 100644
--- a/src/PMG/API2/ACMEPlugin.pm
+++ b/src/PMG/API2/ACMEPlugin.pm
@@ -16,7 +16,7 @@ use base qw(PVE::RESTHandler);
 
 my $inotify_file_id = 'pmg-acme-plugins-config.conf';
 my $config_filename = '/etc/pmg/acme/plugins.conf';
-my $lockfile = "/var/lock/pmg-acme-plugins-config.lck";
+my $lockfile = "/run/lock/pmg-acme-plugins-config.lck";
 
 PVE::ACME::DNSChallenge->register();
 PVE::ACME::StandAlone->register();
diff --git a/src/PMG/API2/SACustom.pm b/src/PMG/API2/SACustom.pm
index ac75402..813d93d 100644
--- a/src/PMG/API2/SACustom.pm
+++ b/src/PMG/API2/SACustom.pm
@@ -210,7 +210,7 @@ __PACKAGE__->register_method({
 	    PVE::INotify::write_file('pmg-scores.cf', $config);
 	};
 
-	PVE::Tools::lock_file("/var/lock/pmg-scores.cf.lck", 10, $code);
+	PVE::Tools::lock_file("/run/lock/pmg-scores.cf.lck", 10, $code);
 	die $@ if $@;
 
 	return undef;
@@ -286,7 +286,7 @@ __PACKAGE__->register_method({
 	    PVE::INotify::write_file('pmg-scores.cf', $config);
 	};
 
-	PVE::Tools::lock_file("/var/lock/pmg-scores.cf.lck", 10, $code);
+	PVE::Tools::lock_file("/run/lock/pmg-scores.cf.lck", 10, $code);
 	die $@ if $@;
 
 	return undef;
@@ -328,7 +328,7 @@ __PACKAGE__->register_method({
 	    PVE::INotify::write_file('pmg-scores.cf', $config);
 	};
 
-	PVE::Tools::lock_file("/var/lock/pmg-scores.cf.lck", 10, $code);
+	PVE::Tools::lock_file("/run/lock/pmg-scores.cf.lck", 10, $code);
 	die $@ if $@;
 
 	return undef;
diff --git a/src/PMG/Auth/Plugin.pm b/src/PMG/Auth/Plugin.pm
index 9268a49..dcfeb43 100755
--- a/src/PMG/Auth/Plugin.pm
+++ b/src/PMG/Auth/Plugin.pm
@@ -15,7 +15,7 @@ use base qw(PVE::SectionConfig);
 
 my $realm_conf_id = "realms.conf";
 my $realm_conf_filename = "/etc/pmg/$realm_conf_id";
-my $lockfile = "/var/lock/pmg-realms.lck";
+my $lockfile = "/run/lock/pmg-realms.lck";
 
 sub realm_conf_id {
     return $realm_conf_id;
diff --git a/src/PMG/CertHelpers.pm b/src/PMG/CertHelpers.pm
index b7e79b7..b0a97e9 100644
--- a/src/PMG/CertHelpers.pm
+++ b/src/PMG/CertHelpers.pm
@@ -72,8 +72,8 @@ PVE::JSONSchema::register_format('pmg-acme-alias', sub {
     die "value '$alias' does not look like a valid alias name!\n";
 });
 
-my $local_cert_lock = '/var/lock/pmg-certs.lock';
-my $local_acme_lock = '/var/lock/pmg-acme.lock';
+my $local_cert_lock = '/run/lock/pmg-certs.lock';
+my $local_acme_lock = '/run/lock/pmg-acme.lock';
 
 sub cert_path : prototype($) {
     my ($type) = @_;
diff --git a/src/PMG/ClusterConfig.pm b/src/PMG/ClusterConfig.pm
index c52508d..43ad28c 100644
--- a/src/PMG/ClusterConfig.pm
+++ b/src/PMG/ClusterConfig.pm
@@ -155,7 +155,7 @@ sub write {
     PVE::INotify::write_file("cluster.conf", $self);
 }
 
-my $lockfile = "/var/lock/pmgcluster.lck";
+my $lockfile = "/run/lock/pmgcluster.lck";
 
 sub lock_config {
     my ($code, $errmsg) = @_;
diff --git a/src/PMG/Config.pm b/src/PMG/Config.pm
index 82bd42e..541601b 100644
--- a/src/PMG/Config.pm
+++ b/src/PMG/Config.pm
@@ -878,7 +878,7 @@ sub write {
     PVE::INotify::write_file("pmg.conf", $self);
 }
 
-my $lockfile = "/var/lock/pmgconfig.lck";
+my $lockfile = "/run/lock/pmgconfig.lck";
 
 sub lock_config {
     my ($code, $errmsg) = @_;
diff --git a/src/PMG/DBTools.pm b/src/PMG/DBTools.pm
index 1acc0cb..6e1ac1c 100644
--- a/src/PMG/DBTools.pm
+++ b/src/PMG/DBTools.pm
@@ -73,7 +73,7 @@ sub open_ruledb {
 
 	return $rdb;
     } else {
-	my $dsn = "DBI:Pg:dbname=$database;host=/var/run/postgresql;port=$port";
+	my $dsn = "DBI:Pg:dbname=$database;host=/run/postgresql;port=$port";
 	my $user = $> == 0 ? 'root' : 'www-data';
 	my $dbh = DBI->connect($dsn, $user, undef, { PrintError => 0, RaiseError => 1 });
 
diff --git a/src/PMG/LDAPConfig.pm b/src/PMG/LDAPConfig.pm
index e5b3388..77a1dca 100644
--- a/src/PMG/LDAPConfig.pm
+++ b/src/PMG/LDAPConfig.pm
@@ -203,7 +203,7 @@ sub write {
     PVE::INotify::write_file($inotify_file_id, $self);
 }
 
-my $lockfile = "/var/lock/pmgldapconfig.lck";
+my $lockfile = "/run/lock/pmgldapconfig.lck";
 
 sub lock_config {
     my ($code, $errmsg) = @_;
diff --git a/src/PMG/NodeConfig.pm b/src/PMG/NodeConfig.pm
index 6303979..590b499 100644
--- a/src/PMG/NodeConfig.pm
+++ b/src/PMG/NodeConfig.pm
@@ -17,7 +17,7 @@ my $MAXDOMAINS = 5;
 
 my $inotify_file_id = 'pmg-node-config.conf';
 my $config_filename = '/etc/pmg/node.conf';
-my $lockfile = "/var/lock/pmg-node-config.lck";
+my $lockfile = "/run/lock/pmg-node-config.lck";
 
 my $acme_domain_desc = {
     domain => {
diff --git a/src/PMG/PBSConfig.pm b/src/PMG/PBSConfig.pm
index 998e960..293ffdd 100644
--- a/src/PMG/PBSConfig.pm
+++ b/src/PMG/PBSConfig.pm
@@ -189,7 +189,7 @@ sub write {
 sub lock_config {
     my ($code, $errmsg) = @_;
 
-    my $lockfile = "/var/lock/pmgpbsconfig.lck";
+    my $lockfile = "/run/lock/pmgpbsconfig.lck";
 
     my $p = PVE::Tools::lock_file($lockfile, undef, $code);
     if (my $err = $@) {
diff --git a/src/PMG/Service/pmgdaemon.pm b/src/PMG/Service/pmgdaemon.pm
index 8e3d9b6..af66eb1 100644
--- a/src/PMG/Service/pmgdaemon.pm
+++ b/src/PMG/Service/pmgdaemon.pm
@@ -26,7 +26,7 @@ my $daemon = __PACKAGE__->new('pmgdaemon', $cmdline, %daemon_options);
 sub init {
     my ($self) = @_;
 
-    my $accept_lock_fn = "/var/lock/pmgdaemon.lck";
+    my $accept_lock_fn = "/run/lock/pmgdaemon.lck";
 
     my $lockfh = IO::File->new(">>${accept_lock_fn}") ||
 	die "unable to open lock file '${accept_lock_fn}' - $!\n";
diff --git a/src/PMG/Service/pmgproxy.pm b/src/PMG/Service/pmgproxy.pm
index 5bd9de2..ae666fe 100644
--- a/src/PMG/Service/pmgproxy.pm
+++ b/src/PMG/Service/pmgproxy.pm
@@ -59,7 +59,7 @@ sub init {
 
     my $proxyconf = PVE::APIServer::Utils::read_proxy_config($self->{name});
 
-    my $accept_lock_fn = "/var/lock/pmgproxy.lck";
+    my $accept_lock_fn = "/run/lock/pmgproxy.lck";
 
     my $lockfh = IO::File->new(">>${accept_lock_fn}") ||
 	die "unable to open lock file '${accept_lock_fn}' - $!\n";
diff --git a/src/PMG/Service/pmgtunnel.pm b/src/PMG/Service/pmgtunnel.pm
index a556028..3d5531c 100644
--- a/src/PMG/Service/pmgtunnel.pm
+++ b/src/PMG/Service/pmgtunnel.pm
@@ -103,7 +103,7 @@ sub start_tunnels {
 	    unlink $sock;
 	    exec('/usr/bin/ssh', '-N', '-o', 'BatchMode=yes',
 		 '-o', "HostKeyAlias=$ni->{name}",
-		 '-L', "$sock:/var/run/postgresql/.s.PGSQL.5432",
+		 '-L', "$sock:/run/postgresql/.s.PGSQL.5432",
 		 $ni->{ip});
 	    exit (0);
 	}
diff --git a/src/PMG/UserConfig.pm b/src/PMG/UserConfig.pm
index 121733e..ff4c683 100644
--- a/src/PMG/UserConfig.pm
+++ b/src/PMG/UserConfig.pm
@@ -36,8 +36,8 @@ sub write {
     PVE::INotify::write_file($inotify_file_id, $self);
 }
 
-my $lockfile = "/var/lock/pmguser.lck";
-my $tfa_lockfile = "/var/lock/pmgtfa.lck";
+my $lockfile = "/run/lock/pmguser.lck";
+my $tfa_lockfile = "/run/lock/pmgtfa.lck";
 
 # Locking both config files together is only ever allowed in one order:
 #  1) tfa config
diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm
index 3e7adbb..2e623d7 100644
--- a/src/PMG/Utils.pm
+++ b/src/PMG/Utils.pm
@@ -952,7 +952,7 @@ sub clamav_dbstat {
 
 # RRD related code
 my $rrd_dir = "/var/lib/rrdcached/db";
-my $rrdcached_socket = "/var/run/rrdcached.sock";
+my $rrdcached_socket = "/run/rrdcached.sock";
 
 my $rrd_def_node = [
     "DS:loadavg:GAUGE:120:0:U",
diff --git a/src/templates/clamd.conf.in b/src/templates/clamd.conf.in
index e165e4c..f8625ba 100644
--- a/src/templates/clamd.conf.in
+++ b/src/templates/clamd.conf.in
@@ -1,5 +1,5 @@
 #Automatically Generated by proxmox
-LocalSocket /var/run/clamav/clamd.ctl
+LocalSocket /run/clamav/clamd.ctl
 FixStaleSocket true
 User clamav
 ScanMail true
@@ -24,7 +24,7 @@ LogSyslog true
 LogFacility LOG_LOCAL6
 LogClean false
 LogVerbose false
-PidFile /var/run/clamav/clamd.pid
+PidFile /run/clamav/clamd.pid
 DatabaseDirectory /var/lib/clamav/
 TemporaryDirectory /tmp
 SelfCheck 3600
diff --git a/src/templates/freshclam.conf.in b/src/templates/freshclam.conf.in
index 03a19d4..8186992 100644
--- a/src/templates/freshclam.conf.in
+++ b/src/templates/freshclam.conf.in
@@ -8,7 +8,7 @@ Debug false
 MaxAttempts 5
 Checks 24
 DatabaseDirectory /var/lib/clamav/
-PidFile /var/run/clamav/freshclam.pid
+PidFile /run/clamav/freshclam.pid
 DatabaseMirror [% pmg.clamav.dbmirror %]
 ConnectTimeout 30
 ScriptedUpdates [% IF pmg.clamav.scriptedupdates %]true[% ELSE %]false[% END %]
diff --git a/src/templates/postgresql.conf.in b/src/templates/postgresql.conf.in
index 2ffc29f..107455a 100644
--- a/src/templates/postgresql.conf.in
+++ b/src/templates/postgresql.conf.in
@@ -47,7 +47,7 @@ ident_file = '/etc/postgresql/<* postgres.version *>/main/pg_ident.conf'	# ident
 					# (change requires restart)
 
 # If external_pid_file is not explicitly set, no extra PID file is written.
-external_pid_file = '/var/run/postgresql/<* postgres.version *>-main.pid'			# write an extra PID file
+external_pid_file = '/run/postgresql/<* postgres.version *>-main.pid'			# write an extra PID file
 					# (change requires restart)
 
 
@@ -64,7 +64,7 @@ external_pid_file = '/var/run/postgresql/<* postgres.version *>-main.pid'			# wr
 port = 5432				# (change requires restart)
 max_connections = 100			# (change requires restart)
 #superuser_reserved_connections = 3	# (change requires restart)
-unix_socket_directories = '/var/run/postgresql'	# comma-separated list of directories
+unix_socket_directories = '/run/postgresql'	# comma-separated list of directories
 					# (change requires restart)
 #unix_socket_group = ''			# (change requires restart)
 #unix_socket_permissions = 0777		# begin with 0 to use octal notation
-- 
2.49.0




[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel