Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

Florian Schaal

2015-05-07 671f79d3b1162d8b88f18f71949a13063f73fd6f

 install/dist/lib/centos70.lib.php

@@ -124,6 +124,7 @@
      $content = str_replace('{hostname}', $conf['hostname'], $content);
      $content = str_replace('/var/spool/amavisd/clamd.sock', '/var/run/clamav/clamd.sock', $content);
      wf($conf["amavis"]["config_dir"].'/amavisd.conf', $content);
      chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);


      // Adding the amavisd commands to the postfix configuration