From 3bc18bc705d9a7bf10b53da9bf1b9b848c7f03ed Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Fri, 24 Aug 2018 17:05:03 -0700
Subject: [PATCH] Scope exim service name variable
This is used in a handler which may be run after intervening roles;
ensure it has a unique variable name.
Change-Id: I6a3d856d3252ff62220d9769232e31ea7c4f9080
---
roles/exim/handlers/main.yaml | 2 +-
roles/exim/tasks/main.yaml | 2 +-
roles/exim/vars/Debian.yaml | 2 +-
roles/exim/vars/RedHat.yaml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/roles/exim/handlers/main.yaml b/roles/exim/handlers/main.yaml
index 7f56934038..b621f2c626 100644
--- a/roles/exim/handlers/main.yaml
+++ b/roles/exim/handlers/main.yaml
@@ -1,4 +1,4 @@
- name: Restart exim
service:
- name: "{{ service_name }}"
+ name: "{{ exim_service_name }}"
state: restarted
diff --git a/roles/exim/tasks/main.yaml b/roles/exim/tasks/main.yaml
index e49f6f24e5..ca983253bc 100644
--- a/roles/exim/tasks/main.yaml
+++ b/roles/exim/tasks/main.yaml
@@ -36,5 +36,5 @@
- name: Enable exim
service:
- name: "{{ service_name }}"
+ name: "{{ exim_service_name }}"
enabled: true
diff --git a/roles/exim/vars/Debian.yaml b/roles/exim/vars/Debian.yaml
index 18f51d3a0d..36afeb97a4 100644
--- a/roles/exim/vars/Debian.yaml
+++ b/roles/exim/vars/Debian.yaml
@@ -1,5 +1,5 @@
package: exim4-daemon-light
-service_name: exim4
+exim_service_name: exim4
config_file: /etc/exim4/exim4.conf
conf_dir: /etc/exim4
sysdefault_file: /etc/default/exim4
diff --git a/roles/exim/vars/RedHat.yaml b/roles/exim/vars/RedHat.yaml
index bb47d51bac..7f45e1be12 100644
--- a/roles/exim/vars/RedHat.yaml
+++ b/roles/exim/vars/RedHat.yaml
@@ -1,5 +1,5 @@
package: exim
-service_name: exim
+exim_service_name: exim
config_file: /etc/exim/exim.conf
conf_dir: /etc/exim/
sysdefault_file: /etc/sysconfig/exim