From c9fae6c345e44cb0e50560e66fea236160900dc9 Mon Sep 17 00:00:00 2001
From: Daniel Micay <daniel.micay@grapheneos.org>
Date: Sat, 8 Nov 2025 13:44:23 -0500
Subject: [PATCH] syslog-ng: split nginx configuration into conf.d

---
 deploy-web                      |  2 +-
 etc/syslog-ng/conf.d/nginx.conf | 22 ++++++++++++++++++++++
 etc/syslog-ng/syslog-ng.conf    | 20 --------------------
 3 files changed, 23 insertions(+), 21 deletions(-)
 create mode 100644 etc/syslog-ng/conf.d/nginx.conf

diff --git a/deploy-web b/deploy-web
index 02bfd48..02e93da 100755
--- a/deploy-web
+++ b/deploy-web
@@ -16,7 +16,7 @@ for host in ${hosts_web[@]}; do
     rsync --chmod=755 session-ticket-keys-create session-ticket-keys-rotate $remote:/usr/local/bin/
     rsync -r --delete etc/systemd/system/nginx.service.d/ $remote:/etc/systemd/system/nginx.service.d
     rsync etc/syslog-ng/syslog-ng.conf $remote:/etc/syslog-ng/syslog-ng.conf
-    ssh $remote mkdir -p /etc/syslog-ng/conf.d
+    rsync -r etc/syslog-ng/conf.d/ $remote:/etc/syslog-ng/conf.d
     rsync etc/logrotate.d/nginx $remote:/etc/logrotate.d/nginx
 
     ssh $remote "mkdir -pm755 /var/cache/nginx
diff --git a/etc/syslog-ng/conf.d/nginx.conf b/etc/syslog-ng/conf.d/nginx.conf
new file mode 100644
index 0000000..f848513
--- /dev/null
+++ b/etc/syslog-ng/conf.d/nginx.conf
@@ -0,0 +1,22 @@
+source s_nginx_access {
+    unix-dgram("/run/nginx-access-log" group("http") perm(0660));
+};
+source s_nginx_error {
+    unix-dgram("/run/nginx-error-log" group("http") perm(0660));
+};
+
+destination d_nginx_access {
+    file("/var/log/nginx/access.log" template("${MESSAGE}\n"));
+};
+destination d_nginx_error {
+    file("/var/log/nginx/error.log" template("${MESSAGE}\n"));
+};
+
+log {
+    source(s_nginx_access);
+    destination(d_nginx_access);
+};
+log {
+    source(s_nginx_error);
+    destination(d_nginx_error);
+};
diff --git a/etc/syslog-ng/syslog-ng.conf b/etc/syslog-ng/syslog-ng.conf
index fb36b28..1add52b 100644
--- a/etc/syslog-ng/syslog-ng.conf
+++ b/etc/syslog-ng/syslog-ng.conf
@@ -4,35 +4,15 @@
 source s_internal {
     internal();
 };
-source s_nginx_access {
-    unix-dgram("/run/nginx-access-log" group("http") perm(0660));
-};
-source s_nginx_error {
-    unix-dgram("/run/nginx-error-log" group("http") perm(0660));
-};
 
 destination d_journald {
     unix-dgram("/dev/log");
 };
-destination d_nginx_access {
-    file("/var/log/nginx/access.log" template("${MESSAGE}\n"));
-};
-destination d_nginx_error {
-    file("/var/log/nginx/error.log" template("${MESSAGE}\n"));
-};
 
 log {
     source(s_internal);
     destination(d_journald);
 };
-log {
-    source(s_nginx_access);
-    destination(d_nginx_access);
-};
-log {
-    source(s_nginx_error);
-    destination(d_nginx_error);
-};
 
 options {
     frac-digits(3);