X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mods%2Fsample-nginx-certbot.config;h=dd4b11bcb61bb55ebe48683cda205a7f5d2cfad6;hb=cc5c3426fe5da01257a458ca0067cd6ee5ec60f3;hp=e0b6073ba4803750d4ff40cde49bde858032e526;hpb=960477cfaa2ca383063d5aeb0b01ef54157bc150;p=friendica.git diff --git a/mods/sample-nginx-certbot.config b/mods/sample-nginx-certbot.config index e0b6073ba4..dd4b11bcb6 100644 --- a/mods/sample-nginx-certbot.config +++ b/mods/sample-nginx-certbot.config @@ -1,6 +1,6 @@ ## -# Friendica Nginx configuration template to be autocnfgiured with cerbot -# nased on sample-nginx.config by Olaf Conradi +# Friendica Nginx configuration template to be autoconfigured with certbot +# based on sample-nginx.config by Olaf Conradi # # On Debian based distributions you can add this file to # /etc/nginx/sites-available @@ -30,12 +30,29 @@ ## # This configuration assumes your domain is example.net # You have a separate subdomain friendica.example.net -# You want all Friendica traffic to be https using letsencrypt with cerbot +# You want all Friendica traffic to be https using letsencrypt with certbot # You have an SSL certificate and key for your subdomain # You have PHP FastCGI Process Manager (php7.4-fpm) running on localhost # You have Friendica installed in /var/www/friendica ## +## +# by https://syshero.org/2018-04-13-nginx-unique-request-identifier/ +# if X-Request-ID is set, NGINX will forward the same value to the next upstream +# if the header is not set, NGINX will generate a random request identifier and add it to the request. +# +# To guarantee backward compatibility, map to format the $request_id variable to a format that matches any old setups. +## + +map $request_id $formatted_id { + "~*(?[0-9a-f]{8})(?[0-9a-f]{4})(?[0-9a-f]{4})(?[0-9a-f]{4})(?.*)$" "${p1}-${p2}-${p3}-${p4}-${p5}"; +} + +map $http_x_request_id $uuid { + default "${request_id}"; + ~* "${http_x_request_id}"; +} + server { listen 80; server_name friendica.example.net; @@ -45,7 +62,7 @@ server { # Logging access_log /var/log/nginx/friendica_access.log; - # uncomment the following line if you would like to log errors in a seperate file for friendica + # uncomment the following line if you would like to log errors in a separate file for friendica #error_log /var/log/nginx/friendica_error.log; index index.php; @@ -59,6 +76,9 @@ server { # allow uploads up to 20MB in size client_max_body_size 20m; client_body_buffer_size 128k; + + # add the request id header to show it in the HTTP header output + add_header X-Request-ID $uuid; # rewrite to front controller as default rule location / { @@ -105,6 +125,8 @@ server { include fastcgi_params; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + + fastcgi_param HTTP_X_REQUEST_ID $uuid; fastcgi_buffers 16 16k; fastcgi_buffer_size 32k;