pub/charts
1
0
Fork 0
Code Issues Pull requests Releases Packages 19 Activity Actions

Merge branch 'master' into 'master'

Browse source 
lemmy: Fix federation with activitypub

See merge request ananace/charts!53
This commit is contained in:
Alexander Olofsson 2023-08-22 12:02:38 +00:00
commit 1ca5d0782a
1 changed files with 74 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
charts/lemmy/templates/configmap-proxy.yaml
View file

@ -9,68 +9,96 @@ metadata:
app.kubernetes.io/component: proxy app.kubernetes.io/component: proxy
data: data:
nginx.conf: | nginx.conf: |
worker_processes 1; worker_processes auto;
events { events {
worker_connections 1024; worker_connections 1024;
} }
http { http {
upstream lemmy { # 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";
# 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";
# 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";
}
upstream lemmy {
# this needs to map to the lemmy (server) docker service hostname # this needs to map to the lemmy (server) docker service hostname
server "{{ include "lemmy.fullname" . }}:{{ .Values.backend.service.port }}"; server "{{ include "lemmy.fullname" . }}:{{ .Values.backend.service.port }}";
} }
upstream lemmy-ui { upstream lemmy-ui {
# this needs to map to the lemmy-ui docker service hostname # this needs to map to the lemmy-ui docker service hostname
server "{{ include "lemmy.uiname" . }}:{{ .Values.frontend.service.port }}"; server "{{ include "lemmy.uiname" . }}:{{ .Values.frontend.service.port }}";
} }
server { server {
listen 8536; # this is the port inside docker, not the public one yet
listen 1236;
listen 8536;
server_name {{ .Values.serverName }}; server_name {{ .Values.serverName }};
server_tokens off; server_tokens off;
gzip on; gzip on;
gzip_types text/css application/javascript image/svg+xml; gzip_types text/css application/javascript image/svg+xml;
gzip_vary on; gzip_vary on;
client_max_body_size 20M; # Upload limit, relevant for pictrs
client_max_body_size 20M;
add_header X-Frame-Options SAMEORIGIN; add_header X-Frame-Options SAMEORIGIN;
add_header X-Content-Type-Options nosniff; add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block"; add_header X-XSS-Protection "1; mode=block";
location / { # Send actual client IP upstream
set $proxpass "http://lemmy-ui"; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
if ($http_accept = "application/activity+json") { # frontend general requests
set $proxpass "http://lemmy"; location / {
} proxy_pass $proxpass;
if ($http_accept = "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"") { rewrite ^(.+)/+$ $1 permanent;
set $proxpass "http://lemmy"; }
}
if ($request_method = POST) {
set $proxpass "http://lemmy";
}
proxy_pass $proxpass;
rewrite ^(.+)/+$ $1 permanent; # security.txt
location = /.well-known/security.txt {
proxy_pass "http://lemmy-ui";
}
proxy_set_header X-Real-IP $remote_addr; # backend
proxy_set_header Host $host; location ~ ^/(api|pictrs|feeds|nodeinfo|.well-known) {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass "http://lemmy";
}
location ~ ^/(api|pictrs|feeds|nodeinfo|.well-known) { # proxy common stuff
proxy_pass "http://lemmy"; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_http_version 1.1; proxy_set_header Connection "upgrade";
proxy_set_header Upgrade $http_upgrade; }
proxy_set_header Connection "upgrade"; }
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
}
} }
{{- end }} {{- end }}