adamwill pushed to owncloud (f21). "Use php handler from php-fpm nginx conf (..more)"

[notifications at fedoraproject.org]

>From 05f50cb5175f7b2e58c7b858f9d732911defa079 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date: Fri, 24 Apr 2015 23:42:45 +0300
Subject: Use php handler from php-fpm nginx conf

Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>

diff --git a/owncloud-nginx.conf b/owncloud-nginx.conf
index d03dedf..d6f8fe5 100644
--- a/owncloud-nginx.conf
+++ b/owncloud-nginx.conf
@@ -1,8 +1,3 @@
-upstream php-handler {
-        server 127.0.0.1:9000;
-        #server unix:/var/run/php5-fpm.sock;
-}
-
 # server {
 #         listen 80;
 #         server_name cloud.example.com;
@@ -71,7 +66,7 @@ server {
                 fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
                 fastcgi_param PATH_INFO $fastcgi_path_info;
 #                fastcgi_param HTTPS on;
-                fastcgi_pass php-handler;
+                fastcgi_pass php-fpm;
         }
 
         # Optional: set long EXPIRES header on static assets
diff --git a/owncloud.spec b/owncloud.spec
index 7c51ea9..3e378ca 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -465,6 +465,9 @@ fi
 
 
 %changelog
+* Fri Apr 24 2015 Igor Gnatenko <ignatenkobrain at fedoraproject.org>
+- Use php handler from php-fpm nginx conf
+
 * Sun Mar 15 2015 Adam Williamson <awilliam at redhat.com> - 8.0.2-1
 - new release 8.0.2
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/owncloud.git/commit/?h=f21&id=05f50cb5175f7b2e58c7b858f9d732911defa079