Enable SSL, particularly for alex.mit.edu

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

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

diff --git a/sites-available/alex b/sites-available/alex
index 48f52cca128c5a5c8fb920a563a7aa89523d3285..58520181c06505b5cfee978df9e244f450cd4d40 100644 (file)
--- a/sites-available/alex
+++ b/sites-available/alex
@@ -1,26 +1,15 @@
 <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
+       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>
+</IfModule>

diff --git a/sites-available/default-ssl b/sites-available/default-ssl
index fa0b0ab5ba834b20841ae7ab462f7cf7293dd656..fca8fcf22ef0d9a27d5231b887ffc5bdf310723d 100644 (file)
--- a/sites-available/default-ssl
+++ b/sites-available/default-ssl
@@ -1,6 +1,7 @@
 <IfModule mod_ssl.c>
-<VirtualHost _default_:443>
+<VirtualHost *:443>
        ServerAdmin webmaster@localhost
+       ServerName masada.mit.edu
 
        DocumentRoot /var/www
        <Directory />
@@ -48,8 +49,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/ssl-cert-snakeoil.pem
-       SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
+       SSLCertificateFile    /etc/ssl/certs/masada.mit.edu.web.pem
+       SSLCertificateKeyFile /etc/ssl/private/masada.mit.edu.web.key
 
        #   Server Certificate Chain:
        #   Point SSLCertificateChainFile at a file containing the

diff --git a/sites-common/alex b/sites-common/alex
new file mode 100644 (file)
index 0000000..a090a0e
--- /dev/null
+++ b/sites-common/alex
@@ -0,0 +1,21 @@
+ServerAdmin adehnert-webmaster@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

diff --git a/sites-common/ssl-common b/sites-common/ssl-common
new file mode 100644 (file)
index 0000000..a523a39
--- /dev/null
+++ b/sites-common/ssl-common
@@ -0,0 +1,11 @@
+SSLEngine on
+<FilesMatch "\.(cgi|shtml|phtml|php)$">
+       SSLOptions +StdEnvVars
+</FilesMatch>
+<Directory /usr/lib/cgi-bin>
+       SSLOptions +StdEnvVars
+</Directory>
+
+BrowserMatch ".*MSIE.*" \
+       nokeepalive ssl-unclean-shutdown \
+       downgrade-1.0 force-response-1.0