From f496e926e7aae5459acb93714dfc77dac64e0e73 Mon Sep 17 00:00:00 2001 From: Till Brehm Date: Thu, 23 Jun 2016 20:19:49 +0200 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 74ff8be41b..d6deb7e27a 100644 --- a/install/dist/lib/centos_base.lib.php +++ b/install/dist/lib/centos_base.lib.php @@ -33,7 +33,7 @@ class installer_centos extends installer_dist { 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 @@ class installer_centos extends installer_dist { $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 f7e7fa331d..4b6dcd38f2 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -480,7 +480,7 @@ class installer_dist extends installer_base { } public function configure_amavis() { - global $conf; + global $conf, $dist; // amavisd user config file $configfile = 'fedora_amavisd_conf'; @@ -497,8 +497,7 @@ class installer_dist extends installer_base { 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'); } -- GitLab