Phpversion is now passed in args to vagrant up function

resources/ansible/roles/php/handlers/main.yml

@@ -1,3 +1,3 @@
 ---
-- name: restart php5.6-fpm
-  service: name=php5.6-fpm enabled=yes state=restarted
+- name: restart php{{ phpversion }}-fpm
+  service: name=php{{ phpversion }}-fpm enabled=yes state=restarted

resources/ansible/roles/php/tasks/configure.yml

@@ -1,11 +1,11 @@
 ---
-- stat: path=/etc/php/5.6/apache2/php.ini
+- stat: path=/etc/php/{{ phpversion }}/apache2/php.ini
   register: modphp
 
-- stat: path=/etc/php/5.6/fpm/php.ini
+- stat: path=/etc/php/{{ phpversion }}/fpm/php.ini
   register: phpfpm
 
-- stat: path=/etc/php/5.6/cli/php.ini
+- stat: path=/etc/php/{{ phpversion }}/cli/php.ini
   register: phpcli
 
 - include: php-fpm.yml

resources/ansible/roles/php/tasks/main.yml

@@ -1,12 +1,12 @@
 ---
 # Watch repositories task to retrieve repository add
-- name: Install php5.6
+- name: Install php{{ phpversion }}
   sudo: yes
-  apt: pkg=php5.6 state=latest
+  apt: pkg=php{{ phpversion }} state=latest
 
-- name: Install php5.6-fpm
+- name: Install php{{ phpversion }}-fpm
   sudo: yes
-  apt: pkg=php5.6-fpm state=latest
+  apt: pkg=php{{ phpversion }}-fpm state=latest
 
 - name: Install PHP Packages
   sudo: yes
@@ -15,4 +15,4 @@
   when: php.packages is defined
 
 - include: configure.yml
-# - include: pecl.yml
+- include: pecl.yml

resources/ansible/roles/php/tasks/mod-php.yml

@@ -1,30 +1,30 @@
 ---
 - name: ensure timezone is set in apache2 php.ini
-  lineinfile: dest=/etc/php/5.6/apache2/php.ini
+  lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini
               regexp='date.timezone ='
               line='date.timezone = {{ server.timezone }}'
 
 - name: enabling opcache
-  lineinfile: dest=/etc/php/5.6/apache2/php.ini
+  lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini
               regexp=';?opcache.enable=\d'
               line='opcache.enable=1'
 
 - name: Disable PHP cache limiter
-  lineinfile: dest=/etc/php/5.6/apache2/php.ini
+  lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini
               regexp=';?\s*session.cache_limiter\s*=\s*'
               line='session.cache_limiter = ""'
 
 - name: set post_max_size
-  lineinfile: dest=/etc/php/5.6/apache2/php.ini
+  lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini
               regexp=';?post_max_size\s*=\s*'
               line='post_max_size = 2G'
 
 - name: set upload_max_filesize
-  lineinfile: dest=/etc/php/5.6/apache2/php.ini
+  lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini
               regexp=';?upload_max_filesize\s*=\s*'
               line='upload_max_filesize = 2G'
 
 - name: set max_input_vars
-  lineinfile: dest=/etc/php/5.6/apache2/php.ini
+  lineinfile: dest=/etc/php/{{ phpversion }}/apache2/php.ini
               regexp=';?max_input_vars\s*=\s*'
               line='max_input_vars = 12000'

resources/ansible/roles/php/tasks/pecl.yml

@@ -1,5 +1,5 @@
 - name: Install
-  apt: pkg="php5.6-dev" state=present
+  apt: pkg="php{{ phpversion }}-dev" state=present
   when: php.pecl_packages is defined
 
 - name: Update pecl chennel
@@ -16,7 +16,7 @@
 - name: Create extension .ini file
   template: >
     src="extension.tpl"
-    dest="/etc/php/5.6/mods-available/{{ item.name }}.ini"
+    dest="/etc/php/{{ phpversion }}/mods-available/{{ item.name }}.ini"
     owner="root"
     group="root"
     mode=0644

resources/ansible/roles/php/tasks/php-cli.yml

@@ -1,30 +1,30 @@
 ---
 - name: ensure timezone is set in cli php.ini
-  lineinfile: dest=/etc/php/5.6/cli/php.ini
+  lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini
               regexp='date.timezone ='
               line='date.timezone = {{ server.timezone }}'
 
 - name: enabling opcache cli
-  lineinfile: dest=/etc/php/5.6/cli/php.ini
+  lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini
               regexp=';?opcache.enable_cli=\d'
               line='opcache.enable_cli=1'
 
 - name: Disable PHP cache limiter
