diff options
Diffstat (limited to 'apache2/sites-available/mail.secure-example.com')
-rw-r--r-- | apache2/sites-available/mail.secure-example.com | 57 |
1 files changed, 27 insertions, 30 deletions
diff --git a/apache2/sites-available/mail.secure-example.com b/apache2/sites-available/mail.secure-example.com index b9dea83..f01ccfb 100644 --- a/apache2/sites-available/mail.secure-example.com +++ b/apache2/sites-available/mail.secure-example.com @@ -1,44 +1,41 @@ <VirtualHost *:443> - ServerName mail.example.com:443 - ServerAdmin webmaster@example.com + ServerName mail.example.com:443 + ServerAdmin webmaster@example.com + DocumentRoot /home/webmaster/public_websites/mail.example.com/ - DocumentRoot /home/webmaster/public_websites/mail.example.com/ - - Include /etc/apache2/conf.d/local-ssl.conf - Include /etc/apache2/conf.d/horde2.conf - - <Location /horde2> - Options FollowSymLinks -MultiViews - DirectoryIndex index.php - </Location> + Include conf.d/local-ssl.conf + Include conf.d/local-php.conf + Include conf.d/local-horde3.conf + ErrorLog ${APACHE_LOG_DIR}/mail.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/mail.example.com-access.log combined </VirtualHost> <VirtualHost *:443> - ServerName www.mail.example.com:443 - ServerAlias *.mail.example.com:443 - ServerAlias mail:443 - ServerAlias *.mail:443 - ServerAdmin webmaster@example.com + ServerName www.mail.example.com:443 + ServerAlias *.mail.example.com:443 + ServerAlias mail:443 + ServerAlias *.mail:443 - Include /etc/apache2/conf.d/local-ssl.conf - Include /etc/apache2/conf.d/local-log-origin.conf + Include conf.d/local-ssl.conf + Include conf.d/local-log-origin.conf - RewriteEngine On - RewriteRule / https://mail.example.com/ [R] + RewriteEngine On + RewriteRule / https://mail.example.com/ [R] +# RewriteRule /(.*) https://mail.example.com/$1 [R] - CustomLog /var/log/apache2/redirect.log origin + CustomLog ${APACHE_LOG_DIR}/redirect.log origin </VirtualHost> <VirtualHost *:80> - ServerName mail.example.com - ServerAlias *.mail.example.com - ServerAlias mail - ServerAlias *.mail - ServerAdmin webmaster@example.com + ServerName mail.example.com + ServerAlias *.mail.example.com + ServerAlias mail + ServerAlias *.mail - Include /etc/apache2/conf.d/local-log-origin.conf + Include /etc/apache2/conf.d/local-log-origin.conf - RewriteEngine On - RewriteRule / https://mail.example.com/ [R] + RewriteEngine On + RewriteRule / https://mail.example.com/ [R] +# RewriteRule /(.*) https://mail.example.com/$1 [R] - CustomLog /var/log/apache2/redirect.log origin + CustomLog ${APACHE_LOG_DIR}/redirect.log origin </VirtualHost> |