X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mods%2Fsample-nginx.config;h=5a939721082543a4a5bca88be5469101aede07b1;hb=0e01568ccd5b5ce081eff83e2ed0b888e0b6db55;hp=228c23e8bc750a4b38a16f27f502117b9452e55c;hpb=dd7392d2c5b3a392cc7fc1439720c97b968df371;p=friendica.git

diff --git a/mods/sample-nginx.config b/mods/sample-nginx.config
index 228c23e8bc..5a93972108 100644
--- a/mods/sample-nginx.config
+++ b/mods/sample-nginx.config
@@ -23,10 +23,10 @@
 ##
 # This configuration assumes your domain is example.net
 # You have a separate subdomain friendica.example.net
-# You want all Friendica traffic to be HTTPS
+# 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 Friendica installed in /mnt/friendica/www
+# You have Friendica installed in /var/www/friendica
 ##
 
 server {
@@ -34,7 +34,7 @@ server {
   server_name friendica.example.net;
 
   index index.php;
-  root /mnt/friendica/www;
+  root /var/www/friendica;
   rewrite ^ https://friendica.example.net$request_uri? permanent;
 }
 
@@ -52,46 +52,57 @@ server {
   server_name friendica.example.net;
 
   ssl on;
+
+  #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;
+
   ssl_session_timeout 5m;
-  ssl_protocols SSLv3 TLSv1;
-  ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
+  ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+  ssl_ciphers ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS;
   ssl_prefer_server_ciphers on;
 
+  fastcgi_param HTTPS on;
+
   index index.php;
   charset utf-8;
-  root /mnt/friendica/www;
+  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.
+  #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 / {
-    rewrite ^/(.*) /index.php?q=$uri&$args 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;
+    try_files $uri /index.php?pagename=$uri&$args;
   }
 
-  # 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
@@ -110,17 +121,21 @@ 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;
   }
 
+  # block these file types
+  location ~* \.(tpl|md|tgz|log|out)$ {
+    deny all;
+  }
+
   # deny access to all dot files
   location ~ /\. {
     deny all;
   }
 }
-