[pve-devel] [PATCH manager 3/4] pveproxy, spiceproxy: new read_proxy_conf location

Stoiko Ivanov s.ivanov at proxmox.com
Fri Feb 22 19:52:04 CET 2019


Signed-off-by: Stoiko Ivanov <s.ivanov at proxmox.com>
---
 PVE/Service/pveproxy.pm   | 4 ++--
 PVE/Service/spiceproxy.pm | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm
index e63c90ea..467748b1 100755
--- 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 22a501b0..f8e06b60 100755
--- 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";
 
-- 
2.11.0




More information about the pve-devel mailing list