From d67fdf8ed71f6927a00cf6bc812777091e5a026d Mon Sep 17 00:00:00 2001
From: Luke Hoersten <luke@hoersten.org>
Date: Sun, 5 Jul 2020 10:25:32 -0500
Subject: Added nginx and oragono HUP reloading to systemd handlers. Added
 nginx config.

---
 nginx/handlers/main.yaml |  6 +++++-
 nginx/tasks/main.yaml    | 13 ++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'nginx')

diff --git a/nginx/handlers/main.yaml b/nginx/handlers/main.yaml
index 1feca07..00e05bf 100644
--- a/nginx/handlers/main.yaml
+++ b/nginx/handlers/main.yaml
@@ -2,4 +2,8 @@
 
 - name: restart nginx
   become: yes
-  systemd: name="nginx" state="restarted" daemon_reload="yes"
+  systemd: name="nginx.service" state="restarted" daemon_reload="yes"
+
+- name: reload nginx
+  become: yes
+  systemd: name="nginx.service" state="reloaded" daemon_reload="yes"
diff --git a/nginx/tasks/main.yaml b/nginx/tasks/main.yaml
index 846650d..f579e9c 100644
--- a/nginx/tasks/main.yaml
+++ b/nginx/tasks/main.yaml
@@ -3,27 +3,30 @@
 - name: apt install nginx
   become: yes
   apt: name="nginx"
+  notify: restart nginx
 
 - name: disable default site
   become: yes
   file: path="/etc/nginx/sites-enabled/default" state="absent"
+  notify: reload nginx
 
 - name: install base config
   become: yes
   copy: src="nginx.conf" dest="/etc/nginx/nginx.conf"
-  notify: restart nginx
+  notify: reload nginx
 
 - name: make stream dirs
   become: yes
   file: path="/etc/nginx/streams-{{item}}" state="directory"
   loop: ["available", "enabled"]
+  notify: reload nginx
 
 - name: make config available
   become: yes
   template:
     src:  "{{nginx_conf_src}}"
     dest: "/etc/nginx/{{nginx_server_type}}s-available/{{nginx_server_name}}.conf"
-  notify: restart nginx
+  notify: reload nginx
 
 - name: enable config
   become: yes
@@ -31,14 +34,14 @@
     src:  "/etc/nginx/{{nginx_server_type}}s-available/{{nginx_server_name}}.conf"
     dest: "/etc/nginx/{{nginx_server_type}}s-enabled/{{nginx_server_name}}.conf"
     state: "link"
-  notify: restart nginx
+  notify: reload nginx
 
 - name: copy root files
   become: yes
   copy: src="{{nginx_root_src}}" dest="{{nginx_root_dest}}/"
   when: nginx_root
-  notify: restart nginx
+  notify: reload nginx
 
 - name: enable nginx service
   become: yes
-  systemd: name="nginx" enabled="yes" state="started"
+  systemd: name="nginx.service" enabled="yes" state="started" daemon_reload="yes"
-- 
cgit v1.2.3