From ee8b76d4b8dd107b93d1883cc298efbd0e79b75a Mon Sep 17 00:00:00 2001
From: arzynik <github@arzynik.com>
Date: Mon, 7 Apr 2014 17:14:32 -0700
Subject: [PATCH] travis tests

---
 .travis.yml   | 2 +-
 www/.htaccess | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7aa46632d..ea6f2b4a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ before_script:
   - echo "export PATH=/home/travis/.phpenv/bin:$PATH" | sudo tee -a /etc/apache2/envvars > /dev/null
   - cat travis/apache.conf | sudo tee /etc/apache2/conf.d/phpconfig > /dev/null
   - cat travis/sites.conf | sed -e "s,PATH,`pwd`/www,g" | sudo tee /etc/apache2/sites-available/default > /dev/null
-  - export APACHE_ARGUMENTS='-D TRAVIS'
+  - echo 'export APACHE_ARGUMENTS="-D TRAVIS"' | sudo tee -a /etc/apache2/envvars > /dev/null
   - sudo service apache2 restart
   
 #  - "export DISPLAY=:99.0"
diff --git a/www/.htaccess b/www/.htaccess
index dad5c309d..a5022d2af 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -3,8 +3,6 @@ allow from all
 RewriteEngine on
 Options +Followsymlinks -Indexes
 
-
-
 ReWriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
 ReWriteRule .* - [F] 
 
@@ -16,7 +14,7 @@ RewriteRule ^(.+)$                    index.php?__url=$1 [L,QSA]
 <IfDefine !TRAVIS>
 
 	<FilesMatch "\.(ico|pdf|flv|jpg|jpeg|png|gif|js|css)$">
-	Header set Cache-Control "max-age=290304000, public"
+		Header set Cache-Control "max-age=290304000, public"
 	</FilesMatch>
 	
 	AddType font/ttf .ttf