From 4d9b975ae288f865b9e49a55460f14f869c0719f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= <bburnichon@alchemy.fr>
Date: Tue, 1 Dec 2015 15:19:19 +0100
Subject: [PATCH] Change node install method

---
 resources/ansible/playbook.yml                | 1 +
 resources/ansible/roles/app/tasks/main.yml    | 2 +-
 resources/ansible/roles/node/tasks/main.yml   | 6 ++++++
 resources/ansible/roles/php/tasks/mod-php.yml | 2 +-
 resources/ansible/roles/php/tasks/php-cli.yml | 2 +-
 resources/ansible/roles/php/tasks/php-fpm.yml | 2 +-
 resources/ansible/vars/all.yml                | 4 ++--
 7 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 resources/ansible/roles/node/tasks/main.yml

diff --git a/resources/ansible/playbook.yml b/resources/ansible/playbook.yml
index 9690635c98..7a8d4d5ce8 100644
--- a/resources/ansible/playbook.yml
+++ b/resources/ansible/playbook.yml
@@ -13,4 +13,5 @@
     - xdebug
     - composer
     - mailcatcher
+    - node
     - app
diff --git a/resources/ansible/roles/app/tasks/main.yml b/resources/ansible/roles/app/tasks/main.yml
index b9ba605b14..5b81cc12f0 100644
--- a/resources/ansible/roles/app/tasks/main.yml
+++ b/resources/ansible/roles/app/tasks/main.yml
@@ -1,4 +1,4 @@
 ---
 # application tasks to be customized and to run after the main provision
 - name: Install global npm packages
-  shell: npm install -g bower recess
+  shell: . /usr/local/nvm/nvm.sh && npm install -g bower recess
diff --git a/resources/ansible/roles/node/tasks/main.yml b/resources/ansible/roles/node/tasks/main.yml
new file mode 100644
index 0000000000..f9a30ee117
--- /dev/null
+++ b/resources/ansible/roles/node/tasks/main.yml
@@ -0,0 +1,6 @@
+---
+- name: Install NVM
+  shell: curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.29.0/install.sh | NVM_DIR=/usr/local/nvm /bin/bash creates=/usr/local/nvm
+
+- name: Install specific nodejs version
+  shell: . /usr/local/nvm/nvm.sh && nvm install 0.12.0 && nvm alias default 0.12.0
diff --git a/resources/ansible/roles/php/tasks/mod-php.yml b/resources/ansible/roles/php/tasks/mod-php.yml
index 9a994cda3b..c7041854f5 100644
--- a/resources/ansible/roles/php/tasks/mod-php.yml
+++ b/resources/ansible/roles/php/tasks/mod-php.yml
@@ -11,5 +11,5 @@
 
 - name: Disable PHP cache limiter
   lineinfile: dest=/etc/php5/apache2/php.ini
-              regexp='^\(session.cache_limiter = \).*'
+              regexp=';?\s*session.cache_limiter\s*=\s*'
               line='session.cache_limiter = ""'
diff --git a/resources/ansible/roles/php/tasks/php-cli.yml b/resources/ansible/roles/php/tasks/php-cli.yml
index dd41e417b4..3d18122eeb 100644
--- a/resources/ansible/roles/php/tasks/php-cli.yml
+++ b/resources/ansible/roles/php/tasks/php-cli.yml
@@ -11,5 +11,5 @@
 
 - name: Disable PHP cache limiter
   lineinfile: dest=/etc/php5/cli/php.ini
-              regexp='^\(session.cache_limiter = \).*'
+              regexp=';?\s*session.cache_limiter\s*=\s*'
               line='session.cache_limiter = ""'
diff --git a/resources/ansible/roles/php/tasks/php-fpm.yml b/resources/ansible/roles/php/tasks/php-fpm.yml
index 0e48d05c40..de9d87dee5 100644
--- a/resources/ansible/roles/php/tasks/php-fpm.yml
+++ b/resources/ansible/roles/php/tasks/php-fpm.yml
@@ -20,5 +20,5 @@
 
 - name: Disable PHP cache limiter
   lineinfile: dest=/etc/php5/fpm/php.ini
-              regexp='^\(session.cache_limiter = \).*'
+              regexp=';?\s*session.cache_limiter\s*=\s*'
               line='session.cache_limiter = ""'
diff --git a/resources/ansible/vars/all.yml b/resources/ansible/vars/all.yml
index 97991f622b..3d82264479 100644
--- a/resources/ansible/vars/all.yml
+++ b/resources/ansible/vars/all.yml
@@ -6,8 +6,6 @@ server:
         - git
         - imagemagick
         - htop
-        - nodejs
-        - npm
         - iotop
         - pkg-config
         - libzmq3-dev
@@ -16,6 +14,8 @@ server:
         - sqlite3
         - libsqlite3-dev
         - memcached
+        - build-essential
+        - libssl-dev
     timezone: UTC
     locales:
         - en_GB.UTF-8