summaryrefslogtreecommitdiff
path: root/apache2/sites-available
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2007-10-19 21:55:51 +0000
committerJonas Smedegaard <dr@jones.dk>2007-10-19 21:55:51 +0000
commit26a0729eb7d97eeabbd154fdcc8afcc558626288 (patch)
treec4505cebcd8fa7f67c8fad3b545d80c510157a77 /apache2/sites-available
parent8ed5dde1763bb2f472adf9979985ca40aca397e6 (diff)
Drop people.secure-example.com and add slightly different users.secure-example.com.
Diffstat (limited to 'apache2/sites-available')
-rw-r--r--apache2/sites-available/people.secure-example.com43
-rw-r--r--apache2/sites-available/users.secure-example.com42
2 files changed, 42 insertions, 43 deletions
diff --git a/apache2/sites-available/people.secure-example.com b/apache2/sites-available/people.secure-example.com
deleted file mode 100644
index e8709ed..0000000
--- a/apache2/sites-available/people.secure-example.com
+++ /dev/null
@@ -1,43 +0,0 @@
-<VirtualHost *:80>
- ServerName people.example.com
- ServerAlias people
- 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.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"
-</VirtualHost>
-<VirtualHost *:80>
- ServerName www.people.example.com
- ServerAlias *.people.example.com
- ServerAdmin webmaster@example.com
-
- RewriteEngine On
- RewriteRule / http://people.example.com/ [R]
-# RewriteRule /(.*) http://people.example.com/$1 [R]
-
- TransferLog /dev/null
-</VirtualHost>
-<VirtualHost *:443>
- ServerName people.example.com:443
- ServerAlias *.people.example.com:443
- ServerAlias people:443
- ServerAlias *.people:443
- ServerAdmin webmaster@example.com
-
- Include /etc/apache2/conf.d/local-ssl.conf
-
- RewriteEngine On
- RewriteRule / http://people.example.com/ [R]
-# RewriteRule /(.*) http://people.example.com/$1 [R]
-
- TransferLog /dev/null
-</VirtualHost>
diff --git a/apache2/sites-available/users.secure-example.com b/apache2/sites-available/users.secure-example.com
new file mode 100644
index 0000000..0d11b17
--- /dev/null
+++ b/apache2/sites-available/users.secure-example.com
@@ -0,0 +1,42 @@
+<VirtualHost *:80>
+ ServerName users.example.com
+ ServerAlias users
+ ServerAdmin webmaster@example.com
+ DocumentRoot /home/webmaster/public_websites/users.example.com/
+
+ Include /etc/apache2/conf.d/local-userdir.conf
+ Include /etc/apache2/conf.d/local-macvolumes.conf
+
+ RewriteEngine On
+ RewriteRule ^/-(.*)$ http://users.example.com/~$1 [R]
+ RewriteRule ^/([^~].*)$ http://users.example.com/~$1 [R]
+
+ ErrorLog /var/log/apache2/users.kaospilot.no-error.log
+ CustomLog /var/log/apache2/mail.dgi-huset.dk-access.log combined
+</VirtualHost>
+<VirtualHost *:80>
+ ServerName www.users.example.com
+ ServerAlias *.users.example.com
+ ServerAdmin webmaster@example.com
+
+ RewriteEngine On
+ RewriteRule / http://users.example.com/ [R]
+# RewriteRule /(.*) http://users.example.com/$1 [R]
+
+ TransferLog /dev/null
+</VirtualHost>
+<VirtualHost *:443>
+ ServerName users.example.com:443
+ ServerAlias *.users.example.com:443
+ ServerAlias users:443
+ ServerAlias *.users:443
+ ServerAdmin webmaster@example.com
+
+ Include /etc/apache2/conf.d/local-ssl.conf
+
+ RewriteEngine On
+ RewriteRule / http://users.example.com/ [R]
+# RewriteRule /(.*) http://users.example.com/$1 [R]
+
+ TransferLog /dev/null
+</VirtualHost>