Skip to content

Commit 0731a3d

Browse files
committed
Fixed FCGI starter script for ispconfig interface.
1 parent 24ed48a commit 0731a3d

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

install/lib/installer_base.lib.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -991,6 +991,12 @@ public function install_ispconfig()
991991
if(!@is_link("$vhost_conf_enabled_dir/000-ispconfig.vhost")) {
992992
exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost");
993993
}
994+
995+
exec('mkdir -p /var/www/php-fcgi-scripts/ispconfig');
996+
exec('cp tpl/apache_ispconfig_fcgi_starter.master /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
997+
exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
998+
exec('ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig');
999+
9941000
}
9951001

9961002
// Make the Clamav log files readable by ISPConfig
@@ -1002,9 +1008,6 @@ public function install_ispconfig()
10021008
exec('chown root /usr/local/bin/ispconfig_update_from_svn.sh');
10031009
exec('chmod 700 /usr/local/bin/ispconfig_update_from_svn.sh');
10041010

1005-
//set the fast cgi starter script to executable
1006-
exec('chmod 755 '.$install_dir.'/interface/bin/php-fcgi');
1007-
10081011
//* Make the logs readable for the ispconfig user
10091012
if(@is_file('/var/log/mail.log')) exec('chmod +r /var/log/mail.log');
10101013
if(@is_file('/var/log/mail.warn')) exec('chmod +r /var/log/mail.warn');

install/tpl/apache_ispconfig.vhost.master

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ NameVirtualHost *:{vhost_port}
1212
DocumentRoot /usr/local/ispconfig/interface/web/
1313

1414
<IfModule mod_fastcgi.c>
15-
DocumentRoot /usr/local/ispconfig/interface/web/
15+
DocumentRoot /var/www/ispconfig/
1616
SuexecUserGroup ispconfig ispconfig
17-
<Directory /usr/local/ispconfig/interface/web/>
17+
<Directory /var/www/ispconfig/>
1818
Options Indexes FollowSymLinks MultiViews +ExecCGI
1919
AllowOverride AuthConfig Indexes Limit Options FileInfo
2020
AddHandler fcgid-script .php
21-
FCGIWrapper /usr/local/ispconfig/interface/bin/php-fcgi .php
21+
FCGIWrapper /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter .php
2222
Order allow,deny
2323
Allow from all
2424
</Directory>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/sh
2+
PHPRC=/etc/php5/cgi/
3+
export PHPRC
4+
exec /usr/lib/cgi-bin/php
5+
PHP_FCGI_MAX_REQUESTS=5000
6+
export PHP_FCGI_MAX_REQUESTS
7+
export PHP_FCGI_CHILDREN=8
8+
export PHP_FCGI_MAX_REQUESTS=500

0 commit comments

Comments
 (0)