From 49441bdd0f3ff75d5092d5b832b97ea722a66363 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Fri, 01 Jul 2016 03:53:30 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/dist/lib/centos_base.lib.php | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/install/dist/lib/centos_base.lib.php b/install/dist/lib/centos_base.lib.php
index 74ff8be..d6deb7e 100644
--- a/install/dist/lib/centos_base.lib.php
+++ b/install/dist/lib/centos_base.lib.php
@@ -33,7 +33,7 @@
protected $clamav_socket = '/tmp/clamd.socket';
public function configure_amavis() {
- global $conf;
+ global $conf, $dist;
// amavisd user config file
$configfile = 'fedora_amavisd_conf';
@@ -50,6 +50,12 @@
$content = str_replace('/var/spool/amavisd/clamd.sock', $this->clamav_socket, $content);
wf($conf["amavis"]["config_dir"].'/amavisd.conf', $content);
chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
+
+ // for CentOS 7.2 only
+ if($dist['confid'] == 'centos72') {
+ chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0750);
+ chgrp($conf['amavis']['config_dir'].'/amavisd.conf', 'amavis');
+ }
// Adding the amavisd commands to the postfix configuration
--
Gitblit v1.9.1