From 04e09afcccbf4e7f3eafa540ea35ac22b38f5bc0 Mon Sep 17 00:00:00 2001
From: filip <filip@ispconfig3>
Date: Mon, 27 Sep 2010 07:31:33 -0400
Subject: [PATCH] Implemented new FAQ functionality in help module
---
install/dist/lib/gentoo.lib.php | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index 08d3494..e6f4a09 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -699,6 +699,12 @@
$content = str_replace('{vhost_port_listen}', '', $content);
}
+ if(is_file('/usr/local/ispconfig/interface/ssl/ispserver.crt') && is_file('/usr/local/ispconfig/interface/ssl/ispserver.key')) {
+ $content = str_replace('{ssl_comment}', '', $content);
+ } else {
+ $content = str_replace('{ssl_comment}', '#', $content);
+ }
+
$vhost_path = $conf['apache']['vhost_conf_dir'].'/ispconfig.vhost';
$this->write_config_file($vhost_path, $content);
@@ -746,11 +752,11 @@
}
// Create the ispconfig log directory
- if (!is_dir('/var/log/ispconfig')) {
- mkdir('/var/log/ispconfig');
+ if (!is_dir($conf['ispconfig_log_dir'])) {
+ mkdir($conf['ispconfig_log_dir']);
}
- if (!is_file('/var/log/ispconfig/ispconfig.log')) {
- exec('touch /var/log/ispconfig/ispconfig.log');
+ if (!is_file($conf['ispconfig_log_dir'].'/ispconfig.log')) {
+ exec('touch '.$conf['ispconfig_log_dir'].'/ispconfig.log');
}
exec('mv /usr/local/ispconfig/server/scripts/run-getmail.sh /usr/local/bin/run-getmail.sh');
@@ -759,4 +765,4 @@
}
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1