Commit baa44f63 authored by ale's avatar ale

Upgrade the Vagrant test environment to Jessie

Mostly fixes to the Apache 2.4 configuration for now.
parent 4f859f76
# 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" API_VERSION = "2"
Vagrant.configure(API_VERSION) do |config| Vagrant.configure(API_VERSION) do |config|
......
...@@ -12,8 +12,7 @@ ...@@ -12,8 +12,7 @@
DocumentRoot /var/www/default DocumentRoot /var/www/default
<Directory /var/www/default> <Directory /var/www/default>
Order allow,deny Require all granted
Allow from all
</Directory> </Directory>
</VirtualHost> </VirtualHost>
...@@ -28,14 +27,13 @@ ...@@ -28,14 +27,13 @@
DocumentRoot /var/www/app DocumentRoot /var/www/app
<Directory /var/www/app> <Directory /var/www/app>
Order allow,deny Require all granted
Allow from all
</Directory> </Directory>
<Location /> <Location />
AuthType SSO AuthType SSO
SSOService app.sso.net/ SSOService app.sso.net/
require valid-user Require valid-user
</Location> </Location>
</VirtualHost> </VirtualHost>
...@@ -46,8 +44,7 @@ ...@@ -46,8 +44,7 @@
SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
<Proxy *> <Proxy *>
Order allow,deny Require all granted
Allow from all
</Proxy> </Proxy>
ProxyPass / http://127.0.0.1:5002/ ProxyPass / http://127.0.0.1:5002/
......
...@@ -35,9 +35,7 @@ mkdir -p /var/www/default /var/www/app ...@@ -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 default website</h1>' > /var/www/default/index.html
echo '<h1>This is the protected app</h1>' > /var/www/app/index.html echo '<h1>This is the protected app</h1>' > /var/www/app/index.html
cat >/etc/apache2/ports.conf <<EOF cat >/etc/apache2/ports.conf <<EOF
NameVirtualHost *:80
Listen 80 Listen 80
NameVirtualHost *:443
Listen 443 Listen 443
EOF EOF
apache2ctl restart apache2ctl restart
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment