Upgrade the Vagrant test environment to Jessie

Mostly fixes to the Apache 2.4 configuration for now.

vagrant/Vagrantfile

+# Vagrant configuration for a simple standalone SSO test environment.
+#
+# The test environment will use ai-sso packages from the autistici.org
+# Debian repository, not locally built ones.
+#
 API_VERSION = "2"
 
 Vagrant.configure(API_VERSION) do |config|

vagrant/apache_config

@@ -12,8 +12,7 @@
 
 	DocumentRoot /var/www/default
 	<Directory /var/www/default>
-		Order allow,deny
-		Allow from all
+		Require all granted
 	</Directory>
 </VirtualHost>
 
@@ -28,14 +27,13 @@
 
 	DocumentRoot /var/www/app
 	<Directory /var/www/app>
-		Order allow,deny
-		Allow from all
+		Require all granted
 	</Directory>
 
 	<Location />
 		AuthType SSO
 		SSOService app.sso.net/
-		require valid-user
+		Require valid-user
 	</Location>
 </VirtualHost>
 
@@ -46,8 +44,7 @@
 	SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
 
 	<Proxy *>
-		Order allow,deny
-		Allow from all
+		Require all granted
 	</Proxy>
 
 	ProxyPass / http://127.0.0.1:5002/

vagrant/setup.sh

@@ -35,9 +35,7 @@ mkdir -p /var/www/default /var/www/app
 echo '<h1>This is the default website</h1>' > /var/www/default/index.html
 echo '<h1>This is the protected app</h1>' > /var/www/app/index.html
 cat >/etc/apache2/ports.conf <<EOF
-NameVirtualHost *:80
 Listen 80
-NameVirtualHost *:443
 Listen 443
 EOF
 apache2ctl restart