From b5dde2437431af85d234b4bbe59b2e12ecefdc93 Mon Sep 17 00:00:00 2001
From: Thomas Constans <thomas@opendoor.fr>
Date: Mon, 14 Nov 2022 16:37:30 +0100
Subject: [PATCH] instructions abr

---
 Readme                            | 24 -------------
 Readme.md                         | 29 ++++++++++++++++
 apache.yml                        |  7 ----
 myapache4/README.md               | 45 ------------------------
 myapache4/defaults/main.yml       |  4 ---
 myapache4/files/index.html        |  1 -
 myapache4/files/info.php          |  2 --
 myapache4/handlers/main.yml       | 11 ------
 myapache4/meta/main.yml           | 57 ------------------------------
 myapache4/tasks/main.yml          | 58 -------------------------------
 myapache4/tasks/php.yml           | 20 -----------
 myapache4/templates/vhost.conf.jj | 24 -------------
 myapache4/tests/inventory         |  2 --
 myapache4/tests/test.yml          |  5 ---
 myapache4/vars/centos.yml         |  1 -
 myapache4/vars/debian.yml         |  7 ----
 myapache4/vars/main.yml           | 15 --------
 myapache4/vars/redhat.yml         |  7 ----
 18 files changed, 29 insertions(+), 290 deletions(-)
 delete mode 100644 Readme
 create mode 100644 Readme.md
 delete mode 100644 apache.yml
 delete mode 100644 myapache4/README.md
 delete mode 100644 myapache4/defaults/main.yml
 delete mode 100644 myapache4/files/index.html
 delete mode 100644 myapache4/files/info.php
 delete mode 100644 myapache4/handlers/main.yml
 delete mode 100644 myapache4/meta/main.yml
 delete mode 100644 myapache4/tasks/main.yml
 delete mode 100644 myapache4/tasks/php.yml
 delete mode 100644 myapache4/templates/vhost.conf.jj
 delete mode 100644 myapache4/tests/inventory
 delete mode 100644 myapache4/tests/test.yml
 delete mode 120000 myapache4/vars/centos.yml
 delete mode 100644 myapache4/vars/debian.yml
 delete mode 100644 myapache4/vars/main.yml
 delete mode 100644 myapache4/vars/redhat.yml

