diff options
| author | Jean-Philippe Roemer <roemer.jp@gmail.com> | 2015-11-04 19:19:39 +0000 |
|---|---|---|
| committer | Jean-Philippe Roemer <roemer.jp@gmail.com> | 2015-11-04 19:22:15 +0000 |
| commit | 9a8aeef478f6b81cbe6d489fdc1efa2fc9f43a6b (patch) | |
| tree | 0c6f78d0b7e9a09110e8aaba6ca6356f76f3e07e /docker/s6 | |
| parent | 603c7389b8e56740033e51b36b79e61136b46002 (diff) | |
| download | gitea-9a8aeef478f6b81cbe6d489fdc1efa2fc9f43a6b.tar.gz gitea-9a8aeef478f6b81cbe6d489fdc1efa2fc9f43a6b.zip | |
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)
Diffstat (limited to 'docker/s6')
| -rwxr-xr-x | docker/s6/gogs/setup | 1 | ||||
| -rwxr-xr-x | docker/s6/openssh/setup | 3 | ||||
| -rwxr-xr-x | docker/s6/syslogd/run | 7 |
3 files changed, 10 insertions, 1 deletions
diff --git a/docker/s6/gogs/setup b/docker/s6/gogs/setup index e64a36d6e6..40bd82b28a 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 f263516bca..6df5ef7050 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 0000000000..f7bdbe36d6 --- /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- |