Fix custom emoji dir and nginx media proxy configuration

orlea · Jan 4, 2020 · 81172d8 · 81172d8
1 parent 95a8019
commit 81172d8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/nginx/pleroma.nginx b/nginx/pleroma.nginx
@@ -79,7 +79,7 @@ server {
         client_max_body_size 16m;
     }
 
-    location ~ ^/(media|proxy) {
+    location /proxy {
         proxy_cache pleroma_media_cache;
         slice              1m;
         proxy_cache_key    $host$uri$is_args$args$slice_range;

diff --git a/pleroma/config/prod.secret.exs b/pleroma/config/prod.secret.exs
@@ -1,4 +1,4 @@
-use Mix.Config
+import Config
 
 config :pleroma, Pleroma.Web.Endpoint,
    http: [ ip: {0, 0, 0, 0},],

diff --git a/pleroma/pl-asterism-xyz.manage.yml b/pleroma/pl-asterism-xyz.manage.yml
@@ -6,7 +6,7 @@ services:
     ports:
       - "127.0.0.1:4050:4000"
     volumes:
-      - /mnt/efs/config/prod.secret.exs:/etc/pleroma/config/config.exs
-      - /mnt/efs/config/keys.secret.exs:/etc/pleroma/config/keys.secret.exs
+      - /mnt/efs/config/prod.secret.exs:/etc/pleroma/config.exs
+      - /mnt/efs/config/keys.secret.exs:/etc/pleroma/keys.secret.exs
       - /mnt/efs/emoji:/var/lib/pleroma/static/emoji/custom
       - /mnt/efs/instance/static/instance:/var/lib/pleroma/static/instance
diff --git a/pleroma/pl-asterism-xyz.yml b/pleroma/pl-asterism-xyz.yml
@@ -11,8 +11,8 @@ services:
     ports:
       - "127.0.0.1:4040:4000"
     volumes:
-      - /mnt/efs/config/prod.secret.exs:/etc/pleroma/config/config.exs
-      - /mnt/efs/config/keys.secret.exs:/etc/pleroma/config/keys.secret.exs
+      - /mnt/efs/config/prod.secret.exs:/etc/pleroma/config.exs
+      - /mnt/efs/config/keys.secret.exs:/etc/pleroma/keys.secret.exs
       - /mnt/efs/emoji:/var/lib/pleroma/static/emoji/custom
       - /mnt/efs/instance/static/instance:/var/lib/pleroma/static/instance
     healthcheck: