X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=installation%2Fpleroma.nginx;h=94db8d685b083175657ae3476ad59d9e3d49084b;hb=56c49513e0f66fe6e40724c6b7f18c29263c77ca;hp=e9eeb1848125304190cb0c61f1679644288011dc;hpb=678df59d22165ac91d659901fcbefbd6384c6e87;p=akkoma

diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index e9eeb1848..94db8d685 100644
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -31,9 +31,9 @@ server {
     listen 443 ssl http2;
     ssl_session_timeout 5m;
 
-    ssl_trusted_certificate   /etc/letsencrypt/live/example.tld/fullchain.pem;
-    ssl_certificate           /etc/letsencrypt/live/example.tld/fullchain.pem;
-    ssl_certificate_key       /etc/letsencrypt/live/example.tld/privkey.pem;
+    ssl_trusted_certificate   /etc/letsencrypt/live/$server_name/fullchain.pem;
+    ssl_certificate           /etc/letsencrypt/live/$server_name/fullchain.pem;
+    ssl_certificate_key       /etc/letsencrypt/live/$server_name/privkey.pem;
 
     # Add TLSv1.0 to support older devices
     ssl_protocols TLSv1.2;
@@ -41,10 +41,12 @@ server {
     # ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES";
     ssl_ciphers "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";
     ssl_prefer_server_ciphers on;
+    # In case of an old server with an OpenSSL version of 1.0.2 or below,
+    # leave only prime256v1 or comment out the following line.
     ssl_ecdh_curve X25519:prime256v1:secp384r1:secp521r1;
     ssl_stapling on;
     ssl_stapling_verify on;
-    
+
     server_name example.tld;
 
     gzip_vary on;
@@ -69,15 +71,16 @@ server {
         }
         # stop removing lines here.
 
-        add_header X-XSS-Protection "1; mode=block";
-        add_header X-Permitted-Cross-Domain-Policies none;
-        add_header X-Frame-Options DENY;
-        add_header X-Content-Type-Options nosniff;
-        add_header Referrer-Policy same-origin;
-        add_header X-Download-Options noopen;
-        
+        add_header X-XSS-Protection "1; mode=block" always;
+        add_header X-Permitted-Cross-Domain-Policies "none" always;
+        add_header X-Frame-Options "DENY" always;
+        add_header X-Content-Type-Options "nosniff" always;
+        add_header Referrer-Policy "same-origin" always;
+        add_header X-Download-Options "noopen" always;
+        add_header Content-Security-Policy "default-src 'none'; base-uri 'self'; form-action *; frame-ancestors 'none'; img-src 'self' data: https:; media-src 'self' https:; style-src 'self' 'unsafe-inline'; font-src 'self'; script-src 'self'; connect-src 'self' wss://$server_name; upgrade-insecure-requests;" always;
+
         # Uncomment this only after you get HTTPS working.
-        # add_header Strict-Transport-Security "max-age=31536000; includeSubDomains";
+        # add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
 
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;