Permalink
Browse files

Apache2 vhost and installer fixes

  • Loading branch information...
Albert Santoni
Albert Santoni committed Dec 23, 2015
1 parent 0d09e64 commit a52e48bb2f77aa44b98184fa46b932b21f262716
Showing with 29 additions and 7 deletions.
  1. +1 −1 install
  2. +6 −3 installer/apache/airtime-vhost
  3. +22 −3 installer/apache/airtime-vhost-2.4
@@ -288,6 +288,7 @@ echo -e " \/ \/ \/ \/ \n"
if [ "$ignore_dependencies" = "f" ]; then
set +e
loudCmd "apt-get update"
if [ -z "${dist}" ]; then
loudCmd "apt-get -y --force-yes install lsb-release"
dist=`lsb_release -ds | awk '{print tolower($1);}'`
@@ -299,7 +300,6 @@ if [ "$ignore_dependencies" = "f" ]; then
loud "-----------------------------------------------------"
verbose "\n * Reading requirements-${dist,,}-${code,,}.apt..."
loudCmd "apt-get update"
if [ -f ${SCRIPT_DIR}/installer/lib/requirements-${dist,,}-${code,,}.apt ]; then
loudCmd "DEBIAN_FRONTEND=noninteractive apt-get -y -m --force-yes install $(grep -vE '^\s*#' ${SCRIPT_DIR}/installer/lib/requirements-${dist,,}-${code,,}.apt | tr '\n' ' ')"
else
@@ -29,9 +29,12 @@
RewriteRule ^.*$ - [NC,L]
RewriteRule ^.*$ index.php [NC,L]
Order allow,deny
Allow from all
Require all granted
<IfVersion < 2.4>
Allow from all
</IfVersion>
<IfVersion >= 2.4>
Require all granted
</IfVersion>
</Directory>
</VirtualHost>
@@ -2,13 +2,32 @@
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
<Directory WEB_ROOT>
DirectoryIndex index.php
AllowOverride all
Order allow,deny
Allow from all
Require all granted
<IfVersion < 2.4>
Allow from all
</IfVersion>
<IfVersion >= 2.4>
Require all granted
</IfVersion>
</Directory>
</VirtualHost>

0 comments on commit a52e48b

Please sign in to comment.