From 9fcf88d06d20076f1b228979e9ed4e8a56f39ef8 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 26 Oct 2010 10:28:10 -0400
Subject: [PATCH] Fixed: FS#1388 - Namevirtualhost directive is missing after update. 2nd try ;)
---
install/dist/lib/fedora.lib.php | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 43ae81a..eec9af6 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -345,7 +345,7 @@
// amavisd user config file
$configfile = 'fedora_amavisd_conf';
- if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["courier"]["config_dir"].'/amavisd.conf~');
+ if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["amavis"]["config_dir"].'/amavisd.conf~');
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/amavisd.conf~');
$content = rf("tpl/".$configfile.".master");
$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
@@ -529,7 +529,7 @@
// copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf');
$content = rf("tpl/apache_ispconfig.conf.master");
$records = $this->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'");
- if(count($records) > 0) {
+ if(is_array($records) && count($records) > 0) {
foreach($records as $rec) {
$content .= "NameVirtualHost ".$rec["ip_address"].":80\n";
$content .= "NameVirtualHost ".$rec["ip_address"].":443\n";
@@ -903,6 +903,9 @@
exec('chown getmail /usr/local/bin/run-getmail.sh');
exec('chmod 744 /usr/local/bin/run-getmail.sh');
+ // Edit the file Edit the file /etc/sudoers and comment out the requiregetty line, otherwise the backup function will fail
+ replaceLine('/etc/sudoers','Defaults requiretty','#Defaults requiretty',0,0);
+
}
--
Gitblit v1.9.1