From 674d748149d3d55d15d8824a1366df02e766ba97 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Tue, 16 Jun 2015 11:32:09 -0400 Subject: [PATCH] CC-6058: htaccess should be combined into apache site config --- airtime_mvc/public/.htaccess | 25 ------------------------- installer/apache/airtime-vhost | 29 +++++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 airtime_mvc/public/.htaccess diff --git a/airtime_mvc/public/.htaccess b/airtime_mvc/public/.htaccess deleted file mode 100644 index bfbc50596..000000000 --- a/airtime_mvc/public/.htaccess +++ /dev/null @@ -1,25 +0,0 @@ -php_value post_max_size 500M -php_value upload_max_filesize 500M -php_value request_order "GPC" -php_value session.gc_probability 0 -php_value session.auto_start 0 - -RewriteEngine On -RewriteCond %{REQUEST_FILENAME} -s [OR] -RewriteCond %{REQUEST_FILENAME} -l [OR] -RewriteCond %{REQUEST_FILENAME} -d -RewriteRule ^.*$ - [NC,L] -RewriteRule ^.*$ index.php [NC,L] -#RewriteBase / - - -AddOutputFilterByType DEFLATE text/plain -AddOutputFilterByType DEFLATE text/html -AddOutputFilterByType DEFLATE text/xml -AddOutputFilterByType DEFLATE text/css -AddOutputFilterByType DEFLATE application/xml -AddOutputFilterByType DEFLATE application/xhtml+xml -AddOutputFilterByType DEFLATE application/rss+xml -AddOutputFilterByType DEFLATE application/javascript -AddOutputFilterByType DEFLATE application/x-javascript -AddOutputFilterByType DEFLATE application/json diff --git a/installer/apache/airtime-vhost b/installer/apache/airtime-vhost index 890006fb0..fa982a97b 100644 --- a/installer/apache/airtime-vhost +++ b/installer/apache/airtime-vhost @@ -2,11 +2,36 @@ ServerAdmin foo@bar.org DocumentRoot WEB_ROOT php_admin_value upload_tmp_dir /tmp + php_value post_max_size 500M + php_value upload_max_filesize 500M + php_value request_order "GPC" + php_value session.gc_probability 0 + php_value session.auto_start 0 + + AddOutputFilterByType DEFLATE text/plain + AddOutputFilterByType DEFLATE text/html + AddOutputFilterByType DEFLATE text/xml + AddOutputFilterByType DEFLATE text/css + AddOutputFilterByType DEFLATE application/xml + AddOutputFilterByType DEFLATE application/xhtml+xml + AddOutputFilterByType DEFLATE application/rss+xml + AddOutputFilterByType DEFLATE application/javascript + AddOutputFilterByType DEFLATE application/x-javascript + AddOutputFilterByType DEFLATE application/json + - DirectoryIndex index.php - AllowOverride all + + RewriteEngine On + RewriteCond %{REQUEST_FILENAME} -s [OR] + RewriteCond %{REQUEST_FILENAME} -l [OR] + RewriteCond %{REQUEST_FILENAME} -d + RewriteRule ^.*$ - [NC,L] + RewriteRule ^.*$ index.php [NC,L] Order allow,deny Allow from all + + Require all granted +