Fix ServerAdmin and ServerAlias

diff --git a/sites-available/default b/sites-available/default
index b34615684ad08c88f3d009208db8337bf738765a..8123b22dc68cff54aefa0fd0763abcbf14d5c1ff 100644 (file)
--- a/sites-available/default
+++ b/sites-available/default
@@ -1,5 +1,7 @@
 <VirtualHost *:80>
-       ServerAdmin webmaster@localhost
+       ServerAdmin webmaster@dehnerts.com
+       ServerName olinda.mit.edu
+       ServerAlias svn.dehnerts.com svn.dehnert.arctic.org www.dehnerts.com www.dehnert.arctic.org
 
        DocumentRoot /var/www
        <Directory />

diff --git a/sites-available/default-ssl b/sites-available/default-ssl
index 61ba1046ac68bdabb5f8c3129fa1f9c9984d4d26..00b33ffaff8b51ed718c28e75fcb7405bff27b25 100644 (file)
--- a/sites-available/default-ssl
+++ b/sites-available/default-ssl
@@ -1,8 +1,9 @@
 <IfModule mod_ssl.c>
 <VirtualHost *:443>
-       ServerAdmin webmaster@localhost
+       ServerAdmin webmaster@dehnerts.com
        ServerName olinda.mit.edu
        ServerAlias svn.dehnerts.com svn.dehnert.arctic.org
+       ServerAlias www.dehnerts.com www.dehnert.arctic.org
 
        DocumentRoot /var/www
        <Directory />

diff --git a/sites-enabled/000-default-ssl b/sites-enabled/000-default-ssl
new file mode 120000 (symlink)
index 0000000..c788d2e
--- /dev/null
+++ b/sites-enabled/000-default-ssl
@@ -0,0 +1 @@
+../sites-available/default-ssl
\ No newline at end of file

diff --git a/sites-enabled/default-ssl b/sites-enabled/default-ssl
deleted file mode 120000 (symlink)
index c788d2e..0000000
--- a/sites-enabled/default-ssl
+++ /dev/null
@@ -1 +0,0 @@
-../sites-available/default-ssl
\ No newline at end of file