Skip to content

Commit

Permalink
[All] Remove deprecated handlers
Browse files Browse the repository at this point in the history
  • Loading branch information
nervo committed Oct 13, 2023
1 parent 2a328de commit 190241c
Show file tree
Hide file tree
Showing 29 changed files with 42 additions and 82 deletions.
42 changes: 42 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,48 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- [Apt] Switch influxdata repository to "stable"
- [Apt] Remove apt-transport-https default package
- [Apt] Update Grafana key
- [Apparmor] Remove handler "apparmor reload" in favor of "Reload apparmor"
- [Cron] Remove handler "cron restart" in favor of "Restart cron"
- [Dhcp] Remove handler "dhcp restart" in favor of "Restart dhcp"
- [Dsnqmasq] Remove handler "dnsmasq restart" in favor of "Restart dnsmasq"
- [Docker] Remove handler "docker restart" in favor of "Restart docker"
- [Elasticsearch] Remove handler "elasticsearch restart" in favor of "Restart elasticsearch"
- [Fail2ban] Remove handler "fail2ban restart" in favor of "Restart fail2ban"
- [Gitlab] Remove handler "gitlab reconfigure" in favor of "Reconfigure gitlab"
- [Gitlab] Remove handler "gitlab restart" in favor of "Restart gitlab"
- [Grafana] Remove handler "grafana restart" in favor of "Restart grafana"
- [Haproxy] Remove handler "haproxy reload" in favor of "Reload haproxy"
- [Haproxy] Remove handler "haproxy restart" in favor of "Restart haproxy"
- [InfluxDB] Remove handler "influxdb restart" in favor of "Restart influxdb"
- [InfluxDB] Remove handler "influxdb start" in favor of "Start influxdb"
- [Keepalived] Remove handler "keepalived restart" in favor of "Restart keepalived"
- [Keepalived] Remove handler "keepalived reload" in favor of "Reload keepalived"
- [MaxScale] Remove handler "maxscale restart" in favor of "Restart maxscale"
- [MongoDB] Remove handler "mongodb restart" in favor of "Restart mongodb"
- [MySQL] Remove handler "mysql restart" in favor of "Restart mysql"
- [Network] Remove handler "networking restart" in favor of "Restart networking"
- [Nginx] Remove handler "nginx restart" in favor of "Restart nginx"
- [Nginx] Remove handler "do nginx restart" in favor of "Do restart nginx"
- [Php] Remove handler "php restart" in favor of "Restart php fpm"
- [Php] Remove handler "php fpm restart" in favor of "Restart php fpm"
- [Php] Remove handler "do php fpm restart" in favor of "Do restart php fpm"
- [Php] Remove handler "php blackfire agent restart" in favor of "Restart php blackfire agent"
- [Proftpd] Remove handler "proftpd restart" in favor of "Restart proftpd"
- [Prometheus] Remove handler "prometheus restart" in favor of "Restart prometheus"
- [Prometheus] Remove handler "prometheus node exporter restart" in favor of "Restart prometheus node exporter"
- [Prometheus] Remove handler "prometheus nginx exporter restart" in favor of "Restart prometheus nginx exporter"
- [Prometheus] Remove handler "prometheus php fpm exporter restart" in favor of "Restart prometheus php fpm exporter"
- [Promtail] Remove handler "promtail restart" in favor of "Restart promtail"
- [Redis] Remove handler "redis restart" in favor of "Restart redis"
- [Redis] Remove handler "redis-sentinel restart" in favor of "Restart redis-sentinel"
- [RSyslog] Remove handler "rsyslog restart" in favor of "Restart rsyslog"
- [SensuGo] Remove handler "sensu-backend restart" in favor of "Restart sensu-backend"
- [SensuGo] Remove handler "sensu-agent restart" in favor of "Restart sensu-agent"
- [Shorewall] Remove handler "shorewall restart" in favor of "Restart shorewall"
- [Ssh] Remove handler "ssh reload" in favor of "Reload ssh"
- [Supervisor] Remove handler "supervisor restart" in favor of "Restart supervisor"
- [Systemd] Remove handler "systemd reload" in favor of "Reload systemd"
- [Telegraf] Remove handler "telegraf restart" in favor of "Restart telegraf"

### Added
- [Apt] Add HAProxy 2.8 repository
Expand Down
2 changes: 0 additions & 2 deletions roles/apparmor/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@
state: reloaded
loop:
- apparmor
# Deprecated
listen: apparmor reload
2 changes: 0 additions & 2 deletions roles/cron/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@
state: restarted
loop:
- cron
# Deprecated
listen: cron restart
2 changes: 0 additions & 2 deletions roles/dhcp/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@
state: restarted
loop:
- isc-dhcp-server
# Deprecated
listen: dhcp restart
2 changes: 0 additions & 2 deletions roles/dnsmasq/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@
state: restarted
loop:
- dnsmasq
# Deprecated
listen: dnsmasq restart
2 changes: 0 additions & 2 deletions roles/docker/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@
state: restarted
loop:
- docker
# Deprecated
listen: docker restart
2 changes: 0 additions & 2 deletions roles/elasticsearch/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@
state: restarted
loop:
- elasticsearch
# Deprecated
listen: elasticsearch restart
2 changes: 0 additions & 2 deletions roles/fail2ban/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@
state: restarted
loop:
- fail2ban
# Deprecated
listen: fail2ban restart
4 changes: 0 additions & 4 deletions roles/gitlab/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
- name: Reconfigure gitlab
ansible.builtin.command:
cmd: gitlab-ctl reconfigure
# Deprecated
listen: gitlab reconfigure

