provides nginx configuration (see #1142298)
This commit is contained in:
parent
35f115127f
commit
48afca509a
6
nginx-fpm.conf
Normal file
6
nginx-fpm.conf
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
# PHP-FPM FastCGI server
|
||||||
|
# network or unix domain socket configuration
|
||||||
|
|
||||||
|
upstream php-fpm {
|
||||||
|
server 127.0.0.1:9000;
|
||||||
|
}
|
14
nginx-php.conf
Normal file
14
nginx-php.conf
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
# pass the PHP scripts to FastCGI server
|
||||||
|
#
|
||||||
|
# See conf.d/php-fpm.conf for socket configuration
|
||||||
|
#
|
||||||
|
index index.php index.html index.htm;
|
||||||
|
|
||||||
|
location ~ \.php$ {
|
||||||
|
try_files $uri =404;
|
||||||
|
fastcgi_intercept_errors on;
|
||||||
|
fastcgi_index index.php;
|
||||||
|
include fastcgi_params;
|
||||||
|
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||||
|
fastcgi_pass php-fpm;
|
||||||
|
}
|
16
php.spec
16
php.spec
@ -62,7 +62,7 @@
|
|||||||
Summary: PHP scripting language for creating dynamic web sites
|
Summary: PHP scripting language for creating dynamic web sites
|
||||||
Name: php
|
Name: php
|
||||||
Version: 5.6.1
|
Version: 5.6.1
|
||||||
Release: 0.1.RC1%{?dist}
|
Release: 0.2.RC1%{?dist}
|
||||||
# All files licensed under PHP version 3.01, except
|
# All files licensed under PHP version 3.01, except
|
||||||
# Zend is licensed under Zend
|
# Zend is licensed under Zend
|
||||||
# TSRM is licensed under BSD
|
# TSRM is licensed under BSD
|
||||||
@ -85,6 +85,8 @@ Source8: php-fpm.sysconfig
|
|||||||
Source9: php.modconf
|
Source9: php.modconf
|
||||||
Source10: php.ztsmodconf
|
Source10: php.ztsmodconf
|
||||||
Source11: strip.sh
|
Source11: strip.sh
|
||||||
|
Source13: nginx-fpm.conf
|
||||||
|
Source14: nginx-php.conf
|
||||||
# Configuration files for some extensions
|
# Configuration files for some extensions
|
||||||
Source50: opcache.ini
|
Source50: opcache.ini
|
||||||
Source51: opcache-default.blacklist
|
Source51: opcache-default.blacklist
|
||||||
@ -126,6 +128,8 @@ BuildRequires: bzip2-devel, curl-devel >= 7.9
|
|||||||
BuildRequires: httpd-devel >= 2.0.46-1, pam-devel
|
BuildRequires: httpd-devel >= 2.0.46-1, pam-devel
|
||||||
# to ensure we are using httpd with filesystem feature (see #1081453)
|
# to ensure we are using httpd with filesystem feature (see #1081453)
|
||||||
BuildRequires: httpd-filesystem
|
BuildRequires: httpd-filesystem
|
||||||
|
# to ensure we are using nginx with filesystem feature (see #1142298)
|
||||||
|
BuildRequires: nginx-filesystem
|
||||||
BuildRequires: libstdc++-devel, openssl-devel
|
BuildRequires: libstdc++-devel, openssl-devel
|
||||||
BuildRequires: sqlite-devel >= 3.6.0
|
BuildRequires: sqlite-devel >= 3.6.0
|
||||||
BuildRequires: zlib-devel, smtpdaemon, libedit-devel
|
BuildRequires: zlib-devel, smtpdaemon, libedit-devel
|
||||||
@ -211,6 +215,8 @@ Requires(pre): httpd-filesystem
|
|||||||
Requires: httpd-filesystem >= 2.4.10
|
Requires: httpd-filesystem >= 2.4.10
|
||||||
# php engine for Apache httpd webserver
|
# php engine for Apache httpd webserver
|
||||||
Provides: php(httpd)
|
Provides: php(httpd)
|
||||||
|
# for /etc/nginx ownership
|
||||||
|
Requires: nginx-filesystem
|
||||||
|
|
||||||
%description fpm
|
%description fpm
|
||||||
PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI
|
PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI
|
||||||
@ -1208,6 +1214,9 @@ install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/php-fpm
|
|||||||
# Environment file
|
# Environment file
|
||||||
install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
|
install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
|
||||||
install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/php-fpm
|
install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/php-fpm
|
||||||
|
# Nginx configuration
|
||||||
|
install -D -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/conf.d/php-fpm.conf
|
||||||
|
install -D -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/default.d/php.conf
|
||||||
|
|
||||||
# Fix the link
|
# Fix the link
|
||||||
(cd $RPM_BUILD_ROOT%{_bindir}; ln -sfn phar.phar phar)
|
(cd $RPM_BUILD_ROOT%{_bindir}; ln -sfn phar.phar phar)
|
||||||
@ -1401,6 +1410,8 @@ rm -f README.{Zeus,QNX,CVS-RULES}
|
|||||||
%config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf
|
%config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf
|
||||||
%config(noreplace) %{_sysconfdir}/logrotate.d/php-fpm
|
%config(noreplace) %{_sysconfdir}/logrotate.d/php-fpm
|
||||||
%config(noreplace) %{_sysconfdir}/sysconfig/php-fpm
|
%config(noreplace) %{_sysconfdir}/sysconfig/php-fpm
|
||||||
|
%config(noreplace) %{_sysconfdir}/nginx/conf.d/php-fpm.conf
|
||||||
|
%config(noreplace) %{_sysconfdir}/nginx/default.d/php.conf
|
||||||
%{_prefix}/lib/tmpfiles.d/php-fpm.conf
|
%{_prefix}/lib/tmpfiles.d/php-fpm.conf
|
||||||
%{_unitdir}/php-fpm.service
|
%{_unitdir}/php-fpm.service
|
||||||
%{_sbindir}/php-fpm
|
%{_sbindir}/php-fpm
|
||||||
@ -1470,6 +1481,9 @@ rm -f README.{Zeus,QNX,CVS-RULES}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Sep 24 2014 Remi Collet <rcollet@redhat.com> 5.6.1-0.2.RC1
|
||||||
|
- provides nginx configuration (see #1142298)
|
||||||
|
|
||||||
* Sat Sep 13 2014 Remi Collet <rcollet@redhat.com> 5.6.1-0.1.RC1
|
* Sat Sep 13 2014 Remi Collet <rcollet@redhat.com> 5.6.1-0.1.RC1
|
||||||
- php 5.6.1RC1
|
- php 5.6.1RC1
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user