add /etc/pmg/pbs to cluster-sync

[pmg-api.git] / src / PMG / Cluster.pm

diff --git a/src/PMG/Cluster.pm b/src/PMG/Cluster.pm
index 048662148e743ce32bcb89f6a615d35a742e8f9b..ce4f2578c7296968ac0f0a15d39b8d88a861bbfe 100644 (file)
--- a/src/PMG/Cluster.pm
+++ b/src/PMG/Cluster.pm
@@ -11,6 +11,7 @@ use PVE::SafeSyslog;
 use PVE::Tools;
 use PVE::INotify;
 use PVE::APIClient::LWP;
+use PVE::Network;
 
 use PMG::Utils;
 use PMG::Config;
@@ -35,7 +36,7 @@ sub remote_node_ip {
     }
 
     # fallback: try to get IP by other means
-    return PMG::Utils::lookup_node_ip($nodename, $noerr);
+    return PVE::Network::get_ip_from_hostname($nodename, $noerr);
 }
 
 sub get_master_node {
@@ -99,7 +100,7 @@ sub read_local_cluster_info {
 
     $res->{name} = $nodename;
 
-    $res->{ip} = PMG::Utils::lookup_node_ip($nodename);
+    $res->{ip} = PVE::Network::get_ip_from_hostname($nodename);
 
     $res->{hostrsapubkey} = $hostrsapubkey;
 
@@ -408,6 +409,7 @@ sub sync_config_from_master {
     my $dirs = [
        'templates',
        'dkim',
+       'pbs',
     ];
 
     foreach my $dir (@$dirs) {
@@ -762,12 +764,15 @@ sub sync_greylist_db {
            "mtime >= $lastmt AND CID != 0";
     };
 
-    my $merge_sth = $dbh->prepare($PMG::DBTools::cgreylist_merge_sql);
+    # FIXME: drop Host column with PMG 7.0
+    my $merge_sth = $dbh->prepare(PMG::DBTools::cgreylist_merge_sql());
     my $mergefunc = sub {
        my ($ref) = @_;
 
+       my $ipnet = $ref->{ipnet};
+       $ipnet .= '.0/24' if $ipnet !~ /\/\d+$/;
        $merge_sth->execute(
-           $ref->{ipnet}, $ref->{host}, $ref->{sender}, $ref->{receiver},
+           $ipnet, 0, $ref->{sender}, $ref->{receiver},
            $ref->{instance}, $ref->{rctime}, $ref->{extime}, $ref->{delay},
            $ref->{blocked}, $ref->{passed}, 0, $ref->{cid});
     };