diff --git a/Vagrantfile b/Vagrantfile index 6f032f4d2b..a1b93fb5e6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -79,7 +79,7 @@ Vagrant.configure("2") do |config| end if folder['source'] != '' && folder['target'] != '' if folder['sync_type'] == 'nfs' - node.vm.synced_folder "#{folder['source']}", "#{folder['target']}", id: "#{i}", type: "nfs" + node.vm.synced_folder "#{folder['source']}", "#{folder['target']}", id: "#{i}", type: "nfs", mount_options: ['rw', 'vers=3', 'tcp', 'fsc'] elsif folder['sync_type'] == 'smb' node.vm.synced_folder "#{folder['source']}", "#{folder['target']}", id: "#{i}", type: "smb" elsif folder['sync_type'] == 'rsync' @@ -155,7 +155,8 @@ Vagrant.configure("2") do |config| end v.memory = "#{data['vm']['memory']}" - + v.cpus = "#{data['vm']['cpus']}" + if data['vm']['hostname'].to_s.strip.length != 0 v.name = node.vm.hostname end diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml b/vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml index 94b22fe6f2..e288891824 100644 --- a/vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml +++ b/vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml @@ -6,6 +6,7 @@ vagrantfile-local: box_url: puphpet/debian75-x64 hostname: phraseanet-php54-nginx memory: '2048' + cpus: '2' chosen_provider: virtualbox network: private_network: 192.168.56.101 @@ -84,6 +85,7 @@ server: - libfreetype6-dev - libgif-dev - libjpeg62-dev + - cachefilesd dot_files: - bash_aliases: null @@ -183,6 +185,7 @@ php: - mysql - mbstring - sqlite + - redis pear: { } pecl: - zip diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup b/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup index 00ba60e2b3..33b4febd88 100755 --- a/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup +++ b/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup @@ -7,4 +7,20 @@ sudo iptables -I INPUT -p tcp --dport 15672 -j ACCEPT sudo iptables -I INPUT -p tcp --dport 9200 -j ACCEPT # open mysql ports -sudo iptables -I INPUT -p tcp --dport 3306 -j ACCEPT \ No newline at end of file +sudo iptables -I INPUT -p tcp --dport 3306 -j ACCEPT + +#closure +echo 'export JS_COMPILER=$HOME/closure/compiler.jar' >> ~/.bashrc +source ~/.bashrc + +# java +echo 'export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64/jre/' >> ~/.bashrc +source ~/.bashrc + +# locales + +export LANGUAGE=fr_FR.UTF-8 +export LANG=fr_FR.UTF-8 +export LC_ALL=fr_FR.UTF-8 + +source ~/.bashrc \ No newline at end of file diff --git a/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup b/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup index fd4654ed33..1265fe50e0 100644 --- a/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup +++ b/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup @@ -39,12 +39,6 @@ cd /tmp wget –quiet http://dl.google.com/closure-compiler/compiler-latest.zip unzip compiler-latest.zip -d closure mv closure $HOME -echo 'export JS_COMPILER=$HOME/closure/compiler.jar' >> ~/.bashrc -source ~/.bashrc - -# java -echo 'export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64/jre/' >> ~/.bashrc -source ~/.bashrc #twig cd /tmp @@ -104,6 +98,9 @@ if [ $? -eq 0 ]; then sudo sh -c 'echo ";extension=libevent.so" > /etc/php5/fpm/conf.d/libevent.ini' fi +# cache file sd +sudo sh -c 'echo "RUN=yes" > /etc/default/cachefilesd' + # copy www.conf sudo sh -c "cat /vagrant/vagrant/config/nginx/php5-fpm-www.conf > /etc/php5/fpm/pool.d/www.conf"