Lots of updates.

6 files changed, 25 insertions, 15 deletions

diff --git a/roles/pleroma/defaults/main.yaml b/roles/pleroma/defaults/main.yaml
index c9cbf1d..5d2569f 100644
--- a/roles/pleroma/defaults/main.yaml
+++ b/roles/pleroma/defaults/main.yaml
@@ -1,12 +1,19 @@
 ---
 
 pleroma_user: "pleroma"
-pleroma_instance_name: "{{pleroma_host}}"
-pleroma_desc: "A Pleroma fediverse instance."
+
 pleroma_host: "localhost"
-pleroma_scheme: "http"
 pleroma_port: 4000
-pleroma_url: "{{pleroma_scheme}}://{{pleroma_host}}:{{pleroma_port}}"
+pleroma_scheme: "http"
+
+pleroma_proxy_pass: "{{pleroma_scheme}}://{{pleroma_host}}:{{pleroma_port}}"
+
+pleroma_link_host: "localhost"
+pleroma_link_port: "443"
+pleroma_link_scheme: "https"
+
+pleroma_instance_name: "{{pleroma_link_host}}"
+pleroma_desc: "A Pleroma fediverse instance."
 pleroma_admin_email: "admin@{{pleroma_host}}"
 pleroma_char_limit: 5000
 pleroma_signup_open: "true"
diff --git a/roles/pleroma/meta/main.yaml b/roles/pleroma/meta/main.yaml
index efae8cd..d7aa38d 100644
--- a/roles/pleroma/meta/main.yaml
+++ b/roles/pleroma/meta/main.yaml
@@ -1,4 +1,4 @@
 ---
 
 dependencies:
-  - nginx/site
+  - nginx
diff --git a/roles/pleroma/tasks/main.yaml b/roles/pleroma/tasks/main.yaml
index 0d4ed29..f34952b 100644
--- a/roles/pleroma/tasks/main.yaml
+++ b/roles/pleroma/tasks/main.yaml
@@ -67,7 +67,7 @@
     - "mix local.hex --force"
     - "mix local.rebar --force"
     - "mix deps.get"
-    - "mix ecto.migrate"
+    # - "mix ecto.migrate"
   notify: restart pleroma
   environment:
     MIX_ENV: "prod"
diff --git a/roles/pleroma/templates/pleroma.nginx.conf.j2 b/roles/pleroma/templates/pleroma.nginx.conf.j2
index 34cec8a..b760a44 100644
--- a/roles/pleroma/templates/pleroma.nginx.conf.j2
+++ b/roles/pleroma/templates/pleroma.nginx.conf.j2
@@ -6,12 +6,12 @@
 # 3. Copy this file to /etc/nginx/sites-available/ and then add a symlink to it
 #    in /etc/nginx/sites-enabled/ and run 'nginx -s reload' or restart nginx.
 
-proxy_cache_path /tmp/pleroma-media-cache levels=1:2 keys_zone=pleroma_media_cache:10m max_size=10g
+proxy_cache_path /tmp/{{pleroma_user}}-pleroma-media-cache levels=1:2 keys_zone={{pleroma_user}}-pleroma_media_cache:10m max_size=10g
                  inactive=720m use_temp_path=off;
 
 server {
     listen {{nginx_port}};
-    listen [::]:{{nginx_port}};
+    # listen [::]:{{nginx_port}};
     server_name {{nginx_server_name}};
     return 301 https://$server_name$request_uri;
 
@@ -30,7 +30,7 @@ ssl_session_cache shared:ssl_session_cache:10m;
 
 server {
     listen {{nginx_ssl_port}} ssl http2;
-    listen [::]:{{nginx_ssl_port}} ssl ipv6only=on;
+    # listen [::]:{{nginx_ssl_port}} ssl ipv6only=on;
     server_name {{nginx_server_name}};
 
     ssl_certificate /etc/letsencrypt/live/{{nginx_server_name}}/fullchain.pem;
@@ -81,15 +81,15 @@ server {
         proxy_set_header Connection "upgrade";
         proxy_set_header Host $http_host;
 
-        proxy_pass {{pleroma_url}};
+        proxy_pass {{pleroma_proxy_pass}};
 
         client_max_body_size 16m;
     }
 
     location /proxy {
-        proxy_cache pleroma_media_cache;
+        proxy_cache {{pleroma_user}}-pleroma_media_cache;
         proxy_cache_lock on;
         proxy_ignore_client_abort on;
-        proxy_pass {{pleroma_url}};
+        proxy_pass {{pleroma_proxy_pass}};
     }
 }
diff --git a/roles/pleroma/templates/pleroma.service.j2 b/roles/pleroma/templates/pleroma.service.j2
index 15a0879..e024200 100644
--- a/roles/pleroma/templates/pleroma.service.j2
+++ b/roles/pleroma/templates/pleroma.service.j2
@@ -9,6 +9,7 @@ User={{pleroma_user}}
 WorkingDirectory=/home/{{pleroma_user}}/pleroma
 Environment="HOME=/home/{{pleroma_user}}"
 Environment="MIX_ENV=prod"
+Environment="PLUG_TMPDIR=/tmp/{{pleroma_user}}"
 ExecStart=/usr/local/bin/mix phx.server
 ExecReload=/bin/kill $MAINPID
 KillMode=process
diff --git a/roles/pleroma/templates/prod.secret.exs.j2 b/roles/pleroma/templates/prod.secret.exs.j2
index d39f57d..2c4d9f2 100644
--- a/roles/pleroma/templates/prod.secret.exs.j2
+++ b/roles/pleroma/templates/prod.secret.exs.j2
@@ -1,7 +1,7 @@
 use Mix.Config
 
 config :pleroma, Pleroma.Web.Endpoint,
-   url: [host: "{{pleroma_host}}", scheme: "{{pleroma_scheme}}", port: 443],
+   url: [host: "{{pleroma_link_host}}", scheme: "{{pleroma_link_scheme}}", port: {{pleroma_link_port}}],
    http: [port: {{pleroma_port}}],
    secret_key_base: "{{pleroma_secret_key}}"
 
@@ -10,8 +10,10 @@ config :pleroma, :instance,
   description: "{{pleroma_desc}}",
   email: "{{pleroma_admin_email}}",
   limit: {{pleroma_char_limit}},
-  registrations_open: {{pleroma_signup_open}},
-  dedupe_media: true
+  registrations_open: {{pleroma_signup_open}}
+
+config :pleroma, Pleroma.Upload,
+  filters: [Pleroma.Upload.Filter.Dedupe]
 
 config :pleroma, :media_proxy,
   enabled: false,