Fixes to work better on chankillo

[sysconfig/apache2.git] / sites-available / mit-proxy.conf

diff --git a/sites-available/mit-proxy.conf b/sites-available/mit-proxy.conf
index 7874705dd7e6f432a2a97d251696dc784d23a22d..7babd55198662df5320bdb57f06e1e0091fea685 100644 (file)
--- a/sites-available/mit-proxy.conf
+++ b/sites-available/mit-proxy.conf
@@ -6,8 +6,8 @@
 
 #<VirtualHost *:80>
 #    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/"
 #</VirtualHost>
 
 <IfModule mod_ssl.c>
@@ -18,41 +18,50 @@
     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
+    <IfFile "/etc/letsencrypt/live/squaresdb.dehnerts.com/">
+        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
+    </IfFile>
+    <IfFile ! "/etc/letsencrypt/live/squaresdb.dehnerts.com/">
+        #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
+    </IfFile>
 </VirtualHost>
 </IfModule>
 
 <VirtualHost *:80>
     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/
     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]
+    RewriteRule ^/.well-known/acme-challenge/(.*)$ http://zulip.augsburg.vms.dehnerts.com/.well-known/acme-challenge/$1 [P,QSA,L]
 </VirtualHost>
 
-<IfModule mod_ssl.c>
-<VirtualHost *:443>
-    ServerName 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/"
-    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
-</VirtualHost>
-</IfModule>
+#<IfModule mod_ssl.c>
+#<VirtualHost *:443>
+#    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
+#</VirtualHost>
+#</IfModule>