-  lineinfile: dest=/etc/php/5.6/cli/php.ini
+  lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini
               regexp=';?\s*session.cache_limiter\s*=\s*'
               line='session.cache_limiter = ""'
 
 - name: set post_max_size
-  lineinfile: dest=/etc/php/5.6/cli/php.ini
+  lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini
               regexp=';?post_max_size\s*=\s*'
               line='post_max_size = 2G'
 
 - name: set upload_max_filesize
-  lineinfile: dest=/etc/php/5.6/cli/php.ini
+  lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini
               regexp=';?upload_max_filesize\s*=\s*'
               line='upload_max_filesize = 2G'
 
 - name: set max_input_vars
-  lineinfile: dest=/etc/php/5.6/cli/php.ini
+  lineinfile: dest=/etc/php/{{ phpversion }}/cli/php.ini
               regexp=';?max_input_vars\s*=\s*'
               line='max_input_vars = 12000'

resources/ansible/roles/php/tasks/php-fpm.yml

@@ -1,48 +1,48 @@
 ---
 - name: Set permissions on socket - owner
-  lineinfile: "dest=/etc/php/5.6/fpm/pool.d/www.conf state=present regexp='^;?listen.owner' line='listen.owner = www-data'"
-  notify: restart php5.6-fpm
+  lineinfile: "dest=/etc/php/{{ phpversion }}/fpm/pool.d/www.conf state=present regexp='^;?listen.owner' line='listen.owner = www-data'"
+  notify: restart php{{ phpversion }}-fpm
 
 - name: Set permissions on socket - group
-  lineinfile: "dest=/etc/php/5.6/fpm/pool.d/www.conf state=present regexp='^;?listen.group' line='listen.group = www-data'"
-  notify: restart php5.6-fpm
+  lineinfile: "dest=/etc/php/{{ phpversion }}/fpm/pool.d/www.conf state=present regexp='^;?listen.group' line='listen.group = www-data'"
+  notify: restart php{{ phpversion }}-fpm
 
 - name: Set permissions on socket - mode
-  lineinfile: "dest=/etc/php/5.6/fpm/pool.d/www.conf state=present regexp='^;?listen.mode' line='listen.mode = 0660'"
-  notify: restart php5.6-fpm
+  lineinfile: "dest=/etc/php/{{ phpversion }}/fpm/pool.d/www.conf state=present regexp='^;?listen.mode' line='listen.mode = 0660'"
+  notify: restart php{{ phpversion }}-fpm
 
 - name: ensure timezone is set in fpm php.ini
-  lineinfile: dest=/etc/php/5.6/fpm/php.ini
+  lineinfile: dest=/etc/php/{{ phpversion }}/fpm/php.ini
               regexp='date.timezone ='
               line='date.timezone = {{ server.timezone }}'
-  notify: restart php5.6-fpm
+  notify: restart php{{ phpversion }}-fpm
 
 - name: enabling opcache
-  lineinfile: dest=/etc/php/5.6/fpm/php.ini
+  lineinfile: dest=/etc/php/{{ phpversion }}/fpm/php.ini
               regexp=';?opcache.enable=\d'
               line='opcache.enable=1'
-  notify: restart php5.6-fpm
+  notify: restart php{{ phpversion }}-fpm
 
 - name: Disable PHP cache limiter
-  lineinfile: dest=/etc/php/5.6/fpm/php.ini
+  lineinfile: dest=/etc/php/{{ phpversion }}/fpm/php.ini
               regexp=';?\s*session.cache_limiter\s*=\s*'
               line='session.cache_limiter = ""'
-  notify: restart php5.6-fpm
+  notify: restart php{{ phpversion }}-fpm
 
 - name: set post_max_size
-  lineinfile: dest=/etc/php/5.6/fpm/php.ini
+  lineinfile: dest=/etc/php/{{ phpversion }}/fpm/php.ini
               regexp=';?post_max_size\s*=\s*'
               line='post_max_size = 2G'
-  notify: restart php5.6-fpm
+  notify: restart php{{ phpversion }}-fpm
 
 - name: set upload_max_filesize
-  lineinfile: dest=/etc/php/5.6/fpm/php.ini
+  lineinfile: dest=/etc/php/{{ phpversion }}/fpm/php.ini
               regexp=';?upload_max_filesize\s*=\s*'
               line='upload_max_filesize = 2G'
-  notify: restart php5.6-fpm
+  notify: restart php{{ phpversion }}-fpm
 
 - name: set max_input_vars
-  lineinfile: dest=/etc/php/5.6/fpm/php.ini
+  lineinfile: dest=/etc/php/{{ phpversion }}/fpm/php.ini
               regexp=';?max_input_vars\s*=\s*'
               line='max_input_vars = 12000'
-  notify: restart php5.6-fpm
+  notify: restart php{{ phpversion }}-fpm