Update apache sample host snippets: Drop unneeded ServerAdmin for redirect hosts. Use ServerName (not ServerAlias) for TLS hosts.

6 files changed, 17 insertions, 25 deletions

diff --git a/apache2/sites-available/chat.secure-example.com b/apache2/sites-available/chat.secure-example.com
index 3e07f00..27dcda5 100644
--- a/apache2/sites-available/chat.secure-example.com
+++ b/apache2/sites-available/chat.secure-example.com
@@ -14,6 +14,7 @@
 	<Location /jwchat>
 		Options  +Indexes +Multiviews +FollowSymLinks
 	</Location>
+
 	Alias /logs /var/www/vhosts/www-ejabberd/conference
 	<Location /logs>
 		Options Indexes
@@ -25,10 +26,9 @@
 </VirtualHost>
 <VirtualHost *:443>
 	ServerName www.chat.example.com:443
-	ServerAlias *.chat.example.com:443
-	ServerAlias chat:443
-	ServerAlias *.chat:443
-	ServerAdmin webmaster@example.com
+	ServerName *.chat.example.com:443
+	ServerName chat:443
+	ServerName *.chat:443
 
 	Include conf.d/local-ssl.conf
 	Include conf.d/local-log-origin.conf
@@ -44,7 +44,6 @@
 	ServerAlias *.chat.example.com
 	ServerAlias chat
 	ServerAlias *.chat
-	ServerAdmin webmaster@example.com
 
 	Include conf.d/local-log-origin.conf
 
diff --git a/apache2/sites-available/lists.secure-example.com b/apache2/sites-available/lists.secure-example.com
index 1215390..1dc7bc9 100644
--- a/apache2/sites-available/lists.secure-example.com
+++ b/apache2/sites-available/lists.secure-example.com
@@ -14,8 +14,7 @@
 </VirtualHost>
 <VirtualHost *:443>
 	ServerName www.lists.example.com:443
-	ServerAlias *.lists.example.com:443
-	ServerAdmin webmaster@example.com
+	ServerName *.lists.example.com:443
 
 	Include conf.d/local-ssl.conf
 	Include conf.d/local-log-origin.conf
@@ -29,7 +28,6 @@
 <VirtualHost *:80>
 	ServerName lists.example.com
 	ServerAlias *.lists.example.com
-	ServerAdmin webmaster@example.com
 
 	Include conf.d/local-log-origin.conf
 
diff --git a/apache2/sites-available/mail.secure-example.com b/apache2/sites-available/mail.secure-example.com
index f01ccfb..3ba1a3a 100644
--- a/apache2/sites-available/mail.secure-example.com
+++ b/apache2/sites-available/mail.secure-example.com
@@ -12,9 +12,9 @@
 </VirtualHost>
 <VirtualHost *:443>
 	ServerName www.mail.example.com:443
-	ServerAlias *.mail.example.com:443
-	ServerAlias mail:443
-	ServerAlias *.mail:443
+	ServerName *.mail.example.com:443
+	ServerName mail:443
+	ServerName *.mail:443
 
 	Include conf.d/local-ssl.conf
 	Include conf.d/local-log-origin.conf
diff --git a/apache2/sites-available/users.secure-example.com b/apache2/sites-available/users.secure-example.com
index 10f2477..88be6ca 100644
--- a/apache2/sites-available/users.secure-example.com
+++ b/apache2/sites-available/users.secure-example.com
@@ -47,10 +47,9 @@
 #</VirtualHost>
 <VirtualHost *:443>
 	ServerName www.users.example.com:443
-	ServerAlias *.users.example.com:443
-	ServerAlias users:443
-	ServerAlias *.users:443
-	ServerAdmin webmaster@example.com
+	ServerName *.users.example.com:443
+	ServerName users:443
+	ServerName *.users:443
 
 	Include conf.d/local-ssl.conf
 	Include conf.d/local-log-origin.conf
@@ -64,8 +63,8 @@
 <VirtualHost *:80>
 	ServerName www.users.example.com
 	ServerAlias *.users.example.com
+	ServerAlias users
 	ServerAlias *.users
-	ServerAdmin webmaster@example.com
 
 	Include conf.d/local-log-origin.conf
 
diff --git a/apache2/sites-available/wiki.secure-example.com b/apache2/sites-available/wiki.secure-example.com
index 5a6c146..45fe79d 100644
--- a/apache2/sites-available/wiki.secure-example.com
+++ b/apache2/sites-available/wiki.secure-example.com
@@ -44,9 +44,8 @@
 </VirtualHost>
 <VirtualHost *:443>
 	ServerName www.wiki.example.com:443
-	ServerAlias wiki:443
-	ServerAlias *.wiki:443
-	ServerAdmin webmaster@example.com
+	ServerName wiki:443
+	ServerName *.wiki:443
 
 	Include conf.d/local-ssl.conf
 	Include conf.d/local-log-origin.conf
@@ -60,9 +59,8 @@
 <VirtualHost *:80>
 	ServerName wiki.example.com
 	ServerAlias *.wiki.example.com
-	ServerName wiki
+	ServerAlias wiki
 	ServerAlias *.wiki
-	ServerAdmin webmaster@example.com
 
 	Include conf.d/local-log-origin.conf
 
diff --git a/apache2/sites-available/www.secure-example.com b/apache2/sites-available/www.secure-example.com
index 4016d14..8aebebf 100644
--- a/apache2/sites-available/www.secure-example.com
+++ b/apache2/sites-available/www.secure-example.com
@@ -10,7 +10,6 @@
 <VirtualHost *:80>
 	ServerName example.com
 	ServerAlias *.www.example.com
-	ServerAdmin webmaster@example.com
 
 	Include conf.d/local-log-origin.conf
 
@@ -22,10 +21,9 @@
 </VirtualHost>
 <VirtualHost *:443>
 	ServerName www.example.com:443
-	ServerAlias *.example.com:443
+	ServerName *.example.com:443
 	ServerName www:443
-	ServerAlias *.www:443
-	ServerAdmin webmaster@example.com
+	ServerName *.www:443
 
 	Include conf.d/local-ssl.conf
 	Include conf.d/local-log-origin.conf