X-Git-Url: https://dehnerts.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sites-available%2Fmit-proxy.conf;h=1ac172ff0d60223f09ecb977c00072ad297d8220;hb=ecf63c258eb2736fec128303a72a157b3acb3bce;hp=088d5d3f04eba30d458969d4aeb8ccd337d94a4a;hpb=3be7dceb6a9812dcd7e8c633b9da6e4ec17b49fa;p=sysconfig%2Fapache2.git
diff --git a/sites-available/mit-proxy.conf b/sites-available/mit-proxy.conf
index 088d5d3..1ac172f 100644
--- a/sites-available/mit-proxy.conf
+++ b/sites-available/mit-proxy.conf
@@ -22,9 +22,16 @@
ProxyPassReverse "/" "https://squaresdb.augsburg.vms.dehnerts.com/"
ProxyPreserveHost on
Include sites-common/ssl-common
- SSLCertificateFile /etc/letsencrypt/live/squaresdb.dehnerts.com/fullchain.pem
- SSLCertificateChainFile /etc/letsencrypt/live/squaresdb.dehnerts.com/fullchain.pem
- SSLCertificateKeyFile /etc/letsencrypt/live/squaresdb.dehnerts.com/privkey.pem
+
+ SSLCertificateFile /etc/letsencrypt/live/squaresdb.dehnerts.com/fullchain.pem
+ SSLCertificateChainFile /etc/letsencrypt/live/squaresdb.dehnerts.com/fullchain.pem
+ SSLCertificateKeyFile /etc/letsencrypt/live/squaresdb.dehnerts.com/privkey.pem
+
+
+ #Warning "correct default cert not detected, falling back to snakeoil"
+ SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
+ SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
+
@@ -34,27 +41,34 @@
ProxyPassReverse "/" "http://zulip.augsburg.vms.dehnerts.com/"
ProxyPreserveHost on
- DocumentRoot /var/www/letsencrypt-verify/
+ DocumentRoot /var/www/html/
RewriteEngine on
- RewriteCond /var/www/letsencrypt-verify/%{REQUEST_URI} !-f
+ RewriteCond /var/www/html/%{REQUEST_URI} !-f
RewriteRule ^/.well-known/acme-challenge/(.*)$ http://zulip.augsburg.vms.dehnerts.com/.well-known/acme-challenge/$1 [P,QSA,L]
-#
-#
-# ServerName zulip.dehnerts.com
-# ServerAlias *.zulip.dehnerts.com
-# SSLProxyEngine on
-# SSLProxyVerify require
-# SSLProxyVerifyDepth 2
-# SSLProxyCACertificatePath /etc/ssl/certs
-# SSLProxyCheckPeerName on
-# ProxyPass "/" "https://zulip.augsburg.vms.dehnerts.com/"
-# ProxyPassReverse "/" "https://zulip.augsburg.vms.dehnerts.com/"
-# ProxyPreserveHost on
-# Include sites-common/ssl-common
-# SSLCertificateFile /etc/letsencrypt/live/zulip.dehnerts.com/fullchain.pem
-# SSLCertificateChainFile /etc/letsencrypt/live/zulip.dehnerts.com/fullchain.pem
-# SSLCertificateKeyFile /etc/letsencrypt/live/zulip.dehnerts.com/privkey.pem
-#
-#
+
+
+ ServerName zulip.dehnerts.com
+ ServerAlias *.zulip.dehnerts.com
+ SSLProxyEngine on
+ SSLProxyVerify require
+ SSLProxyVerifyDepth 2
+ SSLProxyCACertificatePath /etc/ssl/certs
+ SSLProxyCheckPeerName on
+ ProxyPass "/" "https://zulip.augsburg.vms.dehnerts.com/"
+ ProxyPassReverse "/" "https://zulip.augsburg.vms.dehnerts.com/"
+ ProxyPreserveHost on
+ Include sites-common/ssl-common
+
+ SSLCertificateFile /etc/letsencrypt/live/zulip.dehnerts.com/fullchain.pem
+ SSLCertificateChainFile /etc/letsencrypt/live/zulip.dehnerts.com/fullchain.pem
+ SSLCertificateKeyFile /etc/letsencrypt/live/zulip.dehnerts.com/privkey.pem
+
+
+ #Warning "correct default cert not detected, falling back to snakeoil"
+ SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
+ SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
+
+
+