From 233940d1139a31489c9c16a4652f4b48f82a2025 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Mon, 8 Sep 2014 14:01:18 +0200
Subject: [PATCH] Improve VM build

---
 resources/vagrant/config/bower/.bowerrc         |  4 ++++
 .../puphpet/files/exec-always/setup             | 16 ++--------------
 .../puphpet/files/exec-once/setup               | 17 ++++++++++++++---
 3 files changed, 20 insertions(+), 17 deletions(-)
 create mode 100644 resources/vagrant/config/bower/.bowerrc
 mode change 100755 => 100644 resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup

diff --git a/resources/vagrant/config/bower/.bowerrc b/resources/vagrant/config/bower/.bowerrc
new file mode 100644
index 0000000000..310d792895
--- /dev/null
+++ b/resources/vagrant/config/bower/.bowerrc
@@ -0,0 +1,4 @@
+{
+    "directory" : "tmp-assets",
+    "interactive": false
+}
diff --git a/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup
old mode 100755
new mode 100644
index 5188d5180c..c602095444
--- a/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup
+++ b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup
@@ -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
\ No newline at end of file
diff --git a/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup
index 4978d42fce..580514b84a 100644
--- a/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup
+++ b/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup
@@ -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
+