From 7d89f56a66811cddbfdb60abea19f6945f1f51d9 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 02 Sep 2008 09:19:31 -0400
Subject: [PATCH] - Added support for openSUSE 11.0
---
install/lib/installer_base.lib.php | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 7b38923..3ca35b4 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -187,7 +187,7 @@
//** writes postfix configuration files
- private function process_postfix_config($configfile)
+ public function process_postfix_config($configfile)
{
global $conf;
@@ -329,12 +329,6 @@
caselog($command." &> /dev/null", __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command);
}
- // TODO: Change the master.cf file
- /*
- Add:
- maildrop unix - n n - - pipe
- flags=R user=vmail argv=/usr/bin/maildrop -d ${recipient} ${extension} ${recipient} ${user} ${nexthop} ${sender}
- */
if(!stristr($options,'dont-create-certs')) {
//* Create the SSL certificate
$command = 'cd '.$config_dir.'; '
@@ -386,7 +380,7 @@
}
- function configure_saslauthd() {
+ public function configure_saslauthd() {
global $conf;
@@ -478,7 +472,7 @@
wf($configfile, $content);
}
- function configure_amavis() {
+ public function configure_amavis() {
global $conf;
// amavisd user config file
@@ -513,11 +507,14 @@
// Append the configuration for amavisd to the master.cf file
if(is_file($conf["postfix"]["config_dir"].'/master.cf')) copy($conf["postfix"]["config_dir"].'/master.cf',$conf["postfix"]["config_dir"].'/master.cf~');
- $content = rf("tpl/master_cf_amavis.master");
+ $content = rf($conf["postfix"]["config_dir"].'/master.cf');
// Only add the content if we had not addded it before
if(!stristr($content,"127.0.0.1:10025")) {
+ unset($content);
+ $content = rf("tpl/master_cf_amavis.master");
af($conf["postfix"]["config_dir"].'/master.cf',$content);
}
+ unset($content);
// Add the clamav user to the amavis group
exec('adduser clamav amavis');
--
Gitblit v1.9.1