Moved oragono socket to more persistent location.

3 files changed, 2 insertions, 22 deletions

diff --git a/oragono/templates/nginx.conf.j2 b/oragono/templates/nginx.conf.j2
index 31089c8..2cedd56 100644
--- a/oragono/templates/nginx.conf.j2
+++ b/oragono/templates/nginx.conf.j2
@@ -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 --git a/oragono/templates/oragono.service.j2 b/oragono/templates/oragono.service.j2
deleted file mode 100644
index f751ec0..0000000
--- a/oragono/templates/oragono.service.j2
+++ /dev/null
@@ -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 --git a/oragono/templates/oragono.yaml.j2 b/oragono/templates/oragono.yaml.j2
index 5344683..3619c6a 100644
--- a/oragono/templates/oragono.yaml.j2
+++ b/oragono/templates/oragono.yaml.j2
@@ -58,7 +58,7 @@ server:
         #         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