Skip to content

Commit

Permalink
Refactor reload handlers and update nginx configuration management
Browse files Browse the repository at this point in the history
This commit refactors the handlers responsible for reloading php-fpm, nginx, and litespeed. The server reload tasks have been moved from the global role level to respective application level. It also enhances the nginx configuration management by enabling configuration files in sites-available directory and linking them to sites-enabled. This update further includes changes to improve absent file state management for destroying an application.
  • Loading branch information
nbejansen committed Jan 19, 2024
1 parent d00714c commit 41b06da
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 19 deletions.
5 changes: 4 additions & 1 deletion roles/app/destroy/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@

- name: Remove nginx configuration.
ansible.builtin.file:
dest: "/etc/nginx/sites-enabled/{{ app_name }}.conf"
dest: "{{ item }}"
state: absent
notify: reload nginx
loop:
- "/etc/nginx/sites-enabled/{{ app_name }}.conf"
- "/etc/nginx/sites-available/{{ app_name }}.conf"
when: "'nginx' in ansible_facts.packages"

- name: Remove litespeed configuration.
Expand Down
5 changes: 5 additions & 0 deletions roles/app/litespeed/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
- name: reload litespeed
ansible.builtin.service:
name: lshttpd
state: reloaded
5 changes: 5 additions & 0 deletions roles/app/nginx/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
- name: reload nginx
ansible.builtin.service:
name: nginx
state: reloaded
21 changes: 16 additions & 5 deletions roles/app/nginx/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,26 @@
---
- name: Generate nginx configuration.
ansible.builtin.template:
src: app.conf.j2
dest: "/etc/nginx/sites-enabled/{{ app_name }}.conf"
mode: "0644"
src: app.conf.j2
dest: "/etc/nginx/sites-available/{{ app_name }}.conf"
mode: "0644"
notify: reload nginx
when: "'nginx' in app_stack"

- name: Enable nginx configuration.
ansible.builtin.file:
src: "/etc/nginx/sites-available/{{ app_name }}.conf"
dest: "/etc/nginx/sites-enabled/{{ app_name }}.conf"
state: link
force: true
when: "'nginx' in app_stack"

- name: Remove nginx configuration.
ansible.builtin.file:
dest: "/etc/nginx/sites-enabled/{{ app_name }}.conf"
state: absent
dest: "{{ item }}"
state: absent
loop:
- "/etc/nginx/sites-enabled/{{ app_name }}.conf"
- "/etc/nginx/sites-available/{{ app_name }}.conf"
notify: reload nginx
when: "'nginx' not in app_stack"
3 changes: 3 additions & 0 deletions roles/app/php/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
- name: reload php-fpm
ansible.builtin.include_tasks: reload.yml
File renamed without changes.
5 changes: 0 additions & 5 deletions roles/litespeed/handlers/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,3 @@
name: lshttpd
state: restarted
enabled: true

- name: reload litespeed
ansible.builtin.service:
name: lshttpd
state: reloaded
5 changes: 0 additions & 5 deletions roles/nginx/handlers/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,3 @@
name: nginx
state: restarted
enabled: true

- name: reload nginx
ansible.builtin.service:
name: nginx
state: reloaded
3 changes: 0 additions & 3 deletions roles/php/handlers/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,3 @@
name: "php{{ php_version }}-fpm"
state: restarted
enabled: true

- name: reload php-fpm
ansible.builtin.include_tasks: reload.yml

0 comments on commit 41b06da

Please sign in to comment.