Patchwork lighttpd: fix FastCGI configuration for PHP

login
register
mail settings
Submitter Marcin Juszkiewicz
Date June 25, 2012, 9:13 a.m.
Message ID <1340615583-21184-1-git-send-email-marcin.juszkiewicz@linaro.org>
Download mbox | patch
Permalink /patch/30619/
State New
Headers show

Comments

Marcin Juszkiewicz - June 25, 2012, 9:13 a.m.
/usr/local/bin/php was set as PHP interpreter so lighttpd failed to run.
Also uncommented FastCGI configuration block to make mod_fastcgi
enablement easier for user.

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 meta/recipes-extended/lighttpd/files/lighttpd.conf |   16 ++++++++--------
 meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb  |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)
ml@communistcode.co.uk - June 25, 2012, 9:56 a.m.
Hi Martin,

On 25/06/12 10:13, Marcin Juszkiewicz wrote:
> /usr/local/bin/php was set as PHP interpreter so lighttpd failed to run.
> Also uncommented FastCGI configuration block to make mod_fastcgi
> enablement easier for user.
>
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> ---
>   meta/recipes-extended/lighttpd/files/lighttpd.conf |   16 ++++++++--------
>   meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb  |    2 +-
>   2 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.conf b/meta/recipes-extended/lighttpd/files/lighttpd.conf
> index 3342470..0838da8 100644
> --- a/meta/recipes-extended/lighttpd/files/lighttpd.conf
> +++ b/meta/recipes-extended/lighttpd/files/lighttpd.conf
> @@ -211,14 +211,14 @@ static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
>   #### fastcgi module
>   ## read fastcgi.txt for more info
>   ## for PHP don't forget to set cgi.fix_pathinfo = 1 in the php.ini
> -#fastcgi.server             = ( ".php" =>
> -#                               ( "localhost" =>
> -#                                 (
> -#                                   "socket" => "/tmp/php-fastcgi.socket",
> -#                                   "bin-path" => "/usr/local/bin/php"
> -#                                 )
> -#                               )
> -#                            )
> +fastcgi.server             = ( ".php" =>
> +                               ( "localhost" =>
> +                                 (
> +                                   "socket" => "/tmp/php-fastcgi.socket",
> +                                   "bin-path" => "/usr/bin/php-cgi"

Changing the path here I agree with.

>
> +                                 )
> +                               )
> +                            )
>   
>   #### CGI module
>   #cgi.assign                 = ( ".pl"  => "/usr/bin/perl",
> diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb
> index 161c0d9..99b359c 100644
> --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb
> +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb
> @@ -16,7 +16,7 @@ RDEPENDS_${PN} += " \
>                  lighttpd-module-staticfile \
>   "
>   
> -PR = "r1"
> +PR = "r2"
>   
>   SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.bz2 \
>           file://index.html.lighttpd \

However I don't think we should be enabling php-cgi by default, 
especially as it is not included in oe-core. Uncommenting some lines in 
a configuration file should be manageable by users that can build (and 
add additional layers to) OpenEmbedded.

Regards,
Koen Kooi - June 25, 2012, 9:56 a.m.
Op 25 jun. 2012, om 11:13 heeft Marcin Juszkiewicz het volgende geschreven:

