X-Git-Url: https://dehnerts.com/gitweb/?a=blobdiff_plain;f=sites-available%2Fdefault-ssl;h=88f79a1b22d6ed0124ad4a9cb09d4f60055f676b;hb=cc88b712404442e61e0710d519a53a136b6def5e;hp=3b05533c2821a6e46ef1830a2f1b1ce5cd25b71d;hpb=acb6758fe7d4f3a11ee803483c9298de4655513a;p=sysconfig%2Fapache2.git

diff --git a/sites-available/default-ssl b/sites-available/default-ssl
index 3b05533..88f79a1 100644
--- a/sites-available/default-ssl
+++ b/sites-available/default-ssl
@@ -1,44 +1,6 @@
 <IfModule mod_ssl.c>
 <VirtualHost *:443>
-	ServerAdmin webmaster@localhost
-	ServerName olinda.mit.edu
-
-	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.
@@ -49,8 +11,8 @@
 	#   /usr/share/doc/apache2.2-common/README.Debian.gz for more info.
 	#   If both key and certificate are stored in the same file, only the
 	#   SSLCertificateFile directive is needed.
-	SSLCertificateFile    /etc/ssl/certs/olinda.mit.edu-web.pem
-	SSLCertificateKeyFile /etc/ssl/private/olinda.mit.edu-web.key
+	SSLCertificateFile    /etc/ssl/certs/general-web.crt
+	SSLCertificateKeyFile /etc/ssl/private/general-web.key
 
 	#   Server Certificate Chain:
 	#   Point SSLCertificateChainFile at a file containing the
@@ -166,6 +128,5 @@
 	BrowserMatch ".*MSIE.*" \
 		nokeepalive ssl-unclean-shutdown \
 		downgrade-1.0 force-response-1.0
-
 </VirtualHost>
 </IfModule>