From 0273a0d07c12be6a36121d9e753877f62df76156 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Tue, 21 Mar 2017 18:21:30 +0100
Subject: [PATCH] Improve tasks names

---
 packweb-apache/tasks/main.yml | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/packweb-apache/tasks/main.yml b/packweb-apache/tasks/main.yml
index feb60529..6729233a 100644
--- a/packweb-apache/tasks/main.yml
+++ b/packweb-apache/tasks/main.yml
@@ -1,26 +1,23 @@
 ---
-# tasks file for packweb-apache
-
-
-- name: Setting /etc/skel/
+- name: Add elements to user account template
   file:
     path: "/etc/skel/{{ item.path }}"
     state: "{{ item.state }}"
     mode: "{{ item.mode }}"
   with_items:
-  - {path: log, mode: "0750", state: directory}
-  - {path: awstats, mode: "0750", state: directory}
-  - {path: www, mode: "0750", state: directory}
-  - {path: log/access.log, mode: "0644", state: touch}
-  - {path: log/error.log, mode: "0644", state: touch}
+  - { path: log, mode: "0750", state: directory }
+  - { path: awstats, mode: "0750", state: directory }
+  - { path: www, mode: "0750", state: directory }
+  - { path: log/access.log, mode: "0644", state: touch }
+  - { path: log/error.log, mode: "0644", state: touch }
 
-- name: Setting DIR_MODE in /etc/adduser.conf to 0750
+- name: Force DIR_MODE to 0750 in /etc/adduser.conf
   lineinfile:
     dest: /etc/adduser.conf
     regexp: '^DIR_MODE='
     line: 'DIR_MODE=0750'
 
-- name: is PATH already present?
+- name: Check if Apache envvars have a PATH
   command: "grep -E '^export PATH ' /etc/apache2/envvars"
   failed_when: False
   changed_when: False
@@ -28,7 +25,7 @@
   #check_mode: no (for migration to Ansible 2.2)
   always_run: yes
 
-- name: Add a mark in envvars for PATH
+- name: Add a PATH envvar for Apache
   blockinfile:
     dest: /etc/apache2/envvars
     marker: "## {mark} ANSIBLE MANAGED BLOCK FOR PATH"
@@ -37,16 +34,16 @@
       export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
   when: envvar_grep_path.rc != 0
 
-- name: packages are installed
+- name: Additional packages are installed
   apt:
     name: '{{ item }}'
     state: present
   with_items:
-  - libapache2-mod-evasive
   - apache2-mpm-itk
+  - libapache2-mod-evasive
   - libapache2-mod-security2
 
-- name: Copy Apache itk and evasive settings
+- name: Copy Apache settings for modules
   copy:
     src: "{{ item }}"
     dest: "/etc/apache2/conf-available/{{ item }}"
@@ -59,7 +56,7 @@
   - evolinux-evasive.conf
   - evolinux-modsec.conf
 
-- name: Ensure Apache config files are enabled
+- name: Ensure Apache modules configs are enabled
   command: "a2enconf {{ item }}"
   register: command_result
   changed_when: "'Enabling' in command_result.stderr"
@@ -68,7 +65,7 @@
   - evolinux-evasive
   - evolinux-modsec
 
-- name: Is log2mail installed?
+- name: Check if log2mail is installed
   command: "apt list --installed log2mail"
   register: command_result
   changed_when: False
@@ -76,7 +73,7 @@
 - debug:
     var: command_result
 
-- name: Add log2mail config for apache segfault
+- name: Add log2mail config for Apache segfaults
   template:
     src: log2mail-apache.j2
     dest: "/etc/log2mail/config/apache"