From 659d259d8c4cbc7f77f614d8628d845534608c9e Mon Sep 17 00:00:00 2001 From: Sethrin Date: Sat, 29 Dec 2012 17:44:55 -0800 Subject: [PATCH] Fixed nginx config --- en/installation/advanced-installation.rst | 7 ++++--- es/installation/advanced-installation.rst | 15 ++++++++------ fr/installation/advanced-installation.rst | 23 +++++++++++---------- ja/installation/advanced-installation.rst | 9 ++++---- pt/installation/advanced-installation.rst | 25 ++++++++++------------- 5 files changed, 41 insertions(+), 38 deletions(-) diff --git a/en/installation/advanced-installation.rst b/en/installation/advanced-installation.rst index aca17ee7ef..84d77b96d1 100644 --- a/en/installation/advanced-installation.rst +++ b/en/installation/advanced-installation.rst @@ -221,18 +221,19 @@ you will need PHP running as a FastCGI instance. # root directive should be global root /var/www/example.com/public/app/webroot/; + index index.php; access_log /var/www/example.com/log/access.log; error_log /var/www/example.com/log/error.log; location / { - index index.php index.html index.htm; try_files $uri $uri/ /index.php?$uri&$args; } location ~ \.php$ { - include /etc/nginx/fcgi.conf; - fastcgi_pass 127.0.0.1:10005; + try_files $uri =404; + include /etc/nginx/fastcgi_params; + fastcgi_pass 127.0.0.1:9000; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; } diff --git a/es/installation/advanced-installation.rst b/es/installation/advanced-installation.rst index dd4a83e56c..eb8cf6e3ca 100644 --- a/es/installation/advanced-installation.rst +++ b/es/installation/advanced-installation.rst @@ -302,19 +302,22 @@ nginx es un servidor web que está ganando mucha popularidad. Igual que Lighttpd server { listen 80; server_name example.com; - + + # root directive should be global + root /var/www/example.com/public/app/webroot/; + index index.php; + access_log /var/www/example.com/log/access.log; error_log /var/www/example.com/log/error.log; location / { - root /var/www/example.com/public/app/webroot/; - index index.php index.html index.htm; try_files $uri $uri/ /index.php?$uri&$args; } - location ~ .*\.php$ { - include /etc/nginx/fcgi.conf; - fastcgi_pass 127.0.0.1:10005; + location ~ \.php$ { + include /etc/nginx/fastcgi_params; + try_files $uri =404; + fastcgi_pass 127.0.0.1:9000; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; } diff --git a/fr/installation/advanced-installation.rst b/fr/installation/advanced-installation.rst index 806aeba191..f8509b083e 100644 --- a/fr/installation/advanced-installation.rst +++ b/fr/installation/advanced-installation.rst @@ -295,30 +295,31 @@ vous aurez besoin de PHP fonctionnant comme une instance FastCGI. server { listen 80; - server_name www.exemple.com; - rewrite ^(.*) http://exemple.com$1 permanent; + server_name www.example.com; + rewrite ^(.*) http://example.com$1 permanent; } server { listen 80; - server_name exemple.com; + server_name example.com; # root directive should be global - root /var/www/exemple.com/public/app/webroot/; - - access_log /var/www/exemple.com/log/access.log; - error_log /var/www/exemple.com/log/error.log; + root /var/www/example.com/public/app/webroot/; + index index.php; + + access_log /var/www/example.com/log/access.log; + error_log /var/www/example.com/log/error.log; location / { - index index.php index.html index.htm; try_files $uri $uri/ /index.php?$uri&$args; } location ~ \.php$ { - include /etc/nginx/fcgi.conf; - fastcgi_pass 127.0.0.1:10005; + include /etc/nginx/fastcgi_params; + try_files $uri =404; + fastcgi_pass 127.0.0.1:9000; fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME /var/www/exemple.com/public/app/webroot$fastcgi_script_name; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; } } diff --git a/ja/installation/advanced-installation.rst b/ja/installation/advanced-installation.rst index 93ce3ec9a4..2c077cc00d 100644 --- a/ja/installation/advanced-installation.rst +++ b/ja/installation/advanced-installation.rst @@ -184,18 +184,19 @@ nginxはポピュラーなサーバーで、少ないシステムリソースで # root directive should be global root /var/www/example.com/public/app/webroot/; - + index index.php; + access_log /var/www/example.com/log/access.log; error_log /var/www/example.com/log/error.log; location / { - index index.php index.html index.htm; try_files $uri $uri/ /index.php?$uri&$args; } location ~ \.php$ { - include /etc/nginx/fcgi.conf; - fastcgi_pass 127.0.0.1:10005; + include /etc/nginx/fastcgi_params; + try_files $uri =404; + fastcgi_pass 127.0.0.1:9000; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; } diff --git a/pt/installation/advanced-installation.rst b/pt/installation/advanced-installation.rst index e4eb80475e..fa259ed886 100644 --- a/pt/installation/advanced-installation.rst +++ b/pt/installation/advanced-installation.rst @@ -269,30 +269,27 @@ mas no mínimo, você irá precisar do PHP sendo executado como FastCGI. server { listen 80; server_name example.com; - + + # root directive should be global + root /var/www/example.com/public/app/webroot/; + index index.php; + access_log /var/www/example.com/log/access.log; error_log /var/www/example.com/log/error.log; location / { - root /var/www/example.com/public/app/webroot/; - index index.php index.html index.htm; - if (-f $request_filename) { - break; - } - if (-d $request_filename) { - break; - } - rewrite ^(.+)$ /index.php?q=$1 last; + try_files $uri $uri/ /index.php?$uri&$args; } - location ~ .*\.php[345]?$ { - include /etc/nginx/fcgi.conf; - fastcgi_pass 127.0.0.1:10005; + location ~ \.php$ { + include /etc/nginx/fastcgi_params; + try_files $uri =404; + fastcgi_pass 127.0.0.1:9000; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; } } - + URL Rewrites no IIS7 (Windows hosts) ====================================