From 16a9cc3114fe6d070be1eb093e6f8f84f22f83b2 Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Mon, 3 Dec 2018 13:58:39 +0100
Subject: [PATCH] update syslog-ng config

---
 .builds/docker.yml                  | 9 ---------
 Dockerfile                          | 6 ++----
 rootfs/etc/services.d/incron/run    | 3 ---
 rootfs/etc/services.d/syslog-ng/run | 4 ----
 rootfs/etc/syslog-ng/syslog-ng.conf | 4 ++--
 5 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 .builds/docker.yml
 delete mode 100755 rootfs/etc/services.d/incron/run
 delete mode 100755 rootfs/etc/services.d/syslog-ng/run

diff --git a/.builds/docker.yml b/.builds/docker.yml
deleted file mode 100644
index c6f0947..0000000
--- a/.builds/docker.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-image: alpine/edge
-packages:
-  - docker
-sources:
-  - https://git.sr.ht/~shu/docker_alpine_s6
-tasks:
-  - build: |
-      cd docker_alpine_s6
-      docker build -t alpine-s6 .
diff --git a/Dockerfile b/Dockerfile
index e5e15e1..9d05b7b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,13 +3,11 @@ LABEL maintainer="Sebastian Hugentobler <sebastian@vanwa.ch>"
 
 ENV S6_OVERLAY_VERSION=v1.21.7.0
 
-RUN apk --no-cache add libressl syslog-ng incron && \
-    wget -qO- https://github.com/just-containers/s6-overlay/releases/download/$S6_OVERLAY_VERSION/s6-overlay-amd64.tar.gz | tar -xz -C / && \
-    apk del libressl
+RUN apk --no-cache add libressl syslog-ng
+RUN wget -qO- https://github.com/just-containers/s6-overlay/releases/download/$S6_OVERLAY_VERSION/s6-overlay-amd64.tar.gz | tar -xz -C
 
 RUN apk --no-cache upgrade
 
 ADD /rootfs /
 
 ENTRYPOINT ["/init"]
-
diff --git a/rootfs/etc/services.d/incron/run b/rootfs/etc/services.d/incron/run
deleted file mode 100755
index f1a901e..0000000
--- a/rootfs/etc/services.d/incron/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/with-contenv sh
-
-exec /usr/sbin/incrond -n
diff --git a/rootfs/etc/services.d/syslog-ng/run b/rootfs/etc/services.d/syslog-ng/run
deleted file mode 100755
index dd9f88a..0000000
--- a/rootfs/etc/services.d/syslog-ng/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv sh
-
-cd /var
-exec syslog-ng --foreground
diff --git a/rootfs/etc/syslog-ng/syslog-ng.conf b/rootfs/etc/syslog-ng/syslog-ng.conf
index ff05125..c1efd18 100644
--- a/rootfs/etc/syslog-ng/syslog-ng.conf
+++ b/rootfs/etc/syslog-ng/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.9
+@version: 3.1.13
 
 options {
     stats_freq (0);
@@ -15,7 +15,7 @@ source s_local {
 };
 
 destination catchall {
-	pipe("/dev/stdout" template("${MSG}\n"));
+	file("/dev/stdout" template("${MSG}\n"));
 };
 
 log {