From: Dietmar Maurer <dietmar@proxmox.com>
Date: Mon, 3 Sep 2018 10:40:14 +0000 (+0200)
Subject: fix bux #1776: set http_proxy for sa-update
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=85d295d646407e3f5624c526eddbf0f49d3c3128;p=pmg-api.git

fix bux #1776: set http_proxy for sa-update
---

diff --git a/PMG/API2/SpamAssassin.pm b/PMG/API2/SpamAssassin.pm
index 4704077..eab02d9 100644
--- a/PMG/API2/SpamAssassin.pm
+++ b/PMG/API2/SpamAssassin.pm
@@ -12,6 +12,7 @@ use PMG::RESTEnvironment;
 use PVE::JSONSchema qw(get_standard_option);
 
 use PMG::Utils;
+use PMG::Config;
 
 use Mail::SpamAssassin;
 
@@ -149,6 +150,12 @@ __PACKAGE__->register_method({
 	my $realcmd = sub {
 	    my $upid = shift;
 
+	    # setup proxy env (assume sa-update use http)
+	    my $pmg_cfg = PMG::Config->new();
+	    if (my $http_proxy = $pmg_cfg->get('admin', 'http_proxy')) {
+		$ENV{http_proxy} = $http_proxy;
+	    }
+
 	    my $cmd = "$SAUPDATE -v";
 
 	    PVE::Tools::run_command($cmd, noerr => 1);
diff --git a/bin/pmg-daily b/bin/pmg-daily
index 7834373..32ccb95 100755
--- a/bin/pmg-daily
+++ b/bin/pmg-daily
@@ -67,6 +67,11 @@ if (my $err = $@) {
 # rotate razor log file
 rename('/root/.razor/razor-agent.log', '/root/.razor/razor-agent.log.0');
 
+# setup proxy env (assume sa-update use http)
+if (my $http_proxy = $cfg->get('admin', 'http_proxy')) {
+    $ENV{http_proxy} = $http_proxy;
+}
+
 # update spamassassin rules
 if (system('sa-update') == 0) {
     # if the exit code is 0, new updates were downloaded