diff --git a/Readme b/Readme
deleted file mode 100644
index 4806bc9..0000000
--- a/Readme
+++ /dev/null
@@ -1,24 +0,0 @@
-
-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:
-<code>
-<FilesMatch \.php$>
-   SetHandler proxy:fcgi://localhost:9000
-   </FilesMatch>
-</code>
-
-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/Readme.md b/Readme.md
new file mode 100644
index 0000000..6a5605e
--- /dev/null
+++ b/Readme.md
@@ -0,0 +1,29 @@
+# Conditions
+
+## Prérequis:
+
+Récupérer la solution de l'atelier apache_handlers : https://infra.opendoor.fr/git/tom/sib_12_handlers
+
+```bash
+cd
+git clone -b solution https://infra.opendoor.fr/git/tom/sib_12_handlers sib_conditions
+cd sib_conditions
+```
+## Atelier 1: 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:
+<code>
+<FilesMatch \.php$>
+   SetHandler proxy:fcgi://localhost:9000
+   </FilesMatch>
+</code>
+
+Prérequis:
+  * On peut se baser sur l'exercice précédent.
+
+Validation: le playbook s'exécute correctement sur nos cibles. Suivant la valeur de apache_use_php, le service php-fpm est actif sur la cible
\ No newline at end of file
diff --git a/apache.yml b/apache.yml
deleted file mode 100644
index f82b6b0..0000000
--- a/apache.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- name: install apache via ansible playbook
-  hosts: test
-  user: ansible
-  become: true
-  roles:
-   - myapache4
diff --git a/myapache4/README.md b/myapache4/README.md
deleted file mode 100644
index f41bd0d..0000000
--- a/myapache4/README.md
+++ /dev/null
@@ -1,45 +0,0 @@
-Role Name
-=========
-
-Rôle de deploiement apache sur une centos.
-
-1 seul vhost
-
-Requirements
-------------
-
-None
-
-Role Variables
---------------
-apache_user_php - default False
-http_port: 80
-servername: orsys.fr
-serveralias: "www.{{ servername }}"
-documentroot: /var/www/html/orsys.fr
-accesslog: /var/log/httpd/access_orsys.fr_log
-errorlog: /var/log/httpd/error_orsys.fr_log
-
-Dependencies
-------------
-
-None
-
-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:
-         - { myapache }
-
-License
--------
-
-BSD
-
-Author Information
-------------------
-
-Thomas Constans <thomas@opendoor.fr>
diff --git a/myapache4/defaults/main.yml b/myapache4/defaults/main.yml
deleted file mode 100644
index 465f508..0000000
--- a/myapache4/defaults/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-# defaults file for myapache
-http_port: 80
-use_php: false
\ No newline at end of file
diff --git a/myapache4/files/index.html b/myapache4/files/index.html
deleted file mode 100644
index 416474e..0000000
--- a/myapache4/files/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<h1>hello World</h1>
\ No newline at end of file
diff --git a/myapache4/files/info.php b/myapache4/files/info.php
deleted file mode 100644
index 1868a00..0000000
--- a/myapache4/files/info.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-   echo phpinfo() ;
diff --git a/myapache4/handlers/main.yml b/myapache4/handlers/main.yml
deleted file mode 100644
index c72410b..0000000
--- a/myapache4/handlers/main.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-# handlers file for myapache
-- name: reload httpd
-  service:
-   name: httpd
-   state: reloaded
-
-- name: reload firewalld
-  service:
-     name: firewalld
-     state: reloaded
diff --git a/myapache4/meta/main.yml b/myapache4/meta/main.yml
deleted file mode 100644
index 7223799..0000000
--- a/myapache4/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/myapache4/tasks/main.yml b/myapache4/tasks/main.yml
deleted file mode 100644
index 58e8f28..0000000
--- a/myapache4/tasks/main.yml
+++ /dev/null
@@ -1,58 +0,0 @@
----
-# tasks file for myapache
-- name: import distribution specific variables
-  include_vars: "{{ ansible_distribution|lower }}.yml"
-
-- name: install apache
-  tags: httpd
-  package: 
-    name: "{{ package_name }}"
-    state: latest
-
-- name: conf httpd
-  tags: httpd
-  notify: reload httpd
-  template:
-    src: vhost.conf.jj
-    dest: "{{ apache_conf_dir }}/vhost.conf"
-    mode: 0640
-    owner: root
-    group: "{{ apache_group }}"
-
-- name: activate apache
-  tags: httpd
-  service:
-    name: "{{ service_name }}"
-    enabled: yes
-
-- name: open firewall port
-  tags: httpd
-  firewalld:
-    service: http
-    permanent: yes
-    immediate: yes
-    state: enabled
-  ignore_errors: yes
-  notify: reload firewalld
-  when: ansible_distribution|lower != "debian"
-
-- name: create documentroot
-  tags: httpd
-  file:
-    name: "{{ item.documentroot }}"
-    state: directory
-  with_items:
-    - "{{ apache_vhosts }}"
-
-- name: create index file
-  tags: httpd
-  copy:
-    src: index.html
-    dest: "{{ item.documentroot }}/index.html"
-    mode: 0644
-  with_items:
-    - "{{ apache_vhosts }}"
-
-- name: include php stuff
-  include_tasks: php.yml
-  when: use_php
\ No newline at end of file
diff --git a/myapache4/tasks/php.yml b/myapache4/tasks/php.yml
deleted file mode 100644
index 3aa1be4..0000000
--- a/myapache4/tasks/php.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- name: install php-fpm
-  yum:
-    name: php-fpm
-    state: present
-
-- name: start php-fpm
-  service:
-    name: php-fpm
-    state: started
-    enabled: true
-
-- name: create info file
-  copy:
-    src: info.php
-    dest: "{{ item.documentroot }}/info.php"
-    mode: 0644
-  with_items:
-    - "{{ apache_vhosts }}"
-
diff --git a/myapache4/templates/vhost.conf.jj b/myapache4/templates/vhost.conf.jj
deleted file mode 100644
index 1d08d99..0000000
--- a/myapache4/templates/vhost.conf.jj
+++ /dev/null
@@ -1,24 +0,0 @@
-{% for vhost in apache_vhosts %}
-<VirtualHost *:{{ http_port }}>
-       ServerName			{{ vhost.servername|lower }}
-        ServerAlias		{{ vhost.serveralias }}
-        DocumentRoot		{{ vhost.documentroot }}
-        CustomLog 		{{ vhost.accesslog }} combined
-        ErrorLog        {{ vhost.errorlog }}
-        <Directory />
-                Options none
-                Allowoverride none
-                Require all denied
-        </Directory>
-        {% if use_php %}
-        <FilesMatch \.php$>
-            SetHandler proxy:fcgi://localhost:9000
-         </FilesMatch>
-         {% endif %}
-
-        <Directory {{ vhost.documentroot }}>
-				Options {{ vhost.documentrootoptions|default( "none" ) }}
-            Require all granted
-        </Directory>
-</VirtualHost>
-{% endfor %}
\ No newline at end of file
diff --git a/myapache4/tests/inventory b/myapache4/tests/inventory
deleted file mode 100644
index 878877b..0000000
--- a/myapache4/tests/inventory
+++ /dev/null
@@ -1,2 +0,0 @@
-localhost
-
diff --git a/myapache4/tests/test.yml b/myapache4/tests/test.yml
deleted file mode 100644
index 797e379..0000000
--- a/myapache4/tests/test.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- hosts: localhost
-  remote_user: root
-  roles:
-    - myapache
\ No newline at end of file
diff --git a/myapache4/vars/centos.yml b/myapache4/vars/centos.yml
deleted file mode 120000
index ba2f905..0000000
--- a/myapache4/vars/centos.yml
+++ /dev/null
@@ -1 +0,0 @@
-redhat.yml
\ No newline at end of file
diff --git a/myapache4/vars/debian.yml b/myapache4/vars/debian.yml
deleted file mode 100644
index 03ceb9d..0000000
--- a/myapache4/vars/debian.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-apache_conf_dir: /etc/apache2/sites-enabled
-apache_log_dir: /var/log/apache2
-package_name: apache2
-service_name: apache2
-apache_user: www-data
-apache_group: www-data
diff --git a/myapache4/vars/main.yml b/myapache4/vars/main.yml
deleted file mode 100644
index 1fb822e..0000000
--- a/myapache4/vars/main.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-# vars file for myapache
-http_port: 80
-apache_vhosts:
-- servername: ORSYS.Fr
-  serveralias: www.orsys.fr
-  documentroot: /var/www/html/orsys.fr
-  accesslog: "{{ apache_log_dir }}/access_orsys.fr_log"
-  errorlog:  "{{ apache_log_dir }}/error_orsys.fr_log"
-- servername: thomas.fr
-  serveralias: www.thomas.fr
-  documentroot: /var/www/html/thomas.fr
-  accesslog: "{{ apache_log_dir }}/access_thomas.fr_log"
-  errorlog:  "{{ apache_log_dir }}/error_thomas.fr_log"
-  documentrootoptions: indexes
\ No newline at end of file
diff --git a/myapache4/vars/redhat.yml b/myapache4/vars/redhat.yml
deleted file mode 100644
index c77ed08..0000000
--- a/myapache4/vars/redhat.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-apache_conf_dir: /etc/httpd/conf.d/
-apache_log_dir: /var/log/httpd
-package_name: httpd
-service_name: httpd
-apache_user: apache
-apache_group: apache