hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into elastic-indexer

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Damien Alexandre
2014-10-06 18:24:58 +02:00
parent 4d43fe7c2d 2c9bd86d2a
commit 5f7edb5be9
96 changed files with 3436 additions and 3129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup vendored Executable file → Normal file
View File

@@ -1,18 +1,6 @@
#! /bin/bash
# open rabbitmq ports
sudo iptables -I INPUT -p tcp --dport 15672 -j ACCEPT
# open elastic search ports
sudo iptables -I INPUT -p tcp --dport 9200 -j ACCEPT
# open mysql ports
sudo iptables -I INPUT -p tcp --dport 3306 -j ACCEPT
# locales
export LANGUAGE=fr_FR.UTF-8
export LANG=fr_FR.UTF-8
export LC_ALL=fr_FR.UTF-8
# stoping iptable
sudo service iptables-persistent stop
source ~/.bashrc

17
resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup vendored
View File

@@ -5,9 +5,9 @@ sudo sh -c 'echo "Europe/Paris" > /etc/timezone'
sudo dpkg-reconfigure -f noninteractive tzdata
# locales
export LANGUAGE=fr_FR.UTF-8
export LANG=fr_FR.UTF-8
export LC_ALL=fr_FR.UTF-8
sudo sh -c "echo 'LANGUAGE=fr_FR.UTF-8' >> /etc/environment"
sudo sh -c "echo 'LANG=fr_FR.UTF-8' >> /etc/environment"
sudo sh -c "echo 'LC_ALL=fr_FR.UTF-8' >> /etc/environment"
sudo sh -c 'echo "en_GB.UTF-8 UTF-8" >> /etc/locale.gen'
sudo sh -c 'echo "de_DE.UTF-8 UTF-8" >> /etc/locale.gen'
sudo sh -c 'echo "es_ES.UTF-8 UTF-8" >> /etc/locale.gen'
@@ -39,6 +39,7 @@ unzip compiler-latest.zip -d closure
mv /tmp/closure /home/vagrant
sudo sh -c "echo 'JS_COMPILER=/home/vagrant/closure/compiler.jar' >> /etc/environment"
export JS_COMPILER=/home/vagrant/closure/compiler.jar
sudo chown -R vagrant: /home/vagrant/closure
# java
sudo sh -c "echo 'JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64/jre/' >> /etc/environment"
@@ -114,12 +115,16 @@ then
#copy configuration template
mv /var/www/phraseanet/lib/conf.d/configuration.yml /var/www/phraseanet/lib/conf.d/configuration.yml.bkp
cp /vagrant/resources/vagrant/config/phraseanet/configuration.yml /var/www/phraseanet/lib/conf.d/configuration.yml
mv /var/www/phraseanet/.bowerrc /var/www/phraseanet/.bowerrc.bkp
cp /vagrant/resources/vagrant/config/bower/.bower.rc /var/www/phraseanet/.bowerrc
cd /var/www/phraseanet
composer install -n --prefer-source --dev
npm install
grunt install-assets
bin/developer assets:compile-less
rm -f /var/www/phraseanet/lib/conf.d/configuration.yml
rm -f /var/www/phraseanet/.bowerrc
mv /www/phraseanet/.bowerrc.bkp /www/phraseanet/.bowerrc
mv /var/www/phraseanet/lib/conf.d/configuration.yml.bkp /var/www/phraseanet/lib/conf.d/configuration.yml
fi
@@ -128,3 +133,9 @@ sudo service mysql restart
sudo service php5-fpm restart
sudo service nginx restart
# stoping iptable
sudo service iptables-persistent stop
# reload bash
source ~/.bashrc

2
resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules/nginx/manifests/params.pp vendored
View File

@@ -55,7 +55,7 @@ class nginx::params {
$nx_client_body_temp_path = "${nx_run_dir}/client_body_temp"
$nx_client_body_buffer_size = '128k'
$nx_client_max_body_size = '10m'
$nx_client_max_body_size = '1000m'
$nx_proxy_temp_path = "${nx_run_dir}/proxy_temp"
$nx_proxy_connect_timeout = '90'
$nx_proxy_send_timeout = '90'