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.

---
 oragono/handlers/main.yaml        | 4 ++++
 oragono/tasks/main.yaml           | 4 ++--
 oragono/templates/nginx.conf.j2   | 7 +++++++
 oragono/templates/oragono.yaml.j2 | 4 ++--
 4 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 oragono/templates/nginx.conf.j2

(limited to 'oragono')

diff --git a/oragono/handlers/main.yaml b/oragono/handlers/main.yaml
index db381db..a45e622 100644
--- a/oragono/handlers/main.yaml
+++ b/oragono/handlers/main.yaml
@@ -3,3 +3,7 @@
 - name: restart oragono
   become: yes
   systemd: name="oragono.service" state="restarted" daemon_reload="yes"
+
+- name: reload oragono
+  become: yes
+  systemd: name="oragono.service" state="reloaded"
diff --git a/oragono/tasks/main.yaml b/oragono/tasks/main.yaml
index f3cca91..1a06173 100644
--- a/oragono/tasks/main.yaml
+++ b/oragono/tasks/main.yaml
@@ -44,14 +44,14 @@
     owner: "oragono"
     group: "oragono"
     mode: "0644"
-  notify: restart oragono
+  notify: reload oragono
 
 - name: copy motd file
   become: yes
   copy:
     src: "{{oragono_motd}}"
     dest: "/etc/oragono/oragono.motd"
-  notify: restart oragono
+  notify: reload oragono
 
 - name: install oragono service
   become: yes
diff --git a/oragono/templates/nginx.conf.j2 b/oragono/templates/nginx.conf.j2
new file mode 100644
index 0000000..38719ec
--- /dev/null
+++ b/oragono/templates/nginx.conf.j2
@@ -0,0 +1,7 @@
+server {
+      listen 6697 ssl;
+      proxy_pass unix:/run/oragono/socket;
+
+      ssl_certificate {{nginx_ssl_cert}};
+      ssl_certificate_key {{nginx_ssl_privkey}};
+}
diff --git a/oragono/templates/oragono.yaml.j2 b/oragono/templates/oragono.yaml.j2
index 2e5a1cf..5344683 100644
--- a/oragono/templates/oragono.yaml.j2
+++ b/oragono/templates/oragono.yaml.j2
@@ -288,7 +288,7 @@ server:
     # oragono will write files to disk under certain circumstances, e.g.,
     # CPU profiling or data export. by default, these files will be written
     # to the working directory. set this to customize:
-    # output-path: "/home/oragono/out"
+    output-path: "/var/oragono"
 
 # account options
 accounts:
@@ -606,7 +606,7 @@ opers:
         whois-line: "server admin"
 
         # custom hostname
-        vhost: "ops.{{oragono_network_name}}"
+        vhost: "opr.{{oragono_network_name}}"
 
         # modes are the modes to auto-set upon opering-up
         modes: +is acjknoqtuxv
-- 
cgit v1.2.3