dot

packages and services management
Log | Files | Refs | README

commit 8a7e7e818eb9f76a8ff88a9b61d068b98f9f220f
parent 948aec1ca7eb3ee7e0d2e8fd4b7694890af9aef6
Author: Josuah Demangeon <mail@josuah.net>
Date:   Sun, 19 Aug 2018 23:33:53 +0200

s6: make the logger run

Diffstat:
Mbin/s6-rc-load | 6+++---
Mconfigure | 6+++---
Ahost/t470s/source/ftpd-log | 2++
Ahost/t470s/source/ftpd-run | 2++
Mhost/t470s/source/httpd-log | 4++--
Mhost/t470s/source/httpd-run | 4++--
Dhost/t470s/source/tinysshd-log | 2--
Dhost/t470s/source/tinysshd-run | 2--
Minit | 7++++---
Muser/www/add | 6+++---
10 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/bin/s6-rc-load b/bin/s6-rc-load @@ -2,6 +2,6 @@ backtick -n t { s6-clock } importas t t -if { s6-rc-compile /var/s6-rc/compiled${t} /var/s6-rc/source } -if { s6-rc-update -l /run/s6-rc/live /var/s6-rc/compiled${t} } -s6-ln -nsf /var/s6-rc/compiled${t} /var/s6-rc/compiled +if { s6-rc-compile /var/s6/compiled${t} /var/s6/source } +if { s6-rc-update -l /var/s6/live /var/s6/compiled${t} } +s6-ln -nsf /var/s6/compiled${t} /var/s6/compiled diff --git a/configure b/configure @@ -9,6 +9,6 @@ find * -type d -exec sh -c 'mkdir -p "$HOME/.$0"' {} ';' -o \ test "$(whoami)" = root || exit 0 cd .. -ln -sf "$PWD/s6-rc" "$PWD/pack" /etc -mkdir -p /var/s6-rc -ln -sf "$PWD/host/$(uname -n)/source" /var/s6-rc +ln -sf "$PWD/s6" "$PWD/pack" /etc +mkdir -p /var/s6 +ln -sf "$PWD/host/$(uname -n)/source" /var/s6 diff --git a/host/t470s/source/ftpd-log b/host/t470s/source/ftpd-log @@ -0,0 +1 @@ +/etc/s6/ftpd-log+ \ No newline at end of file diff --git a/host/t470s/source/ftpd-run b/host/t470s/source/ftpd-run @@ -0,0 +1 @@ +/etc/s6/ftpd-run+ \ No newline at end of file diff --git a/host/t470s/source/httpd-log b/host/t470s/source/httpd-log @@ -1 +1 @@ -/etc/s6-rc/httpd-log- \ No newline at end of file +/etc/s6/httpd-log+ \ No newline at end of file diff --git a/host/t470s/source/httpd-run b/host/t470s/source/httpd-run @@ -1 +1 @@ -/etc/s6-rc/httpd-run- \ No newline at end of file +/etc/s6/httpd-run+ \ No newline at end of file diff --git a/host/t470s/source/tinysshd-log b/host/t470s/source/tinysshd-log @@ -1 +0,0 @@ -/etc/s6-rc/tinysshd-log/- \ No newline at end of file diff --git a/host/t470s/source/tinysshd-run b/host/t470s/source/tinysshd-run @@ -1 +0,0 @@ -/etc/s6-rc/tinysshd-run- \ No newline at end of file diff --git a/init b/init @@ -2,8 +2,9 @@ # setup if { s6-rmrf /run/s6 } -if { s6-mkdir -p /var/s6/source } -if { s6-hiercopy /etc/s6/s6-svscan-log /var/s6/source/s6-svscan-log } +if { s6-mkdir -p /var/s6 /run/s6 } +if { s6-hiercopy /etc/s6/s6-svscan-log /var/s6/s6-svscan-log } +if { s6-ln -nsf /var/s6/s6-svscan-log /run/s6/s6-svscan-log } # s6-svscan background @@ -20,7 +21,7 @@ fdclose 3 backtick -n t { s6-clock } importas t t -if { s6-mkdir -p /var/s6 /run/s6 } +if { s6-mkdir -p /var/s6 /run/s6 /log/ } if { s6-rc-compile /var/s6/compiled${t} /var/s6/source } if { s6-rc-init -c /var/s6/compiled${t} -l /var/s6/live /run/s6 } if { s6-ln -nsf /var/s6/compiled${t} /var/s6/compiled } diff --git a/user/www/add b/user/www/add @@ -1,5 +1,5 @@ #!/bin/sh -ex -mkdir -p /data/www -useradd -d /data/www www -chown -R www /data/www +mkdir -p /var/www +useradd -d /var/www www +chown -R www /var/www