diff options
| -rw-r--r-- | apache2/sites-available/mail.secure-example.com | 5 | ||||
| -rw-r--r-- | apache2/sites-available/people.secure-example.com | 2 | ||||
| -rw-r--r-- | apache2/sites-available/wiki.secure-example.com | 18 |
3 files changed, 11 insertions, 14 deletions
diff --git a/apache2/sites-available/mail.secure-example.com b/apache2/sites-available/mail.secure-example.com index ce9bd8f..7131e8b 100644 --- a/apache2/sites-available/mail.secure-example.com +++ b/apache2/sites-available/mail.secure-example.com @@ -1,6 +1,5 @@ <VirtualHost *:443> ServerName mail.secure-example.com:443 - ServerAlias mail ServerAdmin webmaster@secure-example.com DocumentRoot /home/webmaster/public_websites/mail.secure-example.com/ @@ -15,6 +14,8 @@ <VirtualHost *:443> ServerName www.mail.secure-example.com:443 ServerAlias *.mail.secure-example.com:443 + ServerAlias mail:443 + ServerAlias *.mail:443 ServerAdmin webmaster@secure-example.com Include /etc/apache2/conf.d/local-ssl.conf @@ -27,6 +28,8 @@ <VirtualHost *:80> ServerName mail.secure-example.com ServerAlias *.mail.secure-example.com + ServerAlias mail + ServerAlias *.mail ServerAdmin webmaster@secure-example.com RewriteEngine On diff --git a/apache2/sites-available/people.secure-example.com b/apache2/sites-available/people.secure-example.com index c561513..0d9b522 100644 --- a/apache2/sites-available/people.secure-example.com +++ b/apache2/sites-available/people.secure-example.com @@ -29,6 +29,8 @@ <VirtualHost *:443> ServerName people.secure-example.com:443 ServerAlias *.people.secure-example.com:443 + ServerAlias people:443 + ServerAlias *.people:443 ServerAdmin webmaster@secure-example.com Include /etc/apache2/conf.d/local-ssl.conf diff --git a/apache2/sites-available/wiki.secure-example.com b/apache2/sites-available/wiki.secure-example.com index f77da15..9102d72 100644 --- a/apache2/sites-available/wiki.secure-example.com +++ b/apache2/sites-available/wiki.secure-example.com @@ -1,6 +1,5 @@ <VirtualHost *:443> ServerName wiki.secure-example.com - ServerAlias wiki ServerAdmin webmaster@secure-example.com DocumentRoot /usr/share/moin/htdocs @@ -49,7 +48,8 @@ </VirtualHost> <VirtualHost *:443> ServerName www.wiki.secure-example.com:443 - ServerAlias *.wiki.secure-example.com:443 + ServerAlias wiki:443 + ServerAlias *.wiki:443 ServerAdmin webmaster@secure-example.com Include /etc/apache2/conf.d/local-ssl.conf @@ -62,6 +62,9 @@ </VirtualHost> <VirtualHost *:80> ServerName wiki.secure-example.com + ServerAlias *.wiki.secure-example.com + ServerName wiki + ServerAlias *.wiki ServerAdmin webmaster@secure-example.com RewriteEngine On @@ -70,14 +73,3 @@ TransferLog /dev/null </VirtualHost> -<VirtualHost *:80> - ServerName www.wiki.secure-example.com - ServerAlias *.wiki.secure-example.com - ServerAdmin webmaster@secure-example.com - - RewriteEngine On - RewriteRule / https://wiki.secure-example.com/ [R] -# RewriteRule /(.*)? https://wiki.secure-example.com/$1 [R] - - TransferLog /dev/null -</VirtualHost> |