From ae6d914aae490fb025e91c5eb72abb3d80d5e91a Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Wed, 15 Aug 2012 10:04:32 -0400
Subject: [PATCH] Fixed bug that added Listen directive to apps vhost even on port 80 and 443
---
install/dist/lib/fedora.lib.php | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index ba1c285..1275223 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -279,6 +279,9 @@
$config_dir = $conf['dovecot']['config_dir'];
+ //* Use /etc/dovecot as config dir if exists
+ if(is_dir('/etc/dovecot')) $config_dir = '/etc/dovecot';
+
//* Configure master.cf and add a line for deliver
if(is_file($config_dir.'/master.cf')){
copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');
@@ -865,6 +868,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
exec("chmod 600 $install_dir/server/lib/$configfile");
exec("chown root:root $install_dir/server/lib/$configfile");
@@ -1065,6 +1072,7 @@
}
$content = rf("tpl/mysql_clientdb.conf.master");
+ $content = str_replace('{hostname}',$conf['mysql']['host'],$content);
$content = str_replace('{username}',$conf['mysql']['admin_user'],$content);
$content = str_replace('{password}',$conf['mysql']['admin_password'], $content);
wf("$install_dir/server/lib/mysql_clientdb.conf",$content);
--
Gitblit v1.9.1