X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=installation%2Fpleroma-apache.conf;h=992c0c900361562ed6909324a7844dc846793a1f;hb=530561a091f6f82e27ef3d5011b929b00e2da964;hp=e45ebf1075549049372c1cfee7371d137aaba5f6;hpb=d7c2909ce2e488e049a04ba6ba2a79d392d60bde;p=akkoma

diff --git a/installation/pleroma-apache.conf b/installation/pleroma-apache.conf
index e45ebf107..992c0c900 100644
--- a/installation/pleroma-apache.conf
+++ b/installation/pleroma-apache.conf
@@ -1,27 +1,56 @@
-<VirtualHost *:80>
 #Example configuration for when Apache httpd and Pleroma are on the same host.
-#Needed modules: proxy proxy_http proxy_wstunnel rewrite
+#Needed modules: headers proxy proxy_http proxy_wstunnel rewrite ssl
 #This assumes a Debian style Apache config. Put this in /etc/apache2/sites-available
-#Doesn't include SSL, just run certbot and let it take care of that.
-
+#Install your TLS certificate, possibly using Let's Encrypt.
+#Replace 'pleroma.example.com' with your instance's domain wherever it appears
 
-#Change this:
 ServerName pleroma.example.com
+ServerTokens Prod
+
+ErrorLog ${APACHE_LOG_DIR}/error.log
+CustomLog ${APACHE_LOG_DIR}/access.log combined
 
-RewriteEngine On
-RewriteCond %{HTTP:Connection} Upgrade [NC]
-RewriteCond %{HTTP:Upgrade} websocket [NC]
-RewriteRule /(.*) ws://localhost:4000/$1 [P,L]
+<VirtualHost *:80>
+    Redirect permanent / https://pleroma.example.com
+</VirtualHost>
 
-ProxyRequests off
-ProxyPass / http://localhost:4000/
-ProxyPassReverse / http://localhost:4000/
+<VirtualHost *:443>
+    SSLEngine on
+    SSLCertificateFile      /etc/letsencrypt/live/pleroma.example.com/cert.pem
+    SSLCertificateKeyFile   /etc/letsencrypt/live/pleroma.example.com/privkey.pem
+    SSLCertificateChainFile /etc/letsencrypt/live/pleroma.example.com/fullchain.pem
 
-#Change this too:
-RequestHeader set Host "pleroma.example.com"
-ProxyPreserveHost On
+    # Mozilla modern configuration, tweak to your needs
+    SSLProtocol             all -SSLv3 -TLSv1 -TLSv1.1
+    SSLCipherSuite          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:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256
+    SSLHonorCipherOrder     on
+    SSLCompression          off
+    SSLSessionTickets       off
 
-	ErrorLog ${APACHE_LOG_DIR}/error.log
-	CustomLog ${APACHE_LOG_DIR}/access.log combined
+    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'; 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"
+
+    RewriteEngine On
+    RewriteCond %{HTTP:Connection} Upgrade [NC]
+    RewriteCond %{HTTP:Upgrade} websocket [NC]
+    RewriteRule /(.*) ws://localhost:4000/$1 [P,L]
+
+    ProxyRequests off
+    ProxyPass / http://localhost:4000/
+    ProxyPassReverse / http://localhost:4000/
+
+    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