Skip to content

Commit

Permalink
lint fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ansibleguy committed May 3, 2024
1 parent 5f551b3 commit 8600632
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---

- name: haproxy-restart
- name: HAProxy-restart
ansible.builtin.systemd:
name: 'haproxy.service'
state: restarted

- name: haproxy-reload
- name: HAProxy-reload
ansible.builtin.systemd:
name: 'haproxy.service'
state: reloaded
8 changes: 3 additions & 5 deletions tasks/debian/acme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,13 @@
WELLKNOWN="{{ HAPROXY_HC.path.acme_challenges }}"
CONTACT_EMAIL="{{ HAPROXY_CONFIG.acme.email }}"
HOOK="{{ HAPROXY_HC.path.acme_script_hook }}"
CA="letsencrypt"
KEYSIZE="4096"
KEY_ALGO="secp384r1"
RENEW_DAYS="30"
AUTO_CLEANUP="yes"
OCSP_FETCH="{{ 'yes' if HAPROXY_CONFIG.acme.ocsp_fetch|bool else 'no' }}"
OCSP_MUST_STAPLE="{{ 'yes' if HAPROXY_CONFIG.acme.ocsp_must_staple|bool else 'no' }}"
OCSP_FETCH="{{ 'yes' if HAPROXY_CONFIG.acme.ocsp_fetch | bool else 'no' }}"
OCSP_MUST_STAPLE="{{ 'yes' if HAPROXY_CONFIG.acme.ocsp_must_staple | bool else 'no' }}"
dest: "{{ HAPROXY_HC.path.acme_config }}/config"
owner: 'root'
group: "{{ HAPROXY_HC.user_acme }}"
Expand Down Expand Up @@ -139,7 +137,7 @@
- 'service'
- 'timer'
register: acme_reload_svc
notify: haproxy-reload
notify: HAProxy-reload

- name: HAProxy | ACME | Systemd Daemon-reload
ansible.builtin.systemd:
Expand Down
4 changes: 2 additions & 2 deletions tasks/debian/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
owner: 'root'
group: 'haproxy'
mode: 0640
notify: haproxy-reload
notify: HAProxy-reload

- name: HAProxy | Config | Backends/Frontends/Stats
ansible.builtin.template:
Expand All @@ -20,4 +20,4 @@
- 'backend'
- 'frontend'
- 'stats'
notify: haproxy-reload
notify: HAProxy-reload
8 changes: 5 additions & 3 deletions tasks/debian/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,23 @@
# https://haproxy.debian.net
- name: HAProxy | Install | Adding repository key
ansible.builtin.shell: |
set -o pipefail
curl https://haproxy.debian.net/bernat.debian.org.gpg |
gpg --dearmor > /usr/share/keyrings/haproxy.debian.net.gpg
changed_when: false
tags: [skip_ansible_lint] # lazy - open to PRs

- name: HAProxy | Install | Adding repository
ansible.builtin.copy:
content: |
# ansible_managed
deb [signed-by=/usr/share/keyrings/haproxy.debian.net.gpg] https://haproxy.debian.net bookworm-backports-{{ HAPROXY_CONFIG.version}} main
deb [signed-by=/usr/share/keyrings/haproxy.debian.net.gpg] https://haproxy.debian.net bookworm-backports-{{ HAPROXY_CONFIG.version }} main
dest: '/etc/apt/sources.list.d/haproxy-community.list'
mode: 0644

- name: HAProxy | Install
ansible.builtin.apt:
pkg: "haproxy={{ HAPROXY_CONFIG.version}}*"
pkg: "haproxy={{ HAPROXY_CONFIG.version }}*"
state: present
update_cache: true

Expand Down Expand Up @@ -52,7 +54,7 @@
owner: 'root'
group: 'root'
mode: 0644
notify: haproxy-restart
notify: HAProxy-restart
register: hap_svc_ovr

- name: HAProxy | Install | Systemd Daemon-reload
Expand Down

0 comments on commit 8600632

Please sign in to comment.