X-Git-Url: https://dehnerts.com/gitweb/?a=blobdiff_plain;f=sites-available%2Falex;h=20d88be9ece3de513b2b138f43f2e96b69d48e6f;hb=2587c8d61609bb7df9d8feeca820bbaceb6a49de;hp=48f52cca128c5a5c8fb920a563a7aa89523d3285;hpb=8b8e99fca6bc922b87c0a26f577a8cc2081415ca;p=sysconfig%2Fapache2.git

diff --git a/sites-available/alex b/sites-available/alex
index 48f52cc..20d88be 100644
--- a/sites-available/alex
+++ b/sites-available/alex
@@ -1,26 +1,24 @@
 <VirtualHost *:80>
-	ServerAdmin adehnert-webmaster@mit.edu
-	ServerName adehnert.mit.edu
-	ServerAlias alex.mit.edu
-
-	DocumentRoot /home/alex/public_html/
-	<Directory />
-		Options FollowSymLinks
-		AllowOverride None
-	</Directory>
-	<Directory /home/alex/public_html/>
-		Options Indexes FollowSymLinks MultiViews
-		AllowOverride FileInfo AuthConfig Limit Indexes Options
-		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
+	ServerName alex.mit.edu
+	ServerAlias adehnert.mit.edu
+	ServerAlias alex.dehnerts.com
+	ServerAlias alex.dehnert.arctic.org
+	Include sites-common/alex
+</VirtualHost>
 
+<IfModule mod_ssl.c>
+<VirtualHost *:443>
+	ServerName alex.mit.edu
+	Include sites-common/alex
+	Include sites-common/ssl-common
+	SSLCertificateFile    /etc/ssl/certs/alex.mit.edu.pem
+	SSLCertificateKeyFile /etc/ssl/private/alex.mit.edu.key
+</VirtualHost>
+<VirtualHost *:443>
+	ServerName adehnert.mit.edu
+	Include sites-common/alex
+	Include sites-common/ssl-common
+	SSLCertificateFile    /etc/ssl/certs/adehnert.mit.edu.web.pem
+	SSLCertificateKeyFile /etc/ssl/private/adehnert.mit.edu.web.key
 </VirtualHost>
+</IfModule>