X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=installation%2Fpleroma-apache.conf;h=992c0c900361562ed6909324a7844dc846793a1f;hb=43d0b7bf7ae0e44366a56a6e0b9172b0caedd14a;hp=bf8db63ad587406a96fe0b1a9816f61d8e98fda7;hpb=64388c420a782fecf8cc51c14a353a9e7ebffc00;p=akkoma

diff --git a/installation/pleroma-apache.conf b/installation/pleroma-apache.conf
index bf8db63ad..992c0c900 100644
--- a/installation/pleroma-apache.conf
+++ b/installation/pleroma-apache.conf
@@ -27,17 +27,11 @@ CustomLog ${APACHE_LOG_DIR}/access.log combined
     SSLCompression          off
     SSLSessionTickets       off
 
-    # OCSP Stapling, only in httpd 2.3.3 and later
-    SSLUseStapling          on
-    SSLStaplingResponderTimeout 5
-    SSLStaplingReturnResponderErrors off
-    SSLStaplingCache        shmcb:/var/run/ocsp(128000)
-
     Header always set X-Xss-Protection "1; mode=block"
     Header always set X-Frame-Options "DENY"
     Header always set X-Content-Type-Options "nosniff"
     Header always set Referrer-Policy same-origin
-    Header always set Content-Security-Policy "default-src 'none'; base-uri 'self'; form-action 'self'; img-src 'self' data: https:; media-src 'self' https:; style-src 'self' 'unsafe-inline'; font-src 'self'; script-src 'self'; connect-src 'self' wss://pleroma.example.tld; upgrade-insecure-requests;"
+    Header always set Content-Security-Policy "default-src 'none'; base-uri 'self'; form-action 'self'; 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://pleroma.example.tld; upgrade-insecure-requests;"
 
     # Uncomment this only after you get HTTPS working.
     # Header always set Strict-Transport-Security "max-age=31536000; includeSubDomains"
@@ -54,3 +48,9 @@ CustomLog ${APACHE_LOG_DIR}/access.log combined
     RequestHeader set Host "pleroma.example.com"
     ProxyPreserveHost On
 </VirtualHost>
+
+# OCSP Stapling, only in httpd 2.3.3 and later
+SSLUseStapling          on
+SSLStaplingResponderTimeout 5
+SSLStaplingReturnResponderErrors off
+SSLStaplingCache        shmcb:/var/run/ocsp(128000)
\ No newline at end of file