From 00d8b7f79d9e2f016555a6299bb2129d3dcabd1f Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Thu, 9 Nov 2017 10:34:14 +0100
Subject: [PATCH] PMG/API2/Cluster.pm - fix rewrite config, move
 db_service_list to PMG::Utils

---
 PMG/API2/Cluster.pm | 13 +++++--------
 PMG/Utils.pm        |  3 +++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/PMG/API2/Cluster.pm b/PMG/API2/Cluster.pm
index a5bf691..0504799 100644
--- a/PMG/API2/Cluster.pm
+++ b/PMG/API2/Cluster.pm
@@ -22,9 +22,6 @@ use PMG::API2::Nodes;
 
 use base qw(PVE::RESTHandler);
 
-my $db_service_list = [
-    'pmgpolicy', 'pmgmirror', 'pmgtunnel', 'pmg-smtp-filter' ];
-
 sub cluster_join {
     my ($cinfo, $conn_setup) = @_;
 
@@ -41,7 +38,7 @@ sub cluster_join {
     eval {
 	print STDERR "stop all services accessing the database\n";
 	# stop all services accessing the database
-	PMG::Utils::service_wait_stopped(40, $db_service_list);
+	PMG::Utils::service_wait_stopped(40, $PMG::Utils::db_service_list);
 
 	print STDERR "save new cluster configuration\n";
 	$cinfo->write();
@@ -67,7 +64,7 @@ sub cluster_join {
 
 	PMG::DBTools::init_nodedb($cinfo);
 
-	my $cfg = PMG::ClusterConfig->new();
+	my $cfg = PMG::Config->new();
 	my $ruledb = PMG::RuleDB->new();
 	my $rulecache = PMG::RuleCache->new($ruledb);
 
@@ -79,7 +76,7 @@ sub cluster_join {
     };
     my $err = $@;
 
-    foreach my $service (reverse @$db_service_list) {
+    foreach my $service (reverse @$PMG::Utils::db_service_list) {
 	eval { PVE::Tools::run_command(['systemctl', 'start', $service]); };
 	warn $@ if $@;
     }
@@ -346,7 +343,7 @@ __PACKAGE__->register_method({
 	    eval {
 		print STDERR "stop all services accessing the database\n";
 		# stop all services accessing the database
-		PMG::Utils::service_wait_stopped(40, $db_service_list);
+		PMG::Utils::service_wait_stopped(40, $PMG::Utils::db_service_list);
 
 		print STDERR "save new cluster configuration\n";
 		$cinfo->write();
@@ -359,7 +356,7 @@ __PACKAGE__->register_method({
 	    };
 	    my $err = $@;
 
-	    foreach my $service (reverse @$db_service_list) {
+	    foreach my $service (reverse @$PMG::Utils::db_service_list) {
 		eval { PVE::Tools::run_command(['systemctl', 'start', $service]); };
 		warn $@ if $@;
 	    }
diff --git a/PMG/Utils.pm b/PMG/Utils.pm
index 4bbe46a..b13bbeb 100644
--- a/PMG/Utils.pm
+++ b/PMG/Utils.pm
@@ -531,6 +531,9 @@ sub get_full_service_state {
     return $res;
 }
 
+our $db_service_list = [
+    'pmgpolicy', 'pmgmirror', 'pmgtunnel', 'pmg-smtp-filter' ];
+
 sub service_wait_stopped {
     my ($timeout, $service_list) = @_;
 
-- 
2.39.2