From 8b5ccd302bd1497de721a25e4ce086bebf95173f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 08 Jun 2008 15:32:42 -0400
Subject: [PATCH] Fixed a problem with the logout when the php session has ended.
---
install/lib/installer_base.lib.php | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 764c8ef..942d03f 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -183,7 +183,24 @@
wf($full_file_name, $content);
}
-
+ public function configure_jailkit()
+ {
+ $cf = $this->conf['jailkit'];
+ $config_dir = $cf['config_dir'];
+ $jk_init = $cf['jk_init'];
+ $jk_chrootsh = $cf['jk_chrootsh'];
+
+ if (!is_dir($config_dir))
+ {
+ copy($config_dir.'/'.$jk_init, $config_dir.'/'.$jk_init.'~');
+ copy($config_dir.'/'.$jk_chrootsh.".master", $config_dir.'/'.$jk_chrootsh.'~');
+
+ copy('tpl/'.$jk_init.".master", $config_dir.'/'.$jk_init);
+ copy('tpl/'.$jk_chrootsh.".master", $config_dir.'/'.$jk_chrootsh);
+ }
+
+ }
+
public function configure_postfix($options = '')
{
$cf = $this->conf['postfix'];
@@ -697,8 +714,6 @@
$content = rf("tpl/apache_ispconfig.vhost.master");
$content = str_replace('{vhost_port}', $this->conf['apache']['vhost_port'], $content);
- $content = str_replace('{vhost_cgi_alias}', $this->conf['apache']['vhost_cgi_alias'], $content);
-
wf("$vhost_conf_dir/ispconfig.vhost", $content);
//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
@@ -716,6 +731,8 @@
exec('chown root /usr/local/bin/ispconfig_update_from_svn.sh');
exec('chmod 700 /usr/local/bin/ispconfig_update_from_svn.sh');
+ //set the fast cgi starter script to executable
+ exec('chmod 755 '.$install_dir.'/interface/bin/php-fcgi');
}
public function install_crontab()
--
Gitblit v1.9.1