Merge pull request #29 from dirkaholic/feature/php5.6-repo

Adjust PHP repository and settings to fix PHP 5.6 installation

Author: dirkaholic

playbooks/tasks/laravel-quickstart.yml

@@ -31,7 +31,7 @@
 - name: Copy across new php-fpm pool config for laravel
   template:
     src=php-fpm/laravel.conf.j2
-    dest=/etc/php5/fpm/pool.d/laravel.conf
+    dest=/etc/php/5.6/fpm/pool.d/laravel.conf
   notify:
     - restart php-fpm
 

playbooks/tasks/php-fpm.yml

@@ -1,3 +1,3 @@
 ---
 - name: Install php-fpm
-  apt: name=php5-fpm state=present
+  apt: name=php5.6-fpm state=present

playbooks/tasks/php.yml

@@ -1,23 +1,23 @@
 ---
 - name: Add apt repository for PHP 5.6
-  apt_repository: repo='ppa:ondrej/php5-5.6'
+  apt_repository: repo='ppa:ondrej/php/ubuntu'
 
 - name: Install python-software-properties
   apt: name=python-software-properties state=present
 
-- name: Install php
-  apt: name=php5 state=present
+- name: Install php 5.6
+  apt: name=php5.6 state=present
 
 - name: Install required php packages
   apt: name={{ item }} state=present
   with_items:
-    - php5-mysql
-    - php5-intl
-    - php5-cli
-    - php5-mcrypt
+    - php5.6-mysql
+    - php5.6-intl
+    - php5.6-cli
+    - php5.6-mcrypt
 
 - name: Enable the MCrypt extension
-  shell: php5enmod mcrypt
+  shell: phpenmod mcrypt
 
 - name: Install composer
   shell: curl -sS https://getcomposer.org/installer | sudo php -- --install-dir=/usr/local/bin --filename=composer

playbooks/tasks/symfony-standard.yml

@@ -25,7 +25,7 @@
 - name: Copy across new php-fpm pool config for symfony
   template:
     src=php-fpm/symfony.conf.j2
-    dest=/etc/php5/fpm/pool.d/symfony.conf
+    dest=/etc/php/5.6/fpm/pool.d/symfony.conf
   notify:
     - restart php-fpm
 

playbooks/vagrant.yml

@@ -1,6 +1,6 @@
 ---
 - hosts: all
-  sudo: true
+  become: true
   vars:
     document_root: /vagrant
     www_user: vagrant
@@ -9,7 +9,7 @@
     - name: restart nginx
       service: name=nginx state=restarted
     - name: restart php-fpm
-      service: name=php5-fpm state=restarted
+      service: name=php5.6-fpm state=restarted
   pre_tasks:
     - name: update apt cache
       apt: update_cache=yes