[Quickfw-git] SF.net Git: quickfw branch, master, updated. 8a3d41547344f9dd14c1b56587e3fa3b1aedb1d1

[SeriousDron <ser...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "quickfw".

The branch, master has been updated
       via  8a3d41547344f9dd14c1b56587e3fa3b1aedb1d1 (commit)
      from  44bf1fc5d50edb27caf449b1c04bf488884cf351 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8a3d41547344f9dd14c1b56587e3fa3b1aedb1d1
Author: unknown <none)>
Date:   Mon Aug 9 22:59:16 2010 +0400

    * normal config for nginx

diff --git a/doc/nginx.conf b/doc/nginx.conf
index 6bcc1ce..f1e202a 100644
--- a/doc/nginx.conf
+++ b/doc/nginx.conf
@@ -1,8 +1,43 @@
+server {	
+
+	<...>
+	
+	root <...> #must be here for FastCGI
+	
+	<...>
+	
 	location / {
-		if (!-e $request_filename) {
-			rewrite ^(.*)$ /index.php$1 break;
-			proxy_pass      http://<...>;
-		}
-		proxy_pass      http://<...>;
-		root   <...>;
+		try_files $uri $uri/ @fallback;
 	}
+	
+	#For apache backend
+	location @fallback {
+		proxy_pass http://127.0.0.1:8080;#Apache must have its own rewrite
+		proxy_set_header Host $host;
+	}
+
+	
+	location ~ \.php$ { #To deny get php files like text
+		try_files      $uri  @fastcgi; 
+		
+		#For apache backend
+		proxy_pass http://127.0.0.1:8080;#Apache must have its own rewrite
+		proxy_set_header Host $host;
+		
+		#For FastCGI
+		#fastcgi_pass unix:/var/run/php-fpm/defailt.socket;
+		#include fastcgi_params; #standart file in nginx
+		#fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
+
+	}
+	
+	#For FastCGI
+	location @fastcgi {
+		fastcgi_pass unix:/var/run/php-fpm/defailt.socket;
+		fastcgi_index index.php;
+		
+		include fastcgi_params; #standart file in nginx
+		
+		fastcgi_param SCRIPT_FILENAME $document_root/index.php;
+	}
+}
\ No newline at end of file

-----------------------------------------------------------------------

Summary of changes:
 doc/nginx.conf |   47 +++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 41 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
quickfw