diff options
| author | Ermal <eri@pfsense.org> | 2013-12-14 19:20:39 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2013-12-14 19:20:55 +0000 |
| commit | 4aea91d808a12b8bbdcbded370b525e7ac292a47 (patch) | |
| tree | bfd8008ce0f7aa3b19ec29998b958f9b9ef9bf4d /etc/inc/system.inc | |
| parent | da49fd899695b7d860ef3b938064eedbb2b995de (diff) | |
| download | pfsense-4aea91d808a12b8bbdcbded370b525e7ac292a47.zip pfsense-4aea91d808a12b8bbdcbded370b525e7ac292a47.tar.gz | |
Switch to php-fpm for lighty and check_reload_status will use it. Step by step will migrate the other calls
Diffstat (limited to 'etc/inc/system.inc')
| -rw-r--r-- | etc/inc/system.inc | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 035c5de..c4857fa 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -982,11 +982,6 @@ function system_generate_lighty_config($filename, $max_php_children = 1; } - if ($captive_portal !== false) - $fast_cgi_path = "{$g['tmp_path']}/php-fastcgi-{$captive_portal}.socket"; - else - $fast_cgi_path = "{$g['tmp_path']}/php-fastcgi.socket"; - if(!isset($config['syslog']['nologlighttpd'])) { $lighty_use_syslog = <<<EOD ## where to send error-messages to @@ -995,7 +990,9 @@ EOD; } - $fastcgi_config = <<<EOD + if ($captive_portal !== false) { + $fast_cgi_path = "{$g['tmp_path']}/php-fastcgi-{$captive_portal}.socket"; + $fastcgi_config = <<<EOD #### fastcgi module ## read fastcgi.txt for more info fastcgi.server = ( ".php" => @@ -1013,6 +1010,23 @@ fastcgi.server = ( ".php" => ) EOD; + } else { + $fast_cgi_path = "{$g['varrun_path']}/php-fpm.socket"; + $fastcgi_config = <<<EOD +#### fastcgi module +## read fastcgi.txt for more info +fastcgi.server = ( ".php" => + ( "localhost" => + ( + "socket" => "{$fast_cgi_path}", + "broken-scriptfilename" => "enable" + ) + ) +) + +EOD; + } + $lighty_config = <<<EOD # |
