Use common config file for default vhost

diff --git a/sites-available/default b/sites-available/default
index 2352a10dc45f4c1613732183580d76db72c3978e..721046f67593ed75585fb46707e9c3b5a6a01405 100644 (file)
--- a/sites-available/default
+++ b/sites-available/default
@@ -1,45 +1,3 @@
 <VirtualHost *:80>
-       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 />
-               Options FollowSymLinks
-               AllowOverride None
-       </Directory>
-       <Directory /var/www/>
-               Options Indexes FollowSymLinks MultiViews
-               AllowOverride None
-               Order allow,deny
-               allow from all
-       </Directory>
-
-       ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-       <Directory "/usr/lib/cgi-bin">
-               AllowOverride None
-               Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-               Order allow,deny
-               Allow from all
-       </Directory>
-
-       ErrorLog /var/log/apache2/error.log
-
-       # Possible values include: debug, info, notice, warn, error, crit,
-       # alert, emerg.
-       LogLevel warn
-
-       CustomLog /var/log/apache2/access.log combined
-
-    Alias /doc/ "/usr/share/doc/"
-    <Directory "/usr/share/doc/">
-        Options Indexes MultiViews FollowSymLinks
-        AllowOverride None
-        Order deny,allow
-        Deny from all
-        Allow from 127.0.0.0/255.0.0.0 ::1/128
-    </Directory>
-
-    Include sites-common/awstats
-
+       Include sites-common/default
 </VirtualHost>

diff --git a/sites-available/default-ssl b/sites-available/default-ssl
index 00b33ffaff8b51ed718c28e75fcb7405bff27b25..88f79a1b22d6ed0124ad4a9cb09d4f60055f676b 100644 (file)
--- a/sites-available/default-ssl
+++ b/sites-available/default-ssl
@@ -1,46 +1,6 @@
 <IfModule mod_ssl.c>
 <VirtualHost *:443>
-       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 />
-               Options FollowSymLinks
-               AllowOverride None
-       </Directory>
-       <Directory /var/www/>
-               Options Indexes FollowSymLinks MultiViews
-               AllowOverride None
-               Order allow,deny
-               allow from all
-       </Directory>
-
-       ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-       <Directory "/usr/lib/cgi-bin">
-               AllowOverride None
-               Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-               Order allow,deny
-               Allow from all
-       </Directory>
-
-       ErrorLog /var/log/apache2/error.log
-
-       # Possible values include: debug, info, notice, warn, error, crit,
-       # alert, emerg.
-       LogLevel warn
-
-       CustomLog /var/log/apache2/ssl_access.log combined
-
-       Alias /doc/ "/usr/share/doc/"
-       <Directory "/usr/share/doc/">
-               Options Indexes MultiViews FollowSymLinks
-               AllowOverride None
-               Order deny,allow
-               Deny from all
-               Allow from 127.0.0.0/255.0.0.0 ::1/128
-       </Directory>
+       Include sites-common/default
 
        #   SSL Engine Switch:
        #   Enable/Disable SSL for this virtual host.
@@ -168,6 +128,5 @@
        BrowserMatch ".*MSIE.*" \
                nokeepalive ssl-unclean-shutdown \
                downgrade-1.0 force-response-1.0
-
 </VirtualHost>
 </IfModule>

diff --git a/sites-common/default b/sites-common/default
new file mode 100644 (file)
index 0000000..d7e619a
--- /dev/null
+++ b/sites-common/default
@@ -0,0 +1,43 @@
+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 />
+       Options FollowSymLinks
+       AllowOverride None
+</Directory>
+<Directory /var/www/>
+       Options Indexes FollowSymLinks MultiViews
+       AllowOverride None
+       Order allow,deny
+       allow from all
+</Directory>
+
+ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+<Directory "/usr/lib/cgi-bin">
+       AllowOverride None
+       Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+       Order allow,deny
+       Allow from all
+</Directory>
+
+ErrorLog /var/log/apache2/error.log
+
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+LogLevel warn
+
+CustomLog /var/log/apache2/access.log combined
+
+Alias /doc/ "/usr/share/doc/"
+<Directory "/usr/share/doc/">
+       Options Indexes MultiViews FollowSymLinks
+       AllowOverride None
+       Order deny,allow
+       Deny from all
+       Allow from 127.0.0.0/255.0.0.0 ::1/128
+</Directory>
+
+Include sites-common/awstats
+