From 9f65de0b6bbfb0824e34088029e4f593a28303e1 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 26 Jan 2016 07:38:47 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 install/dist/conf/centos70.conf.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/install/dist/conf/centos70.conf.php b/install/dist/conf/centos70.conf.php
index 8aa66ea..a40e88e 100644
--- a/install/dist/conf/centos70.conf.php
+++ b/install/dist/conf/centos70.conf.php
@@ -144,7 +144,7 @@
 
 //* Amavisd
 $conf['amavis']['installed'] = false; // will be detected automatically during installation
-$conf['amavis']['config_dir'] = '/etc';
+$conf['amavis']['config_dir'] = '/etc/amavisd';
 $conf['amavis']['init_script'] = 'amavisd';
 
 //* ClamAV

--
Gitblit v1.9.1