X-Git-Url: https://dehnerts.com/gitweb/?a=blobdiff_plain;f=sites-available%2Fmit-proxy.conf;h=1ac172ff0d60223f09ecb977c00072ad297d8220;hb=ecf63c258eb2736fec128303a72a157b3acb3bce;hp=7874705dd7e6f432a2a97d251696dc784d23a22d;hpb=6e738007029f47e0bc0dafdf76ccc7089eeb4ad9;p=sysconfig%2Fapache2.git
diff --git a/sites-available/mit-proxy.conf b/sites-available/mit-proxy.conf
index 7874705..1ac172f 100644
--- a/sites-available/mit-proxy.conf
+++ b/sites-available/mit-proxy.conf
@@ -6,8 +6,8 @@
#
# ServerName squaresdb.dehnerts.com
-# ProxyPass "/" "http://squaresdb.lushan-vms.dehnerts.com/"
-# ProxyPassReverse "/" "http://squaresdb.lushan-vms.dehnerts.com/"
+# ProxyPass "/" "http://squaresdb.augsburg.vms.dehnerts.com/"
+# ProxyPassReverse "/" "http://squaresdb.augsburg.vms.dehnerts.com/"
#
@@ -18,41 +18,57 @@
SSLProxyVerifyDepth 2
SSLProxyCACertificatePath /etc/ssl/certs
SSLProxyCheckPeerName on
- ProxyPass "/" "https://squaresdb.lushan-vms.dehnerts.com/"
- ProxyPassReverse "/" "https://squaresdb.lushan-vms.dehnerts.com/"
+ ProxyPass "/" "https://squaresdb.augsburg.vms.dehnerts.com/"
+ 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
+
ServerName zulip.dehnerts.com
- ProxyPassReverse "/" "http://zulip.lushan-vms.dehnerts.com/"
+ ServerAlias *.zulip.dehnerts.com
+ 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
- RewriteRule ^/.well-known/acme-challenge/(.*)$ http://zulip.lushan-vms.dehnerts.com/.well-known/acme-challenge/$1 [P,QSA,L]
+ 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.lushan-vms.dehnerts.com/"
- ProxyPassReverse "/" "https://zulip.lushan-vms.dehnerts.com/"
+ 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
+
+ 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
+