From f496e926e7aae5459acb93714dfc77dac64e0e73 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 23 Jun 2016 14:19:49 -0400
Subject: [PATCH] Fix for amavisd config permissions on CentOS 7.2
---
install/dist/lib/centos_base.lib.php | 8 +++++++-
install/dist/lib/fedora.lib.php | 5 ++---
2 files changed, 9 insertions(+), 4 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
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