From 2ef13cd37e25cab3febdf0e77ea8a71da3f5fd6a Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 26 Oct 2010 07:29:14 -0400
Subject: [PATCH] Fixed: FS#1358 - AWStats tools no in tools directory
---
install/dist/lib/gentoo.lib.php | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index 08d3494..e77720e 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -579,6 +579,13 @@
// Create the config file for ISPConfig server
$this->write_config_file("$install_dir/server/lib/$configfile", $content);
+ //* Create the config file for remote-actions (but only, if it does not exist, because
+ // the value is a autoinc-value and so changed by the remoteaction_core_module
+ if (!file_exists($install_dir.'/server/lib/remote_action.inc.php')) {
+ $content = '<?php' . "\n" . '$maxid_remote_action = 0;' . "\n" . '?>';
+ wf($install_dir.'/server/lib/remote_action.inc.php', $content);
+ }
+
// Enable the server modules and plugins.
// TODO: Implement a selector which modules and plugins shall be enabled.
$dir = $install_dir.'/server/mods-available/';
@@ -699,6 +706,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 +759,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 +772,4 @@
}
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1