Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apache2 vhost and installer fixes

This commit is contained in:
Albert Santoni 2015-12-23 12:04:08 -05:00
parent 0d09e64aea
commit a52e48bb2f
3 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install
View File

@ -288,6 +288,7 @@ echo -e " \/ \/ \/ \/ \n"
if [ "$ignore_dependencies" = "f" ]; then if [ "$ignore_dependencies" = "f" ]; then
set +e set +e
loudCmd "apt-get update"
if [ -z "${dist}" ]; then if [ -z "${dist}" ]; then
loudCmd "apt-get -y --force-yes install lsb-release" loudCmd "apt-get -y --force-yes install lsb-release"
dist=`lsb_release -ds | awk '{print tolower($1);}'` dist=`lsb_release -ds | awk '{print tolower($1);}'`
@ -299,7 +300,6 @@ if [ "$ignore_dependencies" = "f" ]; then
loud "-----------------------------------------------------" loud "-----------------------------------------------------"
verbose "\n * Reading requirements-${dist,,}-${code,,}.apt..." verbose "\n * Reading requirements-${dist,,}-${code,,}.apt..."
loudCmd "apt-get update"
if [ -f ${SCRIPT_DIR}/installer/lib/requirements-${dist,,}-${code,,}.apt ]; then 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' ' ')" 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 else

9
installer/apache/airtime-vhost
View File

@ -29,9 +29,12 @@
RewriteRule ^.*$ - [NC,L] RewriteRule ^.*$ - [NC,L]
RewriteRule ^.*$ index.php [NC,L] RewriteRule ^.*$ index.php [NC,L]
Order allow,deny Order allow,deny
Allow from all <IfVersion < 2.4>
Allow from all
Require all granted </IfVersion>
<IfVersion >= 2.4>
Require all granted
</IfVersion>
</Directory> </Directory>
</VirtualHost> </VirtualHost>

25
installer/apache/airtime-vhost-2.4
View File

@ -2,13 +2,32 @@
ServerAdmin foo@bar.org ServerAdmin foo@bar.org
DocumentRoot WEB_ROOT DocumentRoot WEB_ROOT
php_admin_value upload_tmp_dir /tmp 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> <Directory WEB_ROOT>
DirectoryIndex index.php DirectoryIndex index.php
AllowOverride all AllowOverride all
Order allow,deny Order allow,deny
Allow from all <IfVersion < 2.4>
Allow from all
Require all granted </IfVersion>
<IfVersion >= 2.4>
Require all granted
</IfVersion>
</Directory> </Directory>
</VirtualHost> </VirtualHost>