adapt to new pmgcfg version/release semantic

similar like we've done in PVE[0]

[0]: https://git.proxmox.com/?p=pve-manager.git;a=commitdiff;h=b597d23d354665ddea247c3ad54ece1b84921768

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/src/PMG/API2.pm b/src/PMG/API2.pm
index 68c9ff9a73954df294387294408a83619cbed346..9274269965dccd05f8c82bd0d2379a475e15f637 100644 (file)
--- a/src/PMG/API2.pm
+++ b/src/PMG/API2.pm
@@ -89,9 +89,18 @@ __PACKAGE__->register_method ({
     returns => {
        type => "object",
        properties => {
-           version => { type => 'string' },
-           release => { type => 'string' },
-           repoid => { type => 'string' },
+           version => {
+               type => 'string',
+               description => 'The current installed pmg-api package version',
+           },
+           release => {
+               type => 'string',
+               description => 'The current installed Proxmox Mailgateway Release',
+           },
+           repoid => {
+               type => 'string',
+               description => 'The short git commit hash ID from which this version was build',
+           },
        },
     },
     code => sub {

diff --git a/src/PMG/Backup.pm b/src/PMG/Backup.pm
index a451c6c9082b16eea4d377ce8ef96c25583cf1eb..9114d2bcacce07ccf574c8f8511af9f098f04362 100644 (file)
--- a/src/PMG/Backup.pm
+++ b/src/PMG/Backup.pm
@@ -171,14 +171,14 @@ sub pmg_backup {
        }
 
        my $pkg = PMG::pmgcfg::package();
-       my $ver = PMG::pmgcfg::version();
+       my $release = PMG::pmgcfg::release();
 
        my $vfh = PMG::AtomicFile->open ("$dirname/$verfn", "w") ||
            die "cant open '$dirname/$verfn' - $! :ERROR";
 
        $time = time;
        my $now = localtime;
-       print $vfh "product: $pkg\nversion: $ver\nbackuptime:$time:$now\n";
+       print $vfh "product: $pkg\nversion: $release\nbackuptime:$time:$now\n";
        $vfh->close(1);
 
        my $extra_cfgs =  [];

diff --git a/src/bin/pmg-smtp-filter b/src/bin/pmg-smtp-filter
index a5bf246595d876a9825051067757a59d4949fc43..59d6ecb383b9f85a6fa348862a591de20d66d7e8 100755 (executable)
--- a/src/bin/pmg-smtp-filter
+++ b/src/bin/pmg-smtp-filter
@@ -166,7 +166,7 @@ sub get_prox_vars {
        'DOMAIN' =>  $msginfo->{domain},
        'FQDN' => $msginfo->{fqdn},
        'MSGID' => $queue->{msgid},
-       'VERSION' => PMG::pmgcfg::package() . "/" . PMG::pmgcfg::version() . "/" . PMG::pmgcfg::repoid(),
+       'VERSION' => PMG::pmgcfg::package() . "/" . PMG::pmgcfg::release() . "/" . PMG::pmgcfg::repoid(),
     };
 
     $vars->{__spaminfo} = $spaminfo;