travis

[plcapi.git] / tests / ci / travis / apache_vhost

diff --git a/tests/ci/travis/apache_vhost b/tests/ci/travis/apache_vhost
index e4d2bf7..99c67fa 100644 (file)
--- a/tests/ci/travis/apache_vhost
+++ b/tests/ci/travis/apache_vhost
@@ -11,8 +11,13 @@
   <Directory "%TRAVIS_BUILD_DIR%">
     Options FollowSymLinks MultiViews ExecCGI
     AllowOverride All
-    Order deny,allow
-    Allow from all
+
+    Require all granted
+
+    # needed for basic auth (PHP_AUTH_USER and PHP_AUTH_PW)
+    RewriteEngine on
+    RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+    RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization}]
   </Directory>
 
   # Wire up Apache to use Travis CI's php-fpm.
@@ -37,8 +42,13 @@
   <Directory "%TRAVIS_BUILD_DIR%">
     Options FollowSymLinks MultiViews ExecCGI
     AllowOverride All
-    Order deny,allow
-    Allow from all
+
+    Require all granted
+
+    # needed for basic auth (PHP_AUTH_USER and PHP_AUTH_PW)
+    RewriteEngine on
+    RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+    RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization}]
   </Directory>
 
   # Wire up Apache to use Travis CI's php-fpm.
@@ -46,10 +56,11 @@
     AddHandler php5-fcgi .php
     Action php5-fcgi /php5-fcgi
     Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
-    FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization
+    #FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization
   </IfModule>
 
   SSLEngine on
+  # This cert is bundled by default in Ubuntu
   SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
   SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
 
@@ -64,4 +75,4 @@
 
 </VirtualHost>
 
-</IfModule>
\ No newline at end of file
+</IfModule>