From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/dist/lib/fedora.lib.php | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index f7e7fa3..4b6dcd3 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -480,7 +480,7 @@
}
public function configure_amavis() {
- global $conf;
+ global $conf, $dist;
// amavisd user config file
$configfile = 'fedora_amavisd_conf';
@@ -497,8 +497,7 @@
chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
// for CentOS 7.2 only
- $distname = get_distname();
- if($distname['confid'] == 'centos72') {
+ if($dist['confid'] == 'centos72') {
chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0750);
chgrp($conf['amavis']['config_dir'].'/amavisd.conf', 'amavis');
}
--
Gitblit v1.9.1