- name: Restart gitlab
ansible.builtin.command:
cmd: gitlab-ctl restart
# Deprecated
listen: gitlab restart
2 changes: 0 additions & 2 deletions roles/grafana/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@
state: restarted
loop:
- grafana-server
# Deprecated
listen: grafana restart
4 changes: 0 additions & 4 deletions roles/haproxy/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,10 @@
state: reloaded
loop:
- haproxy
# Deprecated
listen: haproxy reload

- name: Restart haproxy
ansible.builtin.service:
name: "{{ item }}"
state: restarted
loop:
- haproxy
# Deprecated
listen: haproxy restart
4 changes: 0 additions & 4 deletions roles/influxdb/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
loop:
- influxdb
notify: Start influxdb
# Deprecated
listen: influxdb restart

- name: Start influxdb
ansible.builtin.service:
Expand All @@ -20,5 +18,3 @@
until: __manala_influxdb_services is not failed
retries: 12
delay: 1
# Deprecated
listen: influxdb start
4 changes: 0 additions & 4 deletions roles/keepalived/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,10 @@
state: restarted
loop:
- keepalived
# Deprecated
listen: keepalived restart

- name: Reload keepalived
ansible.builtin.service:
name: "{{ item }}"
state: reloaded
loop:
- keepalived
# Deprecated
listen: keepalived reload
2 changes: 0 additions & 2 deletions roles/maxscale/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@
state: restarted
loop:
- maxscale
# Deprecated
listen: maxscale restart
2 changes: 0 additions & 2 deletions roles/mongodb/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@
state: restarted
loop:
- mongod
# Deprecated
listen: mongodb restart
2 changes: 0 additions & 2 deletions roles/mysql/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@
state: restarted
loop:
- mysql
# Deprecated
listen: mysql restart
2 changes: 0 additions & 2 deletions roles/network/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
state: restarted
loop:
- networking
# Deprecated
listen: networking restart

- name: Generate netplan
ansible.builtin.command: netplan generate
Expand Down
4 changes: 0 additions & 4 deletions roles/nginx/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,10 @@
changed_when: true
notify:
- Do restart nginx
# Deprecated
listen: nginx restart

- name: Do restart nginx
ansible.builtin.service:
name: "{{ item }}"
state: restarted
loop:
- nginx
# Deprecated
listen: do nginx restart
8 changes: 0 additions & 8 deletions roles/php/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
changed_when: true
notify:
- Do restart php fpm
# Deprecated
listen:
- php restart
- php fpm restart

- name: Do restart php fpm
ansible.builtin.service:
Expand All @@ -33,14 +29,10 @@
wantstate='present',
wantmap=true
)
# Deprecated
listen: do php fpm restart
- name: Restart php blackfire agent
ansible.builtin.service:
name: "{{ item }}"
state: restarted
loop:
- blackfire-agent
# Deprecated
listen: php blackfire agent restart
2 changes: 0 additions & 2 deletions roles/proftpd/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@
state: restarted
loop:
- proftpd
# Deprecated
listen: proftpd restart
8 changes: 0 additions & 8 deletions roles/prometheus/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
daemon_reload: true
loop:
- "{{ manala_prometheus_service }}"
# Deprecated
listen: prometheus restart

#################
# Node Exporter #
Expand All @@ -21,8 +19,6 @@
daemon_reload: true
loop:
- "{{ manala_prometheus_node_exporter_service }}"
# Deprecated
listen: prometheus node exporter restart

##################
# Nginx Exporter #
Expand All @@ -35,8 +31,6 @@
daemon_reload: true
loop:
- "{{ manala_prometheus_nginx_exporter_service }}"
# Deprecated
listen: prometheus nginx exporter restart

####################
# Php Fpm Exporter #
Expand All @@ -49,5 +43,3 @@
daemon_reload: true
loop:
- "{{ manala_prometheus_php_fpm_exporter_service }}"
# Deprecated
listen: prometheus php fpm exporter restart
4 changes: 0 additions & 4 deletions roles/redis/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,10 @@
state: restarted
loop:
- redis-server
# Deprecated
listen: redis restart

- name: Restart redis-sentinel
ansible.builtin.service:
name: "{{ item }}"
state: restarted
loop:
- redis-sentinel
# Deprecated
listen: redis-sentinel restart
2 changes: 0 additions & 2 deletions roles/rsyslog/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@
state: restarted
loop:
- rsyslog
# Deprecated
listen: rsyslog restart
4 changes: 0 additions & 4 deletions roles/sensu_go/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,10 @@
state: restarted
loop:
- sensu-backend
# Deprecated
listen: sensu-backend restart

- name: Restart sensu-agent
ansible.builtin.service:
name: "{{ item }}"
state: restarted
loop:
- sensu-agent
# Deprecated
listen: sensu-agent restart
2 changes: 0 additions & 2 deletions roles/shorewall/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@
state: restarted
loop:
- shorewall
# Deprecated
listen: shorewall restart
2 changes: 0 additions & 2 deletions roles/ssh/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@
state: reloaded
loop:
- ssh
# Deprecated
listen: ssh reload
2 changes: 0 additions & 2 deletions roles/supervisor/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@
state: restarted
loop:
- supervisor
# Deprecated
listen: supervisor restart
2 changes: 0 additions & 2 deletions roles/systemd/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,3 @@
- name: Reload systemd
ansible.builtin.systemd:
daemon_reload: true
# Deprecated
listen: systemd reload
2 changes: 0 additions & 2 deletions roles/telegraf/handlers/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@
state: restarted
loop:
- telegraf
# Deprecated
listen: telegraf restart

0 comments on commit 190241c

Please sign in to comment.