Got pleroma otp multi-instance working.

3 files changed, 6 insertions, 5 deletions

diff --git a/roles/pleroma-otp/files/[email protected] b/roles/pleroma-otp/files/[email protected]
index 9de1f79..4967c63 100644
--- a/roles/pleroma-otp/files/[email protected]
+++ b/roles/pleroma-otp/files/[email protected]
@@ -9,8 +9,9 @@ WorkingDirectory=/opt/pleroma
 Environment="HOME=/opt/pleroma"
 Environment="PLEROMA_CONFIG_PATH=/etc/pleroma/%i.config.exs"
 Environment="PLUG_TMPDIR=/tmp/%i"
+Environment="RELEASE_NODE=%[email protected]"
 
-ExecStart=/opt/pleroma/bin/pleroma daemon
+ExecStart=/opt/pleroma/bin/pleroma start
 ExecReload=/opt/pleroma/bin/pleroma stop
 
 KillMode=process
diff --git a/roles/pleroma-otp/tasks/main.yaml b/roles/pleroma-otp/tasks/main.yaml
index d2020b1..a78cf79 100644
--- a/roles/pleroma-otp/tasks/main.yaml
+++ b/roles/pleroma-otp/tasks/main.yaml
@@ -79,14 +79,14 @@
 #     - "/tmp/setup_db.psql"
 #     - "/tmp/release/"
 
-- name: "configure pleroma systemd service"
+- name: configure pleroma systemd service
   become: yes
   copy:
     src: "[email protected]"
     dest: "/lib/systemd/system/[email protected]"
   notify: restart pleroma instance
 
-- name: "ensure pleroma {{pleroma_instance}} instance is enabled and started"
+- name: ensure pleroma instance is enabled and started
   become: yes
   systemd: name="pleroma@{{pleroma_instance}}.service" enabled="yes" state="started"
 
diff --git a/roles/pleroma-otp/templates/pleroma.cloudflare.nginx.conf.j2 b/roles/pleroma-otp/templates/pleroma.cloudflare.nginx.conf.j2
index 4363b88..db4b255 100644
--- a/roles/pleroma-otp/templates/pleroma.cloudflare.nginx.conf.j2
+++ b/roles/pleroma-otp/templates/pleroma.cloudflare.nginx.conf.j2
@@ -12,7 +12,7 @@ proxy_cache_path /tmp/{{pleroma_instance}}-pleroma-media-cache levels=1:2 keys_z
 server {
     listen {{nginx_port}};
     # listen [::]:{{nginx_port}};
-    server_name _;
+    server_name {{nginx_server_name}};
     return 301 https://$host$request_uri;
 }
 
@@ -22,7 +22,7 @@ ssl_session_cache shared:ssl_session_cache:10m;
 server {
     listen {{nginx_ssl_port}} ssl http2;
     # listen [::]:{{nginx_ssl_port}} ssl ipv6only=on;
-    server_name _;
+    server_name {{nginx_server_name}};
 
     ssl_certificate {{nginx_ssl_cert}};
     ssl_certificate_key {{nginx_ssl_privkey}};