Skip to content

Commit

Permalink
Revert "Fix/improve name casing for tasks"
Browse files Browse the repository at this point in the history
This reverts commit 2e90dec.
  • Loading branch information
bbaassssiiee committed Nov 15, 2022
1 parent 56841cd commit 3b124d5
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 25 deletions.
18 changes: 9 additions & 9 deletions handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
---
# File: main.yml - Handlers for Consul

- name: Restart consul
- name: restart consul
ansible.builtin.import_tasks: restart_consul.yml

- name: Rtart consul
- name: start consul
ansible.builtin.import_tasks: start_consul.yml

- name: Reload consul configuration
- name: reload consul configuration
ansible.builtin.import_tasks: reload_consul_conf.yml

- name: Restart dnsmasq
- name: restart dnsmasq
ansible.builtin.service:
name: dnsmasq
enabled: true
state: restarted
become: true

- name: Restart rsyslog
- name: restart rsyslog
ansible.builtin.import_tasks: restart_rsyslog.yml

- name: Restart syslog-ng
- name: restart syslog-ng
ansible.builtin.import_tasks: restart_syslogng.yml

- name: Restart syslog-ng
- name: restart syslog-ng
ansible.builtin.import_tasks: restart_syslogng.yml

- name: Start snapshot
- name: start snapshot
ansible.builtin.import_tasks: start_snapshot.yml

- name: Systemctl daemon-reload
- name: systemctl daemon-reload
ansible.builtin.systemd:
daemon_reload: true
become: true
2 changes: 1 addition & 1 deletion handlers/reload_consul_conf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Use SIGHUP to reload most configurations as per https://www.consul.io/docs/agent/options.html
# Cannot use `consul reload` because it requires the HTTP API to be bound to a non-loopback interface

- name: Reload consul configuration on unix
- name: reload consul configuration on unix
ansible.builtin.command:
cmd: "pkill --pidfile '{{ consul_run_path }}/consul.pid' --signal SIGHUP"
when: ansible_os_family != "Windows"
Expand Down
6 changes: 3 additions & 3 deletions handlers/restart_consul.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
when: ansible_service_mgr == "systemd"
listen: "reload systemd daemon"

- name: Restart consul on unix
- name: restart consul on unix
ansible.builtin.service:
name: consul
state: restarted
Expand All @@ -15,12 +15,12 @@
- ansible_os_family != "Windows"
listen: "restart consul"

- name: Restart consul on Mac
- name: restart consul on Mac
ansible.builtin.include_tasks: "{{ role_path }}/handlers/restart_consul_mac.yml"
when: ansible_os_family == "Darwin"
listen: "restart consul"

- name: Restart consul on windows
- name: restart consul on windows
ansible.windows.win_service:
name: consul
state: restarted
Expand Down
4 changes: 2 additions & 2 deletions handlers/restart_consul_mac.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
- ansible.builtin.import_tasks: "stop_consul_mac.yml" # noqa name[missing]
- ansible.builtin.import_tasks: "stop_consul_mac.yml"

- ansible.builtin.import_tasks: "start_consul_mac.yml" # noqa name[missing]
- ansible.builtin.import_tasks: "start_consul_mac.yml"
2 changes: 1 addition & 1 deletion handlers/restart_rsyslog.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- name: Restart rsyslog
- name: restart rsyslog
ansible.builtin.service:
name: rsyslog
state: restarted
Expand Down
2 changes: 1 addition & 1 deletion handlers/restart_syslogng.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- name: Restart syslog-ng
- name: restart syslog-ng
ansible.builtin.service:
name: syslog-ng
state: restarted
Expand Down
6 changes: 3 additions & 3 deletions handlers/start_consul.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- name: Start consul on unix
- name: start consul on unix
ansible.builtin.service:
name: consul
state: started
Expand All @@ -8,12 +8,12 @@
- ansible_os_family != "Windows"
listen: "start consul"

- name: Start consul on Mac
- name: start consul on Mac
ansible.builtin.include_tasks: "{{ role_path }}/handlers/start_consul_mac.yml"
when: ansible_os_family == "Darwin"
listen: "start consul"

- name: Start consul on windows
- name: start consul on windows
ansible.windows.win_service:
name: consul
state: started
Expand Down
2 changes: 1 addition & 1 deletion handlers/start_snapshot.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- name: Start consul snapshot on unix
- name: start consul snapshot on unix
ansible.builtin.service:
name: consul_snapshot
state: started
Expand Down
2 changes: 1 addition & 1 deletion tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,5 @@
tags:
- consul_services

- name: Flush_handlers
- name: flush_handlers
ansible.builtin.meta: flush_handlers
4 changes: 2 additions & 2 deletions tasks/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -307,12 +307,12 @@
state: touch
mode: 0600

- ansible.builtin.include_tasks: ../tasks/iptables.yml # noqa name[missing]
- ansible.builtin.include_tasks: ../tasks/iptables.yml
when: consul_iptables_enable | bool

when:
- not bootstrap_state.stat.exists
- not ansible_os_family == "Darwin"

- ansible.builtin.include_tasks: ../tasks/dnsmasq.yml # noqa name[missing]
- ansible.builtin.include_tasks: ../tasks/dnsmasq.yml
when: consul_dnsmasq_enable | bool
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2.6.7
v2.6.6

0 comments on commit 3b124d5

Please sign in to comment.