From 013ae4df1d3aef36b0dea564f7f95690cae11549 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 17 Aug 2012 02:59:52 -0400
Subject: [PATCH] Implemented: FS#2283 - Add O option to dovecot transport in postfix master.cf so that X-Original-To: header is added.
---
install/dist/lib/gentoo.lib.php | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index eb764e1..e9f4838 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -242,7 +242,7 @@
$content = rf($configfile);
if(!stristr($content,'dovecot/deliver')) {
- $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';
+ $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DROhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';
af($conf['postfix']['config_dir'].'/master.cf',$deliver_content);
}
unset($content);
@@ -561,7 +561,7 @@
global $conf;
//* Create the ispconfig apps vhost user and group
- if($conf['apache']['installed'] == true && $this->install_ispconfig_interface == true){
+ if($conf['apache']['installed'] == true){
$apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']);
$apps_vhost_group = escapeshellcmd($conf['web']['apps_vhost_group']);
$install_dir = escapeshellcmd($conf['web']['website_basedir'].'/apps');
@@ -619,7 +619,7 @@
}
}
- if($conf['nginx']['installed'] == true && $this->install_ispconfig_interface == true){
+ if($conf['nginx']['installed'] == true){
$apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']);
$apps_vhost_group = escapeshellcmd($conf['web']['apps_vhost_group']);
$install_dir = escapeshellcmd($conf['web']['website_basedir'].'/apps');
@@ -858,6 +858,10 @@
}
}
+ //* Make the APS directories group writable
+ exec("chmod -R 770 $install_dir/interface/web/sites/aps_meta_packages");
+ exec("chmod -R 770 $install_dir/server/aps_packages");
+
//* make sure that the server config file (not the interface one) is only readable by the root user
chmod($install_dir.'/server/lib/'.$configfile, 0600);
chown($install_dir.'/server/lib/'.$configfile, 'root');
@@ -874,9 +878,8 @@
}
if(is_dir($install_dir.'/interface/invoices')) {
- chmod($install_dir.'/interface/invoices', 0770);
- chown($install_dir.'/interface/invoices', 'ispconfig');
- chgrp($install_dir.'/interface/invoices', 'ispconfig');
+ exec('chmod -R 770 '.escapeshellarg($install_dir.'/interface/invoices'));
+ exec('chown -R ispconfig:ispconfig '.escapeshellarg($install_dir.'/interface/invoices'));
}
// TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing
--
Gitblit v1.9.1