- provide two PHP setups: externally spawned (by php-fcgi-init) and spawned by lightt...

Changed files:
    lighttpd-mod_fastcgi.conf -> 1.4
    lighttpd-php-external.conf -> 1.1
    lighttpd-php-spawned.conf -> 1.1

diff --git a/lighttpd-mod_fastcgi.conf b/lighttpd-mod_fastcgi.conf
index 94de882ebb50cfe602612b6caaeae20e64d7ece2..e93f187d614bdba1c3282599557b03f68822e9ab 100644 (file)
--- a/lighttpd-mod_fastcgi.conf
+++ b/lighttpd-mod_fastcgi.conf
@@ -11,41 +11,3 @@ server.modules += (
 #### fastcgi module
 ## read fastcgi.txt for more info
 #fastcgi.debug = 1
-
-## Start an FastCGI server for PHP
-#fastcgi.server = (
-#      ".php" => ((
-#              "bin-path" => "/usr/bin/php.fcgi",
-#              "socket" => "/var/run/php/php-fastcgi.sock",
-#              "max-procs" => 2,
-#              "idle-timeout" => 20,
-#              "bin-environment" => (
-#                      "PHP_FCGI_CHILDREN" => "4",
-#                      "PHP_FCGI_MAX_REQUESTS" => "10000"
-#              ),
-#              "bin-copy-environment" => (
-#                      "PATH", "SHELL", "USER"
-#              ),
-#              "broken-scriptfilename" => "enable"
-#      ))
-#)
-
-#### standalone of php-fcgi
-# if you want to use standalone version of php.fcgi
-# install php-fcgi-init, start php-fcgi and then start lighttpd
-
-#fastcgi.server = (
-#      ".php" => ((
-#              "host" => "127.0.0.1",
-#              "port" => 1026,
-#      )),
-#      # same but via local socket
-#      ".php" => ((
-#              "socket" => "/var/run/php/php-fcgi.sock",
-#              "check-local" => "disable",
-#              "allow-x-send-file" => "enable",
-#              "bin-copy-environment" => (
-#                      "PATH", "SHELL", "USER"
-#              ),
-#      ))
-#)

diff --git a/lighttpd-php-external.conf b/lighttpd-php-external.conf
new file mode 100644 (file)
index 0000000..3ba42dd
--- /dev/null
+++ b/lighttpd-php-external.conf
@@ -0,0 +1,17 @@
+# FastCGI server for PHP
+fastcgi.server += (
+       ".php" => ((
+               "socket" => "/var/run/php/php-fcgi.sock",
+               "check-local" => "disable",
+               "bin-copy-environment" => (
+                       "PATH", "SHELL", "USER"
+               ),
+       ))
+)
+
+fastcgi.server += (
+       ".php" => ((
+               "host" => "127.0.0.1",
+               "port" => 1026,
+       )),
+)

diff --git a/lighttpd-php-spawned.conf b/lighttpd-php-spawned.conf
new file mode 100644 (file)
index 0000000..6c5e0fe
--- /dev/null
+++ b/lighttpd-php-spawned.conf
@@ -0,0 +1,17 @@
+# FastCGI server for PHP
+fastcgi.server += (
+       ".php" => ((
+               "bin-path" => "/usr/bin/php.fcgi",
+               "socket" => "/var/run/php/php-fcgi-" + var.pid + ".sock",
+               "max-procs" => 2,
+               "idle-timeout" => 20,
+               "bin-environment" => (
+                       "PHP_FCGI_CHILDREN" => "4",
+                       "PHP_FCGI_MAX_REQUESTS" => "10000"
+               ),
+               "bin-copy-environment" => (
+                       "PATH", "SHELL", "USER"
+               ),
+               "broken-scriptfilename" => "enable"
+       ))
+)