Fix: Ensure that the value is set.

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

diff --git a/mods/sample-nginx.config b/mods/sample-nginx.config
index e1994dcd3333dae0984aabc50ff5e833cf2f3953..829bfc70af40c74f605c6b8e63fd758129be94b9 100644 (file)
--- a/mods/sample-nginx.config
+++ b/mods/sample-nginx.config
@@ -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;
@@ -82,27 +82,21 @@ server {
 
   # rewrite to front controller as default rule
   location / {
-    if ($is_args != "") {
-        rewrite ^/(.*) /index.php?pagename=$uri&$args last;
+    if (!-e $request_filename) {
+      rewrite ^(.*)$ /index.php?pagename=$1;
     }
-    rewrite ^/(.*) /index.php?pagename=$uri last;
   }
 
   # 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?pagename=$uri&$args last;
+   if (!-e $request_filename) {
+     rewrite ^(.*)$ /index.php?pagename=$1;
+   }
   }
 
-  # 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;
-  }
+  include mime.types;
 
   # block these file types
   location ~* \.(tpl|md|tgz|log|out)$ {
@@ -126,8 +120,8 @@ 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;