# HG changeset patch
# User Luke Hoersten <luke@hoersten.org>
# Date 1599352022 18000
# Node ID 645c1e10992169a467c2a169c2e2243b8bb9608b
# Parent  1751be33651f8784844c0ac10da7d3839f9d3820
Moved oragono socket to more persistent location.

diff -r 1751be33651f -r 645c1e109921 oragono/files/oragono.service
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/oragono/files/oragono.service	Sat Sep 05 19:27:02 2020 -0500
@@ -0,0 +1,20 @@
+[Unit]
+Description=oragono
+After=network.target
+# If you are using MySQL for history storage, comment out the above line
+# and uncomment these two instead (you must independently install and configure
+# MySQL for your system):
+# Wants=mysql.service
+# After=network.target mysql.service
+
+[Service]
+Type=simple
+User=oragono
+WorkingDirectory=/var/oragono
+ExecStart=/usr/local/bin/oragono run --conf /etc/oragono/oragono.yaml
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-failure
+LimitNOFILE=1048576
+
+[Install]
+WantedBy=multi-user.target
diff -r 1751be33651f -r 645c1e109921 oragono/tasks/main.yaml
--- a/oragono/tasks/main.yaml	Sun Aug 30 12:50:35 2020 -0500
+++ b/oragono/tasks/main.yaml	Sat Sep 05 19:27:02 2020 -0500
@@ -34,7 +34,6 @@
   loop:
     - "/etc"
     - "/var"
-    - "/run"
 
 - name: configure oragono
   become: yes
@@ -55,8 +54,8 @@
 
 - name: install oragono service
   become: yes
-  template:
-    src: "oragono.service.j2"
+  copy:
+    src: "oragono.service"
     dest: "/lib/systemd/system/oragono.service"
     mode: "0644"
   notify: restart oragono
diff -r 1751be33651f -r 645c1e109921 oragono/templates/nginx.conf.j2
--- a/oragono/templates/nginx.conf.j2	Sun Aug 30 12:50:35 2020 -0500
+++ b/oragono/templates/nginx.conf.j2	Sat Sep 05 19:27:02 2020 -0500
@@ -1,6 +1,6 @@
 server {
       listen 6697 ssl;
-      proxy_pass unix:/run/oragono/socket;
+      proxy_pass unix:/var/oragono/oragono.socket;
       proxy_protocol on;
 
       ssl_certificate {{nginx_ssl_cert}};
diff -r 1751be33651f -r 645c1e109921 oragono/templates/oragono.service.j2
--- a/oragono/templates/oragono.service.j2	Sun Aug 30 12:50:35 2020 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-[Unit]
-Description=oragono
-After=network.target
-# If you are using MySQL for history storage, comment out the above line
-# and uncomment these two instead (you must independently install and configure
-# MySQL for your system):
-# Wants=mysql.service
-# After=network.target mysql.service
-
-[Service]
-Type=simple
-User=oragono
-WorkingDirectory=/var/oragono
-ExecStart=/usr/local/bin/oragono run --conf /etc/oragono/oragono.yaml
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-failure
-LimitNOFILE=1048576
-
-[Install]
-WantedBy=multi-user.target
diff -r 1751be33651f -r 645c1e109921 oragono/templates/oragono.yaml.j2
--- a/oragono/templates/oragono.yaml.j2	Sun Aug 30 12:50:35 2020 -0500
+++ b/oragono/templates/oragono.yaml.j2	Sat Sep 05 19:27:02 2020 -0500
@@ -58,7 +58,7 @@
         #         proxy: false
 
         # Example of a Unix domain socket for proxying:
-        "/run/oragono/socket":
+        "/var/oragono/oragono.socket":
 
         # Example of a Tor listener: any connection that comes in on this listener will
         # be considered a Tor connection. It is strongly recommended that this listener