From 9a8aeef478f6b81cbe6d489fdc1efa2fc9f43a6b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Roemer <roemer.jp@gmail.com>
Date: Wed, 4 Nov 2015 19:19:39 +0000
Subject: Add syslog & fix `/data/git` rights & SOCAT_LINK env var

- Resolve #1893
- Add syslogd to output sshd log on stdout (via `docker logs`)
- Enforce directory rights on `/data/git`, `/data/gogs` & `/data/ssh`
- Add `SOCAT_LINK` environment variable to prevent the creation of scout links when they are not needed (see #1815)
---
 docker/s6/gogs/setup    | 1 +
 docker/s6/openssh/setup | 3 ++-
 docker/s6/syslogd/run   | 7 +++++++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100755 docker/s6/syslogd/run

(limited to 'docker/s6')

diff --git a/docker/s6/gogs/setup b/docker/s6/gogs/setup
index e64a36d6..40bd82b2 100755
--- a/docker/s6/gogs/setup
+++ b/docker/s6/gogs/setup
@@ -20,3 +20,4 @@ ln -sf /data/gogs/data ./data
 ln -sf /data/git /home/git
 
 chown -R git:git /data /app/gogs ~git/
+chmod 0755 /data /data/gogs ~git/
diff --git a/docker/s6/openssh/setup b/docker/s6/openssh/setup
index f263516b..6df5ef70 100755
--- a/docker/s6/openssh/setup
+++ b/docker/s6/openssh/setup
@@ -23,4 +23,5 @@ fi
 
 # Set correct right to ssh keys
 chown -R root:root /data/ssh/*
-chmod 600 /data/ssh/*
+chmod 0700 /data/ssh
+chmod 0600 /data/ssh/*
diff --git a/docker/s6/syslogd/run b/docker/s6/syslogd/run
new file mode 100755
index 00000000..f7bdbe36
--- /dev/null
+++ b/docker/s6/syslogd/run
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if test -f ./setup; then
+    source ./setup
+fi
+
+exec gosu root /sbin/syslogd -nS -O-
-- 
cgit v1.2.3