X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=installation%2Fpleroma-apache.conf;h=d5e75044fc578ef05232a165db465c526ddd7e6d;hb=49cf5f9ce04e79da5d6ceb16f4043eeaade9b211;hp=e45ebf1075549049372c1cfee7371d137aaba5f6;hpb=2d0a2d94663bb38319c6d75d91836c32f9ac178e;p=akkoma

diff --git a/installation/pleroma-apache.conf b/installation/pleroma-apache.conf
index e45ebf107..d5e75044f 100644
--- a/installation/pleroma-apache.conf
+++ b/installation/pleroma-apache.conf
@@ -1,27 +1,54 @@
-<VirtualHost *:80>
-#Example configuration for when Apache httpd and Pleroma are on the same host.
-#Needed modules: proxy proxy_http proxy_wstunnel rewrite
-#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.
+# default Apache site config for Pleroma
+#
+# needed modules: define headers proxy proxy_http proxy_wstunnel rewrite ssl
+#
+# Simple installation instructions:
+# 1. Install your TLS certificate, possibly using Let's Encrypt.
+# 2. Replace 'example.tld' with your instance's domain wherever it appears.
+# 3. This assumes a Debian style Apache config. Copy this file to
+#    /etc/apache2/sites-available/ and then add a symlink to it in
+#    /etc/apache2/sites-enabled/ by running 'a2ensite pleroma-apache.conf', then restart Apache.
+
+Define servername example.tld
+
+ServerName ${servername}
+ServerTokens Prod
 
+ErrorLog ${APACHE_LOG_DIR}/error.log
+CustomLog ${APACHE_LOG_DIR}/access.log combined
 
-#Change this:
-ServerName pleroma.example.com
+<VirtualHost *:80>
+    Redirect permanent / https://${servername}
+</VirtualHost>
 
-RewriteEngine On
-RewriteCond %{HTTP:Connection} Upgrade [NC]
-RewriteCond %{HTTP:Upgrade} websocket [NC]
-RewriteRule /(.*) ws://localhost:4000/$1 [P,L]
+<VirtualHost *:443>
+    SSLEngine on
+    SSLCertificateFile      /etc/letsencrypt/live/${servername}/cert.pem
+    SSLCertificateKeyFile   /etc/letsencrypt/live/${servername}/privkey.pem
+    SSLCertificateChainFile /etc/letsencrypt/live/${servername}/fullchain.pem
 
-ProxyRequests off
-ProxyPass / http://localhost:4000/
-ProxyPassReverse / http://localhost:4000/
+    # 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
 
-#Change this too:
-RequestHeader set Host "pleroma.example.com"
-ProxyPreserveHost On
+    RewriteEngine On
+    RewriteCond %{HTTP:Connection} Upgrade [NC]
+    RewriteCond %{HTTP:Upgrade} websocket [NC]
+    RewriteRule /(.*) ws://localhost:4000/$1 [P,L]
 
-	ErrorLog ${APACHE_LOG_DIR}/error.log
-	CustomLog ${APACHE_LOG_DIR}/access.log combined
+    ProxyRequests off
+    ProxyPass / http://localhost:4000/
+    ProxyPassReverse / http://localhost:4000/
 
+    RequestHeader set Host ${servername}
+    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)