Commit 0731a3df authored by tbrehm's avatar tbrehm

Fixed FCGI starter script for ispconfig interface.

parent 24ed48ab
...@@ -991,6 +991,12 @@ class installer_base { ...@@ -991,6 +991,12 @@ class installer_base {
if(!@is_link("$vhost_conf_enabled_dir/000-ispconfig.vhost")) { if(!@is_link("$vhost_conf_enabled_dir/000-ispconfig.vhost")) {
exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost"); exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost");
} }
exec('mkdir -p /var/www/php-fcgi-scripts/ispconfig');
exec('cp tpl/apache_ispconfig_fcgi_starter.master /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
exec('ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig');
} }
// Make the Clamav log files readable by ISPConfig // Make the Clamav log files readable by ISPConfig
...@@ -1002,9 +1008,6 @@ class installer_base { ...@@ -1002,9 +1008,6 @@ class installer_base {
exec('chown root /usr/local/bin/ispconfig_update_from_svn.sh'); exec('chown root /usr/local/bin/ispconfig_update_from_svn.sh');
exec('chmod 700 /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');
//* Make the logs readable for the ispconfig user //* Make the logs readable for the ispconfig user
if(@is_file('/var/log/mail.log')) exec('chmod +r /var/log/mail.log'); if(@is_file('/var/log/mail.log')) exec('chmod +r /var/log/mail.log');
if(@is_file('/var/log/mail.warn')) exec('chmod +r /var/log/mail.warn'); if(@is_file('/var/log/mail.warn')) exec('chmod +r /var/log/mail.warn');
......
...@@ -12,13 +12,13 @@ NameVirtualHost *:{vhost_port} ...@@ -12,13 +12,13 @@ NameVirtualHost *:{vhost_port}
DocumentRoot /usr/local/ispconfig/interface/web/ DocumentRoot /usr/local/ispconfig/interface/web/
<IfModule mod_fastcgi.c> <IfModule mod_fastcgi.c>
DocumentRoot /usr/local/ispconfig/interface/web/ DocumentRoot /var/www/ispconfig/
SuexecUserGroup ispconfig ispconfig SuexecUserGroup ispconfig ispconfig
<Directory /usr/local/ispconfig/interface/web/> <Directory /var/www/ispconfig/>
Options Indexes FollowSymLinks MultiViews +ExecCGI Options Indexes FollowSymLinks MultiViews +ExecCGI
AllowOverride AuthConfig Indexes Limit Options FileInfo AllowOverride AuthConfig Indexes Limit Options FileInfo
AddHandler fcgid-script .php AddHandler fcgid-script .php
FCGIWrapper /usr/local/ispconfig/interface/bin/php-fcgi .php FCGIWrapper /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter .php
Order allow,deny Order allow,deny
Allow from all Allow from all
</Directory> </Directory>
......
#!/bin/sh
PHPRC=/etc/php5/cgi/
export PHPRC
exec /usr/lib/cgi-bin/php
PHP_FCGI_MAX_REQUESTS=5000
export PHP_FCGI_MAX_REQUESTS
export PHP_FCGI_CHILDREN=8
export PHP_FCGI_MAX_REQUESTS=500
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment