pveproxy, spiceproxy: new read_proxy_conf location

read_proxy_conf was moved to the new PVE::ApiServer::Utils so that it
can be reused by other apiservers (e.g., PMG one). Use that one, so
that we can remove it here later

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm
index e63c90ea6c9dae815542bed3b8b0bd5fbc039f6d..467748b130e9035b2ac83ad12a4808825db4aa9a 100755 (executable)
--- a/PVE/Service/pveproxy.pm
+++ b/PVE/Service/pveproxy.pm
@@ -11,7 +11,7 @@ use URI;
 use URI::QueryParam;
 use Data::Dumper;
 use PVE::Cluster;
-use PVE::API2Tools;
+use PVE::APIServer::Utils;
 use PVE::API2;
 use PVE::APIServer::Formatter;
 use PVE::APIServer::Formatter::Standard;
@@ -61,7 +61,7 @@ sub init {
     my ($self) = @_;
 
     # we use same ALLOW/DENY/POLICY as pveproxy
-    my $proxyconf = PVE::API2Tools::read_proxy_config();
+    my $proxyconf = PVE::APIServer::Utils::read_proxy_config($self->{name});
 
     my $accept_lock_fn = "/var/lock/pveproxy.lck";
 

diff --git a/PVE/Service/spiceproxy.pm b/PVE/Service/spiceproxy.pm
index 22a501b09682209f48fcd488e541d184e746c0d7..f8e06b600700256c8140b7a0b3814f541d555250 100755 (executable)
--- a/PVE/Service/spiceproxy.pm
+++ b/PVE/Service/spiceproxy.pm
@@ -9,7 +9,7 @@ use warnings;
 
 use PVE::SafeSyslog;
 use PVE::Daemon;
-use PVE::API2Tools;
+use PVE::APIServer::Utils;
 use PVE::HTTPServer;
 
 use base qw(PVE::Daemon);
@@ -32,7 +32,7 @@ sub init {
     my ($self) = @_;
 
     # we use same ALLOW/DENY/POLICY as pveproxy
-    my $proxyconf = PVE::API2Tools::read_proxy_config();
+    my $proxyconf = PVE::APIServer::Utils::read_proxy_config('pveproxy');
 
     my $accept_lock_fn = "/var/lock/spiceproxy.lck";