Merge pull request #6767 from MrPetovan/bug/fatal-errors

[friendica.git] / mods / sample-nginx.config

diff --git a/mods/sample-nginx.config b/mods/sample-nginx.config
index cac48109caee870a5ac53b5b85c7df2b27c4e624..71d37855169c39a41f1685b5da4dc160c21c8572 100644 (file)
--- a/mods/sample-nginx.config
+++ b/mods/sample-nginx.config
@@ -1,5 +1,5 @@
 ##
-# Red Nginx configuration
+# Friendica Nginx configuration
 # by Olaf Conradi
 #
 # On Debian based distributions you can add this file to
@@ -22,24 +22,24 @@
 
 ##
 # This configuration assumes your domain is example.net
-# You have a separate subdomain red.example.net
-# You want all red traffic to be https
+# You have a separate subdomain friendica.example.net
+# You want all Friendica traffic to be https
 # You have an SSL certificate and key for your subdomain
 # You have PHP FastCGI Process Manager (php5-fpm) running on localhost
-# You have Red installed in /var/www/red
+# You have Friendica installed in /var/www/friendica
 ##
 
 server {
   listen 80;
-  server_name red.example.net;
+  server_name friendica.example.net;
 
   index index.php;
-  root /var/www/red;
-  rewrite ^ https://red.example.net$request_uri? permanent;
+  root /var/www/friendica;
+  rewrite ^ https://friendica.example.net$request_uri? permanent;
 }
 
 ##
-# Configure Red with SSL
+# Configure Friendica with SSL
 #
 # All requests are routed to the front controller
 # except for certain known file types like images, css, etc.
@@ -56,7 +56,7 @@ server {
   #Traditional SSL
   ssl_certificate /etc/nginx/ssl/friendica.example.net.chain.pem;
   ssl_certificate_key /etc/nginx/ssl/example.net.key;
-  
+
   # If you have used letsencrypt as your SSL provider, remove the previous two lines, and uncomment the following two (adjusting the path) instead.
   # ssl_certificate /etc/letsencrypt/live/example.com/fullchain.pem;
   # ssl_certificate_key /etc/letsencrypt/live/example.com/privkey.pem;
@@ -72,42 +72,37 @@ server {
   charset utf-8;
   root /var/www/friendica;
   access_log /var/log/nginx/friendica.log;
-    #Uncomment the following line to include a standard configuration file
-    #Note that the most specific rule wins and your standard configuration
-    #will therefore *add* to this file, but not override it.
+
+  # Uncomment the following line to include a standard configuration file Note
+  # that the most specific rule wins and your standard configuration will
+  # therefore *add* to this file, but not override it.
   #include standard.conf
+
   # allow uploads up to 20MB in size
   client_max_body_size 20m;
   client_body_buffer_size 128k;
 
   # rewrite to front controller as default rule
   location / {
-    if ($is_args != "") {
-        rewrite ^/(.*) /index.php?q=$uri&$args last;
-    }
-    rewrite ^/(.*) /index.php?q=$uri last;
+    try_files $uri /index.php?pagename=$uri&$args;
   }
 
   # make sure webfinger and other well known services aren't blocked
   # by denying dot files and rewrite request to the front controller
   location ^~ /.well-known/ {
     allow all;
-    rewrite ^/(.*) /index.php?q=$uri&$args last;
+    rewrite ^ /index.php?pagename=$uri;
   }
 
-  # statically serve these file types when possible
-  # otherwise fall back to front controller
-  # allow browser to cache them
-  # added .htm for advanced source code editor library
-  location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|ttf|woff|svg)$ {
-    expires 30d;
-    try_files $uri /index.php?q=$uri&$args;
-  }
+  include mime.types;
 
-  # block these file types
-  location ~* \.(tpl|md|tgz|log|out)$ {
-    deny all;
-  }
+  # statically serve these file types when possible otherwise fall back to
+  # front controller allow browser to cache them added .htm for advanced source
+  # code editor library
+  #location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|ttf|woff|svg)$ {
+  #  expires 30d;
+  #  try_files $uri /index.php?pagename=$uri&$args;
+  #}
 
   # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
   # or a unix socket
@@ -126,19 +121,24 @@ server {
     # With php5-cgi alone:
     # fastcgi_pass 127.0.0.1:9000;
 
-    # With php5-fpm:
-    fastcgi_pass unix:/var/run/php5-fpm.sock;
+    # With php7.0-fpm:
+    fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
 
     include fastcgi_params;
     fastcgi_index index.php;
     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+               
+    fastcgi_buffers 16 16k; 
+    fastcgi_buffer_size 32k;
+  }
+
+  # block these file types
+  location ~* \.(tpl|md|tgz|log|out)$ {
+    deny all;
   }
 
   # deny access to all dot files
   location ~ /\. {
     deny all;
   }
-       
 }
-
-