> /usr/local/bin/php was set as PHP interpreter so lighttpd failed to run.
> Also uncommented FastCGI configuration block to make mod_fastcgi
> enablement easier for user.
> 
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> ---
> meta/recipes-extended/lighttpd/files/lighttpd.conf |   16 ++++++++--------
> meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb  |    2 +-
> 2 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.conf b/meta/recipes-extended/lighttpd/files/lighttpd.conf
> index 3342470..0838da8 100644
> --- a/meta/recipes-extended/lighttpd/files/lighttpd.conf
> +++ b/meta/recipes-extended/lighttpd/files/lighttpd.conf
> @@ -211,14 +211,14 @@ static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
> #### fastcgi module
> ## read fastcgi.txt for more info
> ## for PHP don't forget to set cgi.fix_pathinfo = 1 in the php.ini
> -#fastcgi.server             = ( ".php" =>
> -#                               ( "localhost" =>
> -#                                 (
> -#                                   "socket" => "/tmp/php-fastcgi.socket",
> -#                                   "bin-path" => "/usr/local/bin/php"
> -#                                 )
> -#                               )
> -#                            )
> +fastcgi.server             = ( ".php" =>
> +                               ( "localhost" =>
> +                                 (
> +                                   "socket" => "/tmp/php-fastcgi.socket",
> +                                   "bin-path" => "/usr/bin/php-cgi"
> +                                 )

How does this work with DISTROs that set ${prefix}=""?

regards,

Koen
Marcin Juszkiewicz - June 25, 2012, 11:37 a.m.
W dniu 25.06.2012 11:56, Koen Kooi pisze:
> Op 25 jun. 2012, om 11:13 heeft Marcin Juszkiewicz het volgende geschreven:
> 
>> /usr/local/bin/php was set as PHP interpreter so lighttpd failed to run.
>> Also uncommented FastCGI configuration block to make mod_fastcgi
>> enablement easier for user.

>> +fastcgi.server             = ( ".php" =>
>> +                               ( "localhost" =>
>> +                                 (
>> +                                   "socket" => "/tmp/php-fastcgi.socket",
>> +                                   "bin-path" => "/usr/bin/php-cgi"
>> +                                 )
> 
> How does this work with DISTROs that set ${prefix}=""?

For them nothing changes - they still have to edit configuration file.
Marcin Juszkiewicz - June 25, 2012, 11:40 a.m.
W dniu 25.06.2012 11:56, Jack Mitchell pisze:
>> -PR = "r1" +PR = "r2" SRC_URI = 
>> "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.bz2
>>
>>
>>
>>
>> 
\
>> file://index.html.lighttpd \
> 
> However I don't think we should be enabling php-cgi by default, 
> especially as it is not included in oe-core.

I did not enabled mod_fastcgi only it's configuration.

> Uncommenting some lines in a configuration file should be manageable 
> by users that can build (and add additional layers to) OpenEmbedded.

Current state of lighttd sucks anyway if you want to use Meta
OpenEmbedded and OpenEmbedded Core layers as resulting package will add
dependency on systemd (patches to change it are on a list).

Anyway it was more ask for comments as I have yet another copy of that
file in my layer.

Patch

diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.conf b/meta/recipes-extended/lighttpd/files/lighttpd.conf
index 3342470..0838da8 100644
--- a/meta/recipes-extended/lighttpd/files/lighttpd.conf
+++ b/meta/recipes-extended/lighttpd/files/lighttpd.conf
@@ -211,14 +211,14 @@  static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
 #### fastcgi module
 ## read fastcgi.txt for more info
 ## for PHP don't forget to set cgi.fix_pathinfo = 1 in the php.ini
-#fastcgi.server             = ( ".php" =>
-#                               ( "localhost" =>
-#                                 (
-#                                   "socket" => "/tmp/php-fastcgi.socket",
-#                                   "bin-path" => "/usr/local/bin/php"
-#                                 )
-#                               )
-#                            )
+fastcgi.server             = ( ".php" =>
+                               ( "localhost" =>
+                                 (
+                                   "socket" => "/tmp/php-fastcgi.socket",
+                                   "bin-path" => "/usr/bin/php-cgi"
+                                 )
+                               )
+                            )
 
 #### CGI module
 #cgi.assign                 = ( ".pl"  => "/usr/bin/perl",
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb
index 161c0d9..99b359c 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb
@@ -16,7 +16,7 @@  RDEPENDS_${PN} += " \
                lighttpd-module-staticfile \
 "
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.bz2 \
         file://index.html.lighttpd \