From cc88b712404442e61e0710d519a53a136b6def5e Mon Sep 17 00:00:00 2001 From: Alex Dehnert Date: Tue, 2 Mar 2010 13:05:28 -0500 Subject: [PATCH] Use common config file for default vhost --- sites-available/default | 44 +------------------------------------ sites-available/default-ssl | 43 +----------------------------------- sites-common/default | 43 ++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 85 deletions(-) create mode 100644 sites-common/default diff --git a/sites-available/default b/sites-available/default index 2352a10..721046f 100644 --- a/sites-available/default +++ b/sites-available/default @@ -1,45 +1,3 @@ - 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 - - Options FollowSymLinks - AllowOverride None - - - Options Indexes FollowSymLinks MultiViews - AllowOverride None - Order allow,deny - allow from all - - - ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ - - AllowOverride None - Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch - Order allow,deny - Allow from all - - - 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/" - - Options Indexes MultiViews FollowSymLinks - AllowOverride None - Order deny,allow - Deny from all - Allow from 127.0.0.0/255.0.0.0 ::1/128 - - - Include sites-common/awstats - + Include sites-common/default diff --git a/sites-available/default-ssl b/sites-available/default-ssl index 00b33ff..88f79a1 100644 --- a/sites-available/default-ssl +++ b/sites-available/default-ssl @@ -1,46 +1,6 @@ - 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 - - Options FollowSymLinks - AllowOverride None - - - Options Indexes FollowSymLinks MultiViews - AllowOverride None - Order allow,deny - allow from all - - - ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ - - AllowOverride None - Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch - Order allow,deny - Allow from all - - - 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/" - - Options Indexes MultiViews FollowSymLinks - AllowOverride None - Order deny,allow - Deny from all - Allow from 127.0.0.0/255.0.0.0 ::1/128 - + 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 - diff --git a/sites-common/default b/sites-common/default new file mode 100644 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 + + Options FollowSymLinks + AllowOverride None + + + Options Indexes FollowSymLinks MultiViews + AllowOverride None + Order allow,deny + allow from all + + +ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ + + AllowOverride None + Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch + Order allow,deny + Allow from all + + +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/" + + Options Indexes MultiViews FollowSymLinks + AllowOverride None + Order deny,allow + Deny from all + Allow from 127.0.0.0/255.0.0.0 ::1/128 + + +Include sites-common/awstats + -- 2.34.1