hosts/Emitter.nix

@@ -149,24 +149,10 @@
         '';
     };
 
-    services.goatcounter = {
-        enable = true;
-        proxy = true;
-    };
-
-    services.nginx = {
-        commonHttpConfig = ''
-            log_format combined_realip '$proxy_protocol_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent"';
-            log_format combined_vhost escape=none '$host: $remote_addr $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent"';
-            access_log /var/log/nginx/access.log combined_vhost;
-        '';
-    };
-
     services.logrotate = {
         enable = true;
         settings.nginx = {
-            frequency = "daily";
+            rotate = 2;
-            rotate = 14;
         };
     };
 

hosts/forgejo.nix

@@ -130,6 +130,8 @@ in
                 set_real_ip_from 127.0.0.1;
                 set_real_ip_from ::1;
                 real_ip_header proxy_protocol;
+                proxy_set_header X-Real-IP $proxy_protocol_addr;
+                proxy_set_header X-Fowarded-For $proxy_protocol_addr;
 
                 access_log /var/log/nginx/access.${domain}.log combined_realip;
             '';

hosts/tls_sni.nix

@@ -3,28 +3,31 @@
     services.nginx = {
         streamConfig = ''
             map $ssl_preread_server_name $target_backend {
-                default         rupert;
                 md.gvfr.de rupert;
                 rupert.gvfr.de rupert;
-                git.25120.org   localserv;
+                default localserv;
             }
 
             upstream rupert {
-                zone upstream_rupert 64k;
+                server rupert.gvfr.de:4431;
-
-                server rupert.gvfr.de:4431 resolve;
-                resolver 9.9.9.9 ipv4=off ipv6=on;
             }
 
             upstream localserv {
-                server 127.0.0.1:4431;
+                server localhost:4431;
             }
 
             server {
                 listen 443;
                 ssl_preread on;
-                proxy_protocol on;
+
+                # proxy_connect_timeout 1s;
+                # proxy_timeout 3s;
+                # resolver 1.1.1.1;
+
                 proxy_pass $target_backend;
+                proxy_next_upstream off;
+
+                proxy_protocol on;
             }
         '';