annotate deploy/config/soundsoftware-static.conf @ 1621:3a510bf6a9bc

Merge from live branch

<VirtualHost *:80>
        ServerName soundsoftware.ac.uk
	ServerAlias www.soundsoftware.ac.uk
        ServerAdmin [e-mail]

        DocumentRoot /var/www/soundsoftware-static/soundsoftware.ac.uk

	ErrorLog /var/log/apache2/soundsoftware-error.log
	CustomLog /var/log/apache2/soundsoftware-access.log vhost_combined

	<Directory /var/www/soundsoftware-static/soundsoftware.ac.uk>
		RewriteEngine on
		RewriteCond %{REQUEST_FILENAME} !-d
		RewriteCond %{REQUEST_FILENAME}\.html -f
		RewriteRule ^(.*)$ $1.html
	</Directory>

	<FilesMatch "^.*\.(install|inc)$">
	     Order Deny,Allow
	     deny from all
	</FilesMatch>

        <DirectoryMatch "\.(hg|svn|git)">
                Order allow,deny
                Deny from all
                Satisfy All
        </DirectoryMatch>

	LogLevel warn
	ServerSignature Off
</VirtualHost>
		
<VirtualHost *:443>
	# We don't serve SSL: redirect to the code site
	ServerName soundsoftware.ac.uk
        ServerAlias www.soundsoftware.ac.uk
        ServerAdmin [e-mail]

	SSLEngine on
	SSLCertificateFile /etc/apache2/certs/code.soundsoftware.ac.uk.crt
	SSLCertificateKeyFile /etc/apache2/certs/code.soundsoftware.ac.uk.key
	SSLCertificateChainFile /etc/apache2/certs/code.soundsoftware.ac.uk.ca-bundle
	SSLVerifyClient none
	SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW	

        DocumentRoot /var/www/soundsoftware-static/soundsoftware.ac.uk

	Redirect permanent / https://code.soundsoftware.ac.uk/

        ErrorLog /var/log/apache2/code-error.log
        CustomLog /var/log/apache2/code-access.log vhost_combined

        LogLevel warn
        ServerSignature Off
</VirtualHost>