From bf626993f414a0228ebd127ecb24f64174fb8c37 Mon Sep 17 00:00:00 2001
From: Tomas Bures <bures@d3s.mff.cuni.cz>
Date: Tue, 25 Dec 2018 13:12:11 +0100
Subject: [PATCH] Updates sample of HTTPS proxy config for Apache

---
 .gitmodules                        |  0
 setup/mailtrain-apache-sample.conf | 44 +++++++++++++++---------------
 2 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 .gitmodules

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29b..00000000
diff --git a/setup/mailtrain-apache-sample.conf b/setup/mailtrain-apache-sample.conf
index 4cad7448..b1e38f4a 100644
--- a/setup/mailtrain-apache-sample.conf
+++ b/setup/mailtrain-apache-sample.conf
@@ -2,7 +2,7 @@
 # Note that you will need mod_proxy and mod_ssl modules installed and enabled
 
 # This setup assumes three DNS names:
-# - mail.example.org - public endpoint used for subscriptions, campaign images, etc.
+# - lists.example.org - public endpoint used for subscriptions, campaign images, etc.
 # - mailtrain.example.org - UI for administration and send out emails
 # - sbox.mailtrain.example.org - sandbox for templates (to prevent potential XSS attacks in templates)
 
@@ -10,21 +10,21 @@
 
 # You will need to customize this for your setup. In the least, this means:
 # - replace "example.org" with your domain
-# - point to your certificate (look for /etc/letsencrypt/live/mail.example.org in the config below)
+# - point to your certificate (look for /etc/letsencrypt/live/lists.example.org in the config below)
 
-<VirtualHost mail.example.org:80>
-    ServerName mail.example.org
+<VirtualHost *:80>
+    ServerName lists.example.org
 
     ServerSignature Off
 
     RewriteEngine On
     RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,QSA,R=permanent]
 
-    ErrorLog logs/mail.example.org_redirect_error.log
+    ErrorLog logs/lists.example.org_redirect_error.log
     LogLevel warn
 </VirtualHost>
 
-<VirtualHost mailtrain.example.org:80>
+<VirtualHost *:80>
     ServerName mailtrain.example.org
 
     ServerSignature Off
@@ -36,7 +36,7 @@
     LogLevel warn
 </VirtualHost>
 
-<VirtualHost sbox.mailtrain.example.org:80>
+<VirtualHost *:80>
     ServerName sbox.mailtrain.example.org
 
     ServerSignature Off
@@ -48,24 +48,24 @@
     LogLevel warn
 </VirtualHost>
 
-<VirtualHost mail.example.org:443>
-    ServerName mail.example.org:443
+<VirtualHost *:443>
+    ServerName lists.example.org:443
 
-    ErrorLog logs/mail.example.org_ssl_error.log
-    TransferLog logs/mail.example.org_ssl_access.log
+    ErrorLog logs/lists.example.org_ssl_error.log
+    TransferLog logs/lists.example.org_ssl_access.log
     LogLevel warn
 
     SSLEngine on
-    SSLCertificateFile /etc/letsencrypt/live/mail.example.org/cert.pem
-    SSLCertificateKeyFile /etc/letsencrypt/live/mail.example.org/privkey.pem
-    SSLCertificateChainFile /etc/letsencrypt/live/mail.example.org/chain.pem
+    SSLCertificateFile /etc/letsencrypt/live/lists.example.org/cert.pem
+    SSLCertificateKeyFile /etc/letsencrypt/live/lists.example.org/privkey.pem
+    SSLCertificateChainFile /etc/letsencrypt/live/lists.example.org/chain.pem
 
     ProxyPreserveHost On
     ProxyPass "/" "http://127.0.0.1:3004/"
     ProxyPassReverse "/" "http://127.0.0.1:3004/"
 </VirtualHost>
 
-<VirtualHost mailtrain.example.org:443>
+<VirtualHost *:443>
     ServerName mailtrain.example.org:443
 
     ErrorLog logs/mailtrain.example.org_ssl_error.log
@@ -73,16 +73,16 @@
     LogLevel warn
 
     SSLEngine on
-    SSLCertificateFile /etc/letsencrypt/live/mail.example.org/cert.pem
-    SSLCertificateKeyFile /etc/letsencrypt/live/mail.example.org/privkey.pem
-    SSLCertificateChainFile /etc/letsencrypt/live/mail.example.org/chain.pem
+    SSLCertificateFile /etc/letsencrypt/live/lists.example.org/cert.pem
+    SSLCertificateKeyFile /etc/letsencrypt/live/lists.example.org/privkey.pem
+    SSLCertificateChainFile /etc/letsencrypt/live/lists.example.org/chain.pem
 
     ProxyPreserveHost On
     ProxyPass "/" "http://127.0.0.1:3000/"
     ProxyPassReverse "/" "http://127.0.0.1:3000/"
 </VirtualHost>
 
-<VirtualHost sbox.mailtrain.example.org:443>
+<VirtualHost *:443>
     ServerName sbox.mailtrain.example.org:443
 
     ErrorLog logs/sbox.mailtrain.example.org_ssl_error.log
@@ -90,9 +90,9 @@
     LogLevel warn
 
     SSLEngine on
-    SSLCertificateFile /etc/letsencrypt/live/mail.example.org/cert.pem
-    SSLCertificateKeyFile /etc/letsencrypt/live/mail.example.org/privkey.pem
-    SSLCertificateChainFile /etc/letsencrypt/live/mail.example.org/chain.pem
+    SSLCertificateFile /etc/letsencrypt/live/lists.example.org/cert.pem
+    SSLCertificateKeyFile /etc/letsencrypt/live/lists.example.org/privkey.pem
+    SSLCertificateChainFile /etc/letsencrypt/live/lists.example.org/chain.pem
 
     ProxyPreserveHost On
     ProxyPass "/" "http://127.0.0.1:3003/"