Switches ton ondej PPA and adds tests

Switched to ondej PPA to get more recent PHP versions
Added vagrant tests

Author: leucos

.gitignore

@@ -1,2 +1,3 @@
 .tags
-
+.vagrant
+*.log

README.md

@@ -1,7 +1,7 @@
-php7-fpm Ansible playbook
-=========================
+php7-fpm Ansible role
+=====================
 
-This playbook will install php7-fpm in Xenial (16.04)
+This role will install php7-fpm in Xenial (16.04)
 
 Requirements
 ------------

Vagrantfile

@@ -0,0 +1,16 @@
+Vagrant.configure(2) do |config|
+  config.vm.box = "ubuntu/xenial64"
+
+  config.vm.provider "virtualbox" do |v|
+    v.linked_clone = true
+  end
+
+  config.vm.define "php7" do |php7|
+  end
+
+  config.vm.provision "shell",
+    :path => "vagrant_specs.sh",
+    :upload_path => "/home/ubuntu/specs",
+    # change role name below
+    :args => "--install ansible-php7-fpm"
+end

handlers/main.yml

@@ -1,4 +1,5 @@
 - name:  Restart php7-fpm
-  service: name=php7.0-fpm state=restarted
-  notify:
-    - Restart nginx
+  service: 
+    name: php{{ php7_version }}-fpm
+    state: restarted
+

meta/main.yml

@@ -16,6 +16,5 @@ galaxy_info:
   categories:
     - development
 
-dependencies:
-  - role: ansible-nginx
+dependencies: []
 

tasks/main.yml

@@ -1 +1,2 @@
-- include: php7-fpm.yml tags=php7-fpm
+- include: php7-fpm.yml
+  tags: ["php7-fpm"]

tasks/php7-fpm.yml

@@ -1,32 +1,46 @@
+- name: Adds ondrej repos
+  apt_repository:
+    repo: "ppa:ondrej/php"
+    update_cache: yes
+
+- name: Show selected php7_version
+  debug: msg="Deploying php7 version {{ php7_version }}"
+
 - name: Installs php7-fpm
-  apt: 
+  apt:
     pkg: "{{ item }}"
     state: latest
     update_cache: yes
   notify:
     - Restart php7-fpm
   with_items:
-    - php7.0-fpm
+    - composer
+    - php{{ php7_version }}-fpm
     - php-apcu
-    - php7.0-mcrypt
-    - php7.0-gd
-    - php7.0-curl
+    - php{{ php7_version }}-mcrypt
+    - php{{ php7_version }}-gd
+    - php{{ php7_version }}-curl
     - php-pear
-    - php7.0-mysql
+    - php{{ php7_version }}-mysql
 
 - name: Adds php.ini
-  template: 
+  template:
     src: "../templates/php.ini.j2"
-    dest: /etc/php/7.0/fpm/php.ini
+    dest: /etc/php/{{ php7_version }}/fpm/php.ini
     backup: yes
   notify:
     - Restart php7-fpm
-    - Restart nginx
+
+- name: Checks if nginx is already installed
+  stat:
+    path: /etc/nginx/conf.d/
+  register: __nginx_config_dir
 
 - name: Adds nginx buffer tuning
   template:
     src: "../templates/fastcgi_buffers.conf.j2"
     dest: /etc/nginx/conf.d/fastcgi_buffers.conf
+  when: __nginx_config_dir is defined and __nginx_config_dir.isdir is defined and __nginx_config_dir.isdir
   notify:
     - Restart php7-fpm
     - Restart nginx
@@ -40,4 +54,3 @@
   shell: pear install {{ item }}
   with_items: pear.packages
   when: pear is defined
-

tests/ansible-php7-fpm/inventory/hosts

@@ -0,0 +1 @@
+placeholder_fqdn

tests/ansible-php7-fpm/playbooks/test.retry

@@ -0,0 +1 @@
+ubuntu-xenial.localdomain

tests/ansible-php7-fpm/playbooks/test.yml

@@ -0,0 +1,7 @@
+---
+
+- hosts: all
+  sudo: true
+
+  roles:
+    - role: ansible-php7-fpm