From ca17b055d713e7fc4a6be8aadaccba0a684eb66f Mon Sep 17 00:00:00 2001
From: Arya Kiran <arya@projectsegfau.lt>
Date: Tue, 15 Aug 2023 14:33:56 +0530
Subject: [PATCH] fix logging

---
 privfrontends/templates/Caddyfile.j2          | 46 +++----------------
 privfrontends/templates/core/apps.Caddyfile   |  3 +-
 .../templates/core/internal.Caddyfile         | 10 ----
 privfrontends/templates/eu/misc.Caddyfile     | 10 ----
 4 files changed, 8 insertions(+), 61 deletions(-)

diff --git a/privfrontends/templates/Caddyfile.j2 b/privfrontends/templates/Caddyfile.j2
index 48d986b..bff2d27 100644
--- a/privfrontends/templates/Caddyfile.j2
+++ b/privfrontends/templates/Caddyfile.j2
@@ -1,3 +1,9 @@
+{
+	log {
+		output discard
+	}
+}
+
 (tor) {
         header {
                 -Strict-Transport-Security
@@ -46,16 +52,6 @@
                 X-XSS-Protection "1; mode=block"
                 defer
         }
-		log {
-            output discard
-            format filter {
-                wrap console
-                fields {
-                   request>remote_ip replace REDACTED
-                   request>headers>X-Forwarded-For replace REDACTED
-                }
-            }
-        }
         
 		{% if inventory_hostname == 'in' %}
         import acmedns
@@ -125,16 +121,6 @@ inv.{{ server_prefix }}.projectsegfau.lt inv.projectsegfau.lt invidious.projects
 
                 X-XSS-Protection "1; mode=block"
                 defer
-        }
-		log {
-            output discard
-            format filter {
-                wrap console
-                fields {
-                   request>remote_ip replace REDACTED
-                   request>headers>X-Forwarded-For replace REDACTED
-                }
-            }
         }
 		@badbots {
         	header "User-Agent" "Go-http-client/2.0"
@@ -271,16 +257,6 @@ search.{{ server_prefix }}.projectsegfau.lt search.projectsegfau.lt s.psf.lt s.{
 
                 X-XSS-Protection "1; mode=block"
                 defer
-        }
-		log {
-            output discard
-            format filter {
-                wrap console
-                fields {
-                   request>remote_ip replace REDACTED
-                   request>headers>X-Forwarded-For replace REDACTED
-                }
-            }
         }
 		@badbots {
         	header "User-Agent" "Go-http-client/2.0"
@@ -308,16 +284,6 @@ pi.{{ server_prefix }}.psf.lt pi.psf.lt {
 
                 X-XSS-Protection "1; mode=block"
                 defer
-        }
-		log {
-            output discard
-            format filter {
-                wrap console
-                fields {
-                   request>remote_ip replace REDACTED
-                   request>headers>X-Forwarded-For replace REDACTED
-                }
-            }
         }
 		@badbots {
         	header "User-Agent" "Go-http-client/2.0"
diff --git a/privfrontends/templates/core/apps.Caddyfile b/privfrontends/templates/core/apps.Caddyfile
index b4a1bcb..2e92e42 100644
--- a/privfrontends/templates/core/apps.Caddyfile
+++ b/privfrontends/templates/core/apps.Caddyfile
@@ -271,8 +271,9 @@ kbin.projectsegfau.lt, kb.psf.lt {
         }
         import def
 }
-libretranslate.projectsegfau.lt lt.psf.lt libretranslate.in.projectsegfau.lt {
+libretranslate.projectsegfau.lt lt.psf.lt {
 	reverse_proxy 192.168.5.2:5005
+	import def
 }
 gothub.dev.projectsegfau.lt gh.dev.psf.lt {
 	reverse_proxy 192.168.5.2:1025
diff --git a/privfrontends/templates/core/internal.Caddyfile b/privfrontends/templates/core/internal.Caddyfile
index 4f8d683..ac2e8d1 100644
--- a/privfrontends/templates/core/internal.Caddyfile
+++ b/privfrontends/templates/core/internal.Caddyfile
@@ -21,16 +21,6 @@ grafana.projectsegfau.lt {
 
 # MailU
 mail.projectsegfau.lt {
-	log {
-		output file /var/log/caddy/mail.projectsegfau.lt.log {
-			roll_disabled
-			roll_size 512M
-			roll_uncompressed
-			roll_local_time
-			roll_keep 3
-			roll_keep_for 48h
-		}
-	}
 	import def
 	reverse_proxy 192.168.5.5:8082
 }
diff --git a/privfrontends/templates/eu/misc.Caddyfile b/privfrontends/templates/eu/misc.Caddyfile
index 6db95d6..89c3559 100644
--- a/privfrontends/templates/eu/misc.Caddyfile
+++ b/privfrontends/templates/eu/misc.Caddyfile
@@ -27,16 +27,6 @@ inv.bp.projectsegfau.lt, i.bp.psf.lt {
 		X-XSS-Protection "1; mode=block"
 		defer
 	}
-	log {
-		output discard
-		format filter {
-			wrap console
-			fields {
-				request>remote_ip replace REDACTED
-				request>headers>X-Forwarded-For replace REDACTED
-			}
-		}
-	}
 	import torloc invbp
 	import i2ploc pjsfi2szfkb4guqzmfmlyq4no46fayertjrwt4h2uughccrh2lvq.b32.i2p
 }