From ca2048f9e35bfec9f8012d3c803cc8df333c3840 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Thu, 14 Sep 2017 08:55:15 +0200
Subject: [PATCH] squid: fix variable name

---
 squid/tasks/logrotate.yml    | 2 +-
 squid/tasks/main.yml         | 6 +++---
 squid/templates/log2mail.j2  | 2 +-
 squid/templates/logrotate.j2 | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/squid/tasks/logrotate.yml b/squid/tasks/logrotate.yml
index 8464d309..975c3a96 100644
--- a/squid/tasks/logrotate.yml
+++ b/squid/tasks/logrotate.yml
@@ -2,5 +2,5 @@
 - name: logrotate configuration
   template:
     src: logrotate.j2
-    dest: /etc/logrotate.d/{{ squid_daemoname }}
+    dest: /etc/logrotate.d/{{ squid_daemon_name }}
     force: no
diff --git a/squid/tasks/main.yml b/squid/tasks/main.yml
index 542730bb..9a6e0469 100644
--- a/squid/tasks/main.yml
+++ b/squid/tasks/main.yml
@@ -7,12 +7,12 @@
 
 - name: "Set squid name (jessie)"
   set_fact:
-    squid_daemoname: squid3
+    squid_daemon_name: squid3
   when: ansible_distribution_release == "jessie"
 
 - name: "Set squid name (Debian 9 or later)"
   set_fact:
-    squid_daemoname: squid
+    squid_daemon_name: squid
   when: ansible_distribution_major_version | version_compare('9', '>=')
 
 - name: "Install Squid packages"
@@ -20,7 +20,7 @@
     name: '{{ item }}'
     state: present
   with_items:
-  - "{{ squid_daemoname }}"
+  - "{{ squid_daemon_name }}"
   - squidclient
 
 - name: "Set alternative config file (Debian 9 or later)"
diff --git a/squid/templates/log2mail.j2 b/squid/templates/log2mail.j2
index 7a025676..f01256c5 100644
--- a/squid/templates/log2mail.j2
+++ b/squid/templates/log2mail.j2
@@ -1,4 +1,4 @@
-file = /var/log/{{ squid_daemoname }}/access.log
+file = /var/log/{{ squid_daemon_name }}/access.log
 pattern = "TCP_DENIED"
 mailto = {{ log2mail_alert_email or general_alert_email | mandatory }}
 template = /etc/log2mail/mail
diff --git a/squid/templates/logrotate.j2 b/squid/templates/logrotate.j2
index 118e837b..12597d7b 100644
--- a/squid/templates/logrotate.j2
+++ b/squid/templates/logrotate.j2
@@ -1,4 +1,4 @@
-/var/log/{{ squid_daemoname }}/*.log {
+/var/log/{{ squid_daemon_name }}/*.log {
     monthly
     compress
     rotate 12
@@ -6,6 +6,6 @@
     create 640 proxy adm
     sharedscripts
     postrotate
-        test ! -e /var/run/{{ squid_daemoname }}.pid || /usr/sbin/{{ squid_daemoname }} -k rotate
+        test ! -e /var/run/{{ squid_daemon_name }}.pid || /usr/sbin/{{ squid_daemon_name }} -k rotate
     endscript
 }