From 0214216170853aaaf73f6b6625429e5a5447721e Mon Sep 17 00:00:00 2001
From: Nico Jensch <root@dr460nf1r3.org>
Date: Mon, 16 Dec 2024 11:17:55 +0100
Subject: [PATCH] fix(lemmy): use Nixpkgs provided Nginx config

---
 nixos/hosts/lemmy.nix | 65 ++-----------------------------------------
 1 file changed, 2 insertions(+), 63 deletions(-)

diff --git a/nixos/hosts/lemmy.nix b/nixos/hosts/lemmy.nix
index 9d4ac60a..e73897aa 100644
--- a/nixos/hosts/lemmy.nix
+++ b/nixos/hosts/lemmy.nix
@@ -8,6 +8,7 @@
   # Our Lemmy instance
   services.lemmy = {
     database.uri = "postgresql://lemmy:${garuda-lib.secrets.lemmy.database}@10.0.5.50/lemmy";
+    nginx.enable = true;
     enable = true;
     settings = {
       hostname = "lemmy.garudalinux.org";
@@ -21,72 +22,10 @@
     };
   };
 
-  # Force newest version due to Nixpkgs having dropped 0.3.X. 
+  # Force newest version due to Nixpkgs having dropped 0.3.X.
   # Manual migration from 0.3.X -> 0.4.X -> 0.5.X has been performed.
   # https://github.com/NixOS/nixpkgs/pull/336077
   services.pict-rs.package = pkgs.pict-rs;
 
-  services.nginx = {
-    enable = true;
-    httpConfig = ''
-      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
-          # "~^(?:GET|HEAD):.*?application\/(?:activity|ld)\+json" "http://lemmy";
-
-          # All non-GET/HEAD requests should go to lemmy
-          "~^(?!(GET|HEAD)).*:" "http://lemmy";
-      }
-
-      upstream lemmy {
-        server "127.0.0.1:8536";
-      }
-      upstream lemmy-ui {
-        server "127.0.0.1:1234";
-      }
-      
-      server {
-          listen 80;
-          
-          server_name lemmy.garudalinux.org;
-          server_tokens off;
-
-          gzip on;
-          gzip_types text/css application/javascript image/svg+xml;
-          gzip_vary on;
-
-          client_max_body_size 25M;
-
-          add_header X-Frame-Options SAMEORIGIN;
-          add_header X-Content-Type-Options nosniff;
-          add_header X-XSS-Protection "1; mode=block";
-
-          real_ip_header X-Real-IP;
-          set_real_ip_from 10.0.5.10;
-
-          # frontend general requests
-          location / {
-              proxy_pass $proxpass;
-              rewrite ^(.+)/+$ $1 permanent;
-              proxy_set_header X-Real-IP $remote_addr;
-              proxy_set_header Host $host;
-          }
-
-          # backend
-          location ~ ^/(api|pictrs|feeds|nodeinfo|.well-known) {
-              proxy_pass "http://lemmy";
-              proxy_http_version 1.1;
-              proxy_set_header Upgrade $http_upgrade;
-              proxy_set_header Connection "upgrade";
-              proxy_set_header X-Real-IP $remote_addr;
-              proxy_set_header Host $host;
-          }
-      }
-    '';
-  };
-
   system.stateVersion = "23.05";
 }
-