diff --git a/20_conditions/Readme b/20_conditions/Readme
new file mode 100644
index 0000000..4806bc9
--- /dev/null
+++ b/20_conditions/Readme
@@ -0,0 +1,24 @@
+
+Tâche: Utiliser des conditions
+Condition: très souvent ;)
+Norme: éditeur de texte, modules template
+
+Objectif: Ajouter le support de php à la demande
+
+Rajouter une variable booleenne apache_use_php.
+
+Positionnée à "true", cette variable entraîne:
+ - l'installation du paquet php-fpm
+ - le lancement et l'activation du service php-fpm
+ - l'ajout dans la configuration apache des directives suivantes:
+
+
+ SetHandler proxy:fcgi://localhost:9000
+
+
+
+Prérequis:
+ * On peut se baser sur l'exercice précédent.
+
+Validation: le playbook s'exécute correctement sur nos cibles.
+Chaque cible héberge plusieurs sites différents.
\ No newline at end of file
diff --git a/20_conditions/myapache4/README.md b/20_conditions/myapache4/README.md
index 4b2f3e0..f41bd0d 100644
--- a/20_conditions/myapache4/README.md
+++ b/20_conditions/myapache4/README.md
@@ -12,7 +12,7 @@ None
Role Variables
--------------
-
+apache_user_php - default False
http_port: 80
servername: orsys.fr
serveralias: "www.{{ servername }}"
diff --git a/20_conditions/myapache4/defaults/main.yml b/20_conditions/myapache4/defaults/main.yml
index 8c667e1..465f508 100644
--- a/20_conditions/myapache4/defaults/main.yml
+++ b/20_conditions/myapache4/defaults/main.yml
@@ -1,2 +1,4 @@
---
-# defaults file for myapache
\ No newline at end of file
+# defaults file for myapache
+http_port: 80
+use_php: false
\ No newline at end of file
diff --git a/20_conditions/myapache4/files/info.php b/20_conditions/myapache4/files/info.php
new file mode 100644
index 0000000..1868a00
--- /dev/null
+++ b/20_conditions/myapache4/files/info.php
@@ -0,0 +1,2 @@
+
+ {% if use_php %}
+
+ SetHandler proxy:fcgi://localhost:9000
+
+ {% endif %}
Options {{ vhost.documentrootoptions|default( "none" ) }}
diff --git a/21_myphp/myphp/README.md b/21_myphp/myphp/README.md
deleted file mode 100644
index 225dd44..0000000
--- a/21_myphp/myphp/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-Role Name
-=========
-
-A brief description of the role goes here.
-
-Requirements
-------------
-
-Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
-
-Role Variables
---------------
-
-A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
-
-Dependencies
-------------
-
-A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
-
-Example Playbook
-----------------
-
-Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
-
- - hosts: servers
- roles:
- - { role: username.rolename, x: 42 }
-
-License
--------
-
-BSD
-
-Author Information
-------------------
-
-An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/21_myphp/myphp/defaults/main.yml b/21_myphp/myphp/defaults/main.yml
deleted file mode 100644
index 9edcbb6..0000000
--- a/21_myphp/myphp/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# defaults file for myphp
\ No newline at end of file
diff --git a/21_myphp/myphp/handlers/main.yml b/21_myphp/myphp/handlers/main.yml
deleted file mode 100644
index 8b10e1b..0000000
--- a/21_myphp/myphp/handlers/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# handlers file for myphp
\ No newline at end of file
diff --git a/21_myphp/myphp/meta/main.yml b/21_myphp/myphp/meta/main.yml
deleted file mode 100644
index 7223799..0000000
--- a/21_myphp/myphp/meta/main.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-galaxy_info:
- author: your name
- description: your description
- company: your company (optional)
-
- # If the issue tracker for your role is not on github, uncomment the
- # next line and provide a value
- # issue_tracker_url: http://example.com/issue/tracker
-
- # Some suggested licenses:
- # - BSD (default)
- # - MIT
- # - GPLv2
- # - GPLv3
- # - Apache
- # - CC-BY
- license: license (GPLv2, CC-BY, etc)
-
- min_ansible_version: 1.2
-
- # If this a Container Enabled role, provide the minimum Ansible Container version.
- # min_ansible_container_version:
-
- # Optionally specify the branch Galaxy will use when accessing the GitHub
- # repo for this role. During role install, if no tags are available,
- # Galaxy will use this branch. During import Galaxy will access files on
- # this branch. If Travis integration is configured, only notifications for this
- # branch will be accepted. Otherwise, in all cases, the repo's default branch
- # (usually master) will be used.
- #github_branch:
-
- #
- # platforms is a list of platforms, and each platform has a name and a list of versions.
- #
- # platforms:
- # - name: Fedora
- # versions:
- # - all
- # - 25
- # - name: SomePlatform
- # versions:
- # - all
- # - 1.0
- # - 7
- # - 99.99
-
- galaxy_tags: []
- # List tags for your role here, one per line. A tag is a keyword that describes
- # and categorizes the role. Users find roles by searching for tags. Be sure to
- # remove the '[]' above, if you add tags to this list.
- #
- # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
- # Maximum 20 tags per role.
-
-dependencies: []
- # List your role dependencies here, one per line. Be sure to remove the '[]' above,
- # if you add dependencies to this list.
\ No newline at end of file
diff --git a/21_myphp/myphp/tasks/main.yml b/21_myphp/myphp/tasks/main.yml
deleted file mode 100644
index a54d17b..0000000
--- a/21_myphp/myphp/tasks/main.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-# tasks file for myphp
-- name: import distribution specific variables
- tags: php
- include_vars: "{{ ansible_distribution|lower }}.yml"
-
-- name: install php modules
- tags: php
- package:
- name: "{{ item }}"
- state: latest
- with_items:
- "{{ packages_list }}"
\ No newline at end of file
diff --git a/21_myphp/myphp/tests/inventory b/21_myphp/myphp/tests/inventory
deleted file mode 100644
index 878877b..0000000
--- a/21_myphp/myphp/tests/inventory
+++ /dev/null
@@ -1,2 +0,0 @@
-localhost
-
diff --git a/21_myphp/myphp/tests/test.yml b/21_myphp/myphp/tests/test.yml
deleted file mode 100644
index 19ca46b..0000000
--- a/21_myphp/myphp/tests/test.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- hosts: localhost
- remote_user: root
- roles:
- - myphp
\ No newline at end of file
diff --git a/21_myphp/myphp/vars/centos.yml b/21_myphp/myphp/vars/centos.yml
deleted file mode 100644
index f541bdc..0000000
--- a/21_myphp/myphp/vars/centos.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-
----
-# distribution dependent vars file for myphp
-packages_list:
- - php-gd
- - php-pdo
\ No newline at end of file
diff --git a/21_myphp/myphp/vars/debian.yml b/21_myphp/myphp/vars/debian.yml
deleted file mode 100644
index db0ab0f..0000000
--- a/21_myphp/myphp/vars/debian.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-
----
-# distribution dependent vars file for myphp
-packages_list:
- - php-gd
- - php-mysql
\ No newline at end of file
diff --git a/21_myphp/myphp/vars/main.yml b/21_myphp/myphp/vars/main.yml
deleted file mode 100644
index 9fb745b..0000000
--- a/21_myphp/myphp/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# vars file for myphp
\ No newline at end of file
diff --git a/21_myphp/myphp/vars/redhat.yml b/21_myphp/myphp/vars/redhat.yml
deleted file mode 100644
index f541bdc..0000000
--- a/21_myphp/myphp/vars/redhat.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-
----
-# distribution dependent vars file for myphp
-packages_list:
- - php-gd
- - php-pdo
\ No newline at end of file
diff --git a/21_myphp/php.yml b/21_myphp/php.yml
deleted file mode 100644
index c9f0c40..0000000
--- a/21_myphp/php.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: install apache via ansible playbook
- hosts: test
- user: ansible
- become: true
- roles:
- - myapache4
- - myphp
-