From 4c1373e6b4222e47f352247af397bcbcdae6cb59 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Thu, 18 Aug 2022 22:12:48 +0000
Subject:  Update syslogd example

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 examples/klogd-linux/log/README    |  2 +-
 examples/syslogd/log/README        | 10 +++-------
 examples/syslogd/log/env/LOGSCRIPT |  6 ------
 examples/syslogd/log/run           | 22 +++++++++++++++++-----
 4 files changed, 21 insertions(+), 19 deletions(-)
 delete mode 100644 examples/syslogd/log/env/LOGSCRIPT

diff --git a/examples/klogd-linux/log/README b/examples/klogd-linux/log/README
index 6b51a4a..4b97b1d 100644
--- a/examples/klogd-linux/log/README
+++ b/examples/klogd-linux/log/README
@@ -1 +1 @@
-Processed kernel logs will be logged to the /var/log/klogd/ logdir.
+Processed kernel logs will be logged to the /var/log/klogd logdir.
diff --git a/examples/syslogd/log/README b/examples/syslogd/log/README
index 9d4968e..eba7d19 100644
--- a/examples/syslogd/log/README
+++ b/examples/syslogd/log/README
@@ -1,9 +1,5 @@
  This logger service logs everything the syslogd service receives
-into subdirectories of /var/log/syslogd/ logdir.
+into subdirectories of /var/log/syslogd logdir.
 
- The script provided in env/LOGSCRIPT emulates the default
-syslogd behaviour on a majority of Linux distributions.
-
- Note that spaces cannot be used as is in the LOGSCRIPT file,
-because they are delimiters for the splitting of $LOGSCRIPT
-in the run script. So \s is used instead.
+ It emulates the default syslogd behaviour on a majority of Linux
+distributions.
diff --git a/examples/syslogd/log/env/LOGSCRIPT b/examples/syslogd/log/env/LOGSCRIPT
deleted file mode 100644
index 35ae234..0000000
--- a/examples/syslogd/log/env/LOGSCRIPT
+++ /dev/null
@@ -1,6 +0,0 @@
-- +^\\serror\\. t /var/log/syslogd/error
-- +^\\sauthpriv\\. t /var/log/syslogd/auth
-- +^\\suser\\. t /var/log/syslogd/user
-- +^\\smessages\\. t /var/log/syslogd/messages
-- +^\\sdaemon\\. t /var/log/syslogd/daemon
-f t /var/log/syslogd/misc
diff --git a/examples/syslogd/log/run b/examples/syslogd/log/run
index c066f37..36c7d87 100755
--- a/examples/syslogd/log/run
+++ b/examples/syslogd/log/run
@@ -1,8 +1,20 @@
-#!/bun/execlineb -P
+#!/bin/execlineb -P
 s6-setuidgid syslog
-s6-envdir -f env
-importas -Cs LOGSCRIPT LOGSCRIPT
+multisubstitute
+{
+  define T t
+  define dir /var/log/syslogd
+}
 exec -c
-s6-log -d3 -- $LOGSCRIPT
+s6-log -d3 --
 
-# Change env/LOGSCRIPT to alter s6-log's behaviour
+ - +^auth\\. +^authpriv\\.  $T ${dir}/secure
+ - +^cron\\.  $T ${dir}/cron
+ - +^daemon\\.  $T ${dir}/daemon
+ - +^[[:alnum:]]*\\.debug:  $T ${dir}/debug
+ - +^[[:alnum:]]*\\.err: +^[[:alnum:]]*\\.error: +^[[:alnum:]]*\\.emerg: +^[[:alnum:]]*\\.alert: +^[[:alnum:]]*\\.crit:  $T ${dir}/errors
+ - +^kern\\.  $T ${dir}/kernel
+ - +mail\\.  $T ${dir}/mail
+ - +user\\.  $T ${dir}/user
+ - +^[[:alnum:]]*\\.info: +^[[:alnum:]]*\\.notice: +^[[:alnum:]]*\\.warn: -^auth\\. -^authpriv\\. -^cron\\. -daemon\\. -mail\\.  $T ${dir}/messages
+ + -^auth\\. -^authpriv\\.  $T ${dir}/everything
-- 
cgit v1.2.3