From 38fe109fa0e7830ae0514293a8c7492104b31679 Mon Sep 17 00:00:00 2001
From: Dirk Pahl <dirk.pahl@web.de>
Date: Fri, 24 Feb 2017 23:12:41 +0100
Subject: [PATCH] Set PHP default version to 7.0, upgrade Ubuntu to 16.04

---
 Readme.md                                     |  8 ++++++-
 Vagrantfile                                   |  2 +-
 .../roles/laravel-quickstart/tasks/main.yml   |  2 +-
 playbooks/roles/php-fpm/handlers/main.yml     |  2 +-
 playbooks/roles/php-fpm/tasks/main.yml        |  2 +-
 playbooks/roles/php/defaults/main.yml         |  1 +
 playbooks/roles/php/tasks/main.yml            | 24 ++++++++++++-------
 .../roles/symfony-standard/tasks/main.yml     |  2 +-
 8 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/Readme.md b/Readme.md
index 287cbda..eaaef69 100644
--- a/Readme.md
+++ b/Readme.md
@@ -31,7 +31,7 @@ Installed components
 
 * [Nginx](http://nginx.org)
 * [MySQL](http://dev.mysql.com/downloads/mysql/)
-* [PHP 5.6](http://www.php.net/)
+* [PHP 7.0](http://www.php.net/)
 * [php-fpm](http://php-fpm.org)
 * [git](http://git-scm.com/)
 * [Composer](https://getcomposer.org/)
@@ -39,10 +39,16 @@ Installed components
 * [Laravel](https://laravel.com/)
 * [PHPUnit](https://phpunit.de/)
 
+If you don't like/need some of the components just remove them from the roles section in playbook/vagrant.yml.
+
 Changes
 -------
 
 ### unreleased
+
+* Introduce php_version variable, set PHP default version to 7.0 [#33](https://github.com/dirkaholic/vagrant-php-dev-box/pull/33)
+* Upgrade Ubuntu box to 16.04 (latest LTS version) [#33](https://github.com/dirkaholic/vagrant-php-dev-box/pull/33)
+
 ### v1.4.0
 
 * Transfer ansible playbooks to roles [#31](https://github.com/dirkaholic/vagrant-php-dev-box/pull/31)
diff --git a/Vagrantfile b/Vagrantfile
index 84affb3..95d4755 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,7 +3,7 @@ Vagrant.require_version ">= 1.7.0"
 
 Vagrant.configure(2) do |config|
 
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = "bento/ubuntu-16.04"
 
   # Disable the new default behavior introduced in Vagrant 1.7, to
   # ensure that all Vagrant machines will use the same SSH key pair.
diff --git a/playbooks/roles/laravel-quickstart/tasks/main.yml b/playbooks/roles/laravel-quickstart/tasks/main.yml
index 05f1376..03a126e 100644
--- a/playbooks/roles/laravel-quickstart/tasks/main.yml
+++ b/playbooks/roles/laravel-quickstart/tasks/main.yml
@@ -37,7 +37,7 @@
 - name: Copy across new php-fpm pool config for laravel
   template:
     src=php-fpm.conf.j2
-    dest=/etc/php/5.6/fpm/pool.d/laravel.conf
+    dest=/etc/php/{{ php_version }}/fpm/pool.d/laravel.conf
   notify:
     - restart php-fpm
 
diff --git a/playbooks/roles/php-fpm/handlers/main.yml b/playbooks/roles/php-fpm/handlers/main.yml
index 7e4941b..cbb8a2a 100644
--- a/playbooks/roles/php-fpm/handlers/main.yml
+++ b/playbooks/roles/php-fpm/handlers/main.yml
@@ -1,2 +1,2 @@
 - name: restart php-fpm
-  service: name=php5.6-fpm state=restarted
\ No newline at end of file
+  service: name=php{{ php_version }}-fpm state=restarted
\ No newline at end of file
diff --git a/playbooks/roles/php-fpm/tasks/main.yml b/playbooks/roles/php-fpm/tasks/main.yml
index 7f6acc2..2539e38 100644
--- a/playbooks/roles/php-fpm/tasks/main.yml
+++ b/playbooks/roles/php-fpm/tasks/main.yml
@@ -1,3 +1,3 @@
 ---
 - name: Install php-fpm
-  apt: name=php5.6-fpm state=present
\ No newline at end of file
+  apt: name=php{{ php_version }}-fpm state=present
\ No newline at end of file
diff --git a/playbooks/roles/php/defaults/main.yml b/playbooks/roles/php/defaults/main.yml
index 263d07f..4c7f741 100644
--- a/playbooks/roles/php/defaults/main.yml
+++ b/playbooks/roles/php/defaults/main.yml
@@ -1,2 +1,3 @@
 ---
+php_version: 7.0
 composer_process_timeout: 900
\ No newline at end of file
diff --git a/playbooks/roles/php/tasks/main.yml b/playbooks/roles/php/tasks/main.yml
index b53f9ae..dcfb046 100644
--- a/playbooks/roles/php/tasks/main.yml
+++ b/playbooks/roles/php/tasks/main.yml
@@ -1,22 +1,28 @@
 ---
-- name: Add apt repository for PHP 5.6
+- name: Add apt key for PHP ppa
+  apt_key:
+    keyserver: keyserver.ubuntu.com
+    id: 14AA40EC0831756756D7F66C4F4EA0AAE5267A6C
+    state: present
+
+- name: Add apt repository for PHP
   apt_repository: repo='ppa:ondrej/php/ubuntu'
 
 - name: Install python-software-properties
   apt: name=python-software-properties state=present
 
-- name: Install php 5.6
-  apt: name=php5.6 state=present
+- name: Install PHP
+  apt: name=php{{ php_version }} state=present
 
 - name: Install required php packages
   apt: name={{ item }} state=present
   with_items:
-    - php5.6-mysql
-    - php5.6-intl
-    - php5.6-cli
-    - php5.6-mcrypt
-    - php5.6-mbstring
-    - php5.6-dom
+    - php{{ php_version }}-mysql
+    - php{{ php_version }}-intl
+    - php{{ php_version }}-cli
+    - php{{ php_version }}-mcrypt
+    - php{{ php_version }}-mbstring
+    - php{{ php_version }}-dom
 
 - name: Enable the MCrypt extension
   shell: phpenmod mcrypt
diff --git a/playbooks/roles/symfony-standard/tasks/main.yml b/playbooks/roles/symfony-standard/tasks/main.yml
index 73018a1..2b517ce 100644
--- a/playbooks/roles/symfony-standard/tasks/main.yml
+++ b/playbooks/roles/symfony-standard/tasks/main.yml
@@ -27,7 +27,7 @@
 - name: Copy across new php-fpm pool config for symfony
   template:
     src=php-fpm.conf.j2
-    dest=/etc/php/5.6/fpm/pool.d/symfony.conf
+    dest=/etc/php/{{ php_version }}/fpm/pool.d/symfony.conf
   notify:
     - restart php-fpm