Update lemmy

lemmy/docker-compose.yml

@@ -7,19 +7,6 @@ x-logging: &default-logging
     max-file: "4"
 
 services:
-  proxy:
-    image: docker.io/library/nginx
-    ports:
-      - "1236:8536"
-    volumes:
-      - ./nginx_internal.conf:/etc/nginx/nginx.conf:ro,Z
-      - ./proxy_params:/etc/nginx/proxy_params:ro,Z
-    restart: always
-    logging: *default-logging
-    depends_on:
-      - pictrs
-      - lemmy-ui
-
   lemmy:
     image: ravermeister/lemmy
     hostname: lemmy
@@ -27,6 +14,8 @@ services:
     logging: *default-logging
     environment:
       RUST_LOG: warn
+    ports:
+      - "8536:8536"
     volumes:
       - ./lemmy.hjson:/config/config.hjson:Z
     depends_on:
@@ -43,6 +32,8 @@ services:
     depends_on:
       - lemmy
     restart: always
+    ports:
+      - "1234:1234"
     logging: *default-logging
 
   pictrs:
@@ -81,4 +72,3 @@ services:
       POSTGRES_DB: lemmy
     command: postgres -c config_file=/etc/postgresql.conf
     logging: *default-logging
-

lemmy/nginx_internal.conf

@@ -1,73 +0,0 @@
-worker_processes auto;
-
-events {
-    worker_connections 1024;
-}
-
-http {
-    # We construct a string consistent of the "request method" and "http accept header"
-    # and then apply soem ~simply regexp matches to that combination to decide on the
-    # HTTP upstream we should proxy the request to.
-    #
-    # Example strings:
-    #
-    #   "GET:application/activity+json"
-    #   "GET:text/html"
-    #   "POST:application/activity+json"
-    #
-    # You can see some basic match tests in this regex101 matching this configuration
-    # https://regex101.com/r/vwMJNc/1
-    #
-    # Learn more about nginx maps here http://nginx.org/en/docs/http/ngx_http_map_module.html
-    map "$request_method:$http_accept" $proxpass {
-        # If no explicit matches exists below, send traffic to lemmy-ui
-        default "http://lemmy-ui:1234";
-
-        # GET/HEAD requests that accepts ActivityPub or Linked Data JSON should go to lemmy.
-        #
-        # These requests are used by Mastodon and other fediverse instances to look up profile information,
-        # discover site information and so on.
-        "~^(?:GET|HEAD):.*?application\/(?:activity|ld)\+json" "http://lemmy:8536";
-
-        # All non-GET/HEAD requests should go to lemmy
-        #
-        # Rather than calling out POST, PUT, DELETE, PATCH, CONNECT and all the verbs manually
-        # we simply negate the GET|HEAD pattern from above and accept all possibly $http_accept values
-        "~^(?!(GET|HEAD)).*:" "http://lemmy:8536";
-    }
-
-    server {
-        # this is the port inside docker, not the public one yet
-        listen 1236;
-        listen 8536;
-
-        # change if needed, this is facing the public web
-        server_name localhost;
-        server_tokens off;
-
-        # Upload limit, relevant for pictrs
-        client_max_body_size 20M;
-
-        # Send actual client IP upstream
-        include proxy_params;
-
-        # frontend general requests
-        location / {
-            proxy_pass $proxpass;
-            rewrite ^(.+)/+$ $1 permanent;
-        }
-
-        # security.txt
-        location = /.well-known/security.txt {
-            proxy_pass "http://lemmy-ui:1234";
-        }
-
-        # backend
-        location ~ ^/(api|pictrs|feeds|nodeinfo|.well-known|version|sitemap.xml) {
-            proxy_pass "http://lemmy:8536";
-
-            # Send actual client IP upstream
-            include proxy_params;
-        }
-    }
-}

lemmy/proxy_params

@@ -1,4 +0,0 @@
-proxy_set_header Host $http_host;
-proxy_set_header X-Real-IP $remote_addr;
-proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-proxy_set_header X-Forwarded-Proto $scheme;