From 9838977384612043d9447c8e6f869e8436eb9ff8 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 3 Apr 2006 12:32:32 +0000 Subject: Use example.com (not secure-example.com). --- apache2/sites-available/lists.secure-example.com | 26 ++++++++++---------- apache2/sites-available/mail.secure-example.com | 22 ++++++++--------- apache2/sites-available/people.secure-example.com | 30 +++++++++++------------ apache2/sites-available/wiki.secure-example.com | 22 ++++++++--------- apache2/sites-available/www.secure-example.com | 16 ++++++------ 5 files changed, 58 insertions(+), 58 deletions(-) (limited to 'apache2/sites-available') diff --git a/apache2/sites-available/lists.secure-example.com b/apache2/sites-available/lists.secure-example.com index 9115930..1c82dd7 100644 --- a/apache2/sites-available/lists.secure-example.com +++ b/apache2/sites-available/lists.secure-example.com @@ -1,8 +1,8 @@ - ServerName lists.secure-example.com:443 + ServerName lists.example.com:443 ServerAlias lists - ServerAdmin webmaster@secure-example.com - DocumentRoot /home/webmaster/public_websites/lists.secure-example.com/ + ServerAdmin webmaster@example.com + DocumentRoot /home/webmaster/public_websites/lists.example.com/ Include /etc/apache2/conf.d/local-ssl.conf @@ -24,26 +24,26 @@ ErrorLog "| /usr/sbin/vlogger -s error.log -u admin -g admin -t '%Y.%m.%d' -e /home/webmaster/weblogs/ERRORS" - ServerName www.lists.secure-example.com:443 - ServerAlias *.lists.secure-example.com:443 - ServerAdmin webmaster@secure-example.com + ServerName www.lists.example.com:443 + ServerAlias *.lists.example.com:443 + ServerAdmin webmaster@example.com Include /etc/apache2/conf.d/local-ssl.conf RewriteEngine On - RewriteRule / https://lists.secure-example.com/ [R] -# RewriteRule /(.*) https://lists.secure-example.com/$1 [R] + RewriteRule / https://lists.example.com/ [R] +# RewriteRule /(.*) https://lists.example.com/$1 [R] TransferLog /dev/null - ServerName lists.secure-example.com - ServerAlias *.lists.secure-example.com - ServerAdmin webmaster@secure-example.com + ServerName lists.example.com + ServerAlias *.lists.example.com + ServerAdmin webmaster@example.com RewriteEngine On - RewriteRule / https://lists.secure-example.com/ [R] -# RewriteRule /(.*) https://lists.secure-example.com/$1 [R] + RewriteRule / https://lists.example.com/ [R] +# RewriteRule /(.*) https://lists.example.com/$1 [R] TransferLog /dev/null diff --git a/apache2/sites-available/mail.secure-example.com b/apache2/sites-available/mail.secure-example.com index 7131e8b..bff57d4 100644 --- a/apache2/sites-available/mail.secure-example.com +++ b/apache2/sites-available/mail.secure-example.com @@ -1,7 +1,7 @@ - ServerName mail.secure-example.com:443 - ServerAdmin webmaster@secure-example.com - DocumentRoot /home/webmaster/public_websites/mail.secure-example.com/ + ServerName mail.example.com:443 + ServerAdmin webmaster@example.com + DocumentRoot /home/webmaster/public_websites/mail.example.com/ Include /etc/apache2/conf.d/local-ssl.conf @@ -12,28 +12,28 @@ - ServerName www.mail.secure-example.com:443 - ServerAlias *.mail.secure-example.com:443 + ServerName www.mail.example.com:443 + ServerAlias *.mail.example.com:443 ServerAlias mail:443 ServerAlias *.mail:443 - ServerAdmin webmaster@secure-example.com + ServerAdmin webmaster@example.com Include /etc/apache2/conf.d/local-ssl.conf RewriteEngine On - RewriteRule / https://mail.secure-example.com/ [R] + RewriteRule / https://mail.example.com/ [R] TransferLog /dev/null - ServerName mail.secure-example.com - ServerAlias *.mail.secure-example.com + ServerName mail.example.com + ServerAlias *.mail.example.com ServerAlias mail ServerAlias *.mail - ServerAdmin webmaster@secure-example.com + ServerAdmin webmaster@example.com RewriteEngine On - RewriteRule / https://mail.secure-example.com/ [R] + RewriteRule / https://mail.example.com/ [R] TransferLog /dev/null diff --git a/apache2/sites-available/people.secure-example.com b/apache2/sites-available/people.secure-example.com index 0d9b522..e8709ed 100644 --- a/apache2/sites-available/people.secure-example.com +++ b/apache2/sites-available/people.secure-example.com @@ -1,43 +1,43 @@ - ServerName people.secure-example.com + ServerName people.example.com ServerAlias people - ServerAdmin webmaster@secure-example.com - DocumentRoot /home/webmaster/public_websites/people.secure-example.com/ + ServerAdmin webmaster@example.com + DocumentRoot /home/webmaster/public_websites/people.example.com/ Include /etc/apache2/conf.d/local-userdir.conf Include /etc/apache2/conf.d/local-macvolumes.conf RewriteEngine On - RewriteRule ^/-(.*)$ http://people.secure-example.com/~$1 [R] - RewriteRule ^/([^~].*)$ http://people.secure-example.com/~$1 [R] + RewriteRule ^/-(.*)$ http://people.example.com/~$1 [R] + RewriteRule ^/([^~].*)$ http://people.example.com/~$1 [R] Include /etc/apache2/conf.d/local-log-vhosts.conf CustomLog "| /usr/sbin/vlogger -s access.log -u admin -g admin -t '%Y.%m.%d' /home/webmaster/weblogs" combined_vlogger ErrorLog "| /usr/sbin/vlogger -s error.log -u admin -g admin -t '%Y.%m.%d' -e /home/webmaster/weblogs/ERRORS" - ServerName www.people.secure-example.com - ServerAlias *.people.secure-example.com - ServerAdmin webmaster@secure-example.com + ServerName www.people.example.com + ServerAlias *.people.example.com + ServerAdmin webmaster@example.com RewriteEngine On - RewriteRule / http://people.secure-example.com/ [R] -# RewriteRule /(.*) http://people.secure-example.com/$1 [R] + RewriteRule / http://people.example.com/ [R] +# RewriteRule /(.*) http://people.example.com/$1 [R] TransferLog /dev/null - ServerName people.secure-example.com:443 - ServerAlias *.people.secure-example.com:443 + ServerName people.example.com:443 + ServerAlias *.people.example.com:443 ServerAlias people:443 ServerAlias *.people:443 - ServerAdmin webmaster@secure-example.com + ServerAdmin webmaster@example.com Include /etc/apache2/conf.d/local-ssl.conf RewriteEngine On - RewriteRule / http://people.secure-example.com/ [R] -# RewriteRule /(.*) http://people.secure-example.com/$1 [R] + RewriteRule / http://people.example.com/ [R] +# RewriteRule /(.*) http://people.example.com/$1 [R] TransferLog /dev/null diff --git a/apache2/sites-available/wiki.secure-example.com b/apache2/sites-available/wiki.secure-example.com index 9102d72..04cf7e0 100644 --- a/apache2/sites-available/wiki.secure-example.com +++ b/apache2/sites-available/wiki.secure-example.com @@ -1,6 +1,6 @@ - ServerName wiki.secure-example.com - ServerAdmin webmaster@secure-example.com + ServerName wiki.example.com + ServerAdmin webmaster@example.com DocumentRoot /usr/share/moin/htdocs Include /etc/apache2/conf.d/local-ssl.conf @@ -47,29 +47,29 @@ ErrorLog "| /usr/sbin/vlogger -s error.log -u admin -g admin -t '%Y.%m.%d' -e /home/webmaster/weblogs/ERRORS" - ServerName www.wiki.secure-example.com:443 + ServerName www.wiki.example.com:443 ServerAlias wiki:443 ServerAlias *.wiki:443 - ServerAdmin webmaster@secure-example.com + ServerAdmin webmaster@example.com Include /etc/apache2/conf.d/local-ssl.conf RewriteEngine On -# RewriteRule / https://wiki.secure-example.com/ [R] - RewriteRule /(.*)? https://wiki.secure-example.com/$1 [R] +# RewriteRule / https://wiki.example.com/ [R] + RewriteRule /(.*)? https://wiki.example.com/$1 [R] TransferLog /dev/null - ServerName wiki.secure-example.com - ServerAlias *.wiki.secure-example.com + ServerName wiki.example.com + ServerAlias *.wiki.example.com ServerName wiki ServerAlias *.wiki - ServerAdmin webmaster@secure-example.com + ServerAdmin webmaster@example.com RewriteEngine On -# RewriteRule / https://wiki.secure-example.com/ [R] - RewriteRule /(.*)? https://wiki.secure-example.com/$1 [R] +# RewriteRule / https://wiki.example.com/ [R] + RewriteRule /(.*)? https://wiki.example.com/$1 [R] TransferLog /dev/null diff --git a/apache2/sites-available/www.secure-example.com b/apache2/sites-available/www.secure-example.com index 4d9d940..6510f04 100644 --- a/apache2/sites-available/www.secure-example.com +++ b/apache2/sites-available/www.secure-example.com @@ -1,21 +1,21 @@ - ServerName www.secure-example.com + ServerName www.example.com ServerAlias www - ServerAdmin webmaster@secure-example.com - DocumentRoot /home/webmaster/public_websites/www.secure-example.com/ + ServerAdmin webmaster@example.com + DocumentRoot /home/webmaster/public_websites/www.example.com/ Include /etc/apache2/conf.d/local-log-vhosts.conf CustomLog "| /usr/sbin/vlogger -s access.log -u admin -g admin -t '%Y.%m.%d' /home/webmaster/weblogs" combined_vlogger ErrorLog "| /usr/sbin/vlogger -s error.log -u admin -g admin -t '%Y.%m.%d' -e /home/webmaster/weblogs/ERRORS" - ServerName secure-example.com - ServerAlias *.www.secure-example.com - ServerAdmin webmaster@secure-example.com + ServerName example.com + ServerAlias *.www.example.com + ServerAdmin webmaster@example.com RewriteEngine On - RewriteRule / http://www.secure-example.com/ [R] -# RewriteRule /(.*) http://www.secure-example.com/$1 [R] + RewriteRule / http://www.example.com/ [R] +# RewriteRule /(.*) http://www.example.com/$1 [R] TransferLog /dev/null -- cgit v1.2.3