dot

packages and services management
Log | Files | Refs | README

commit cc728ca71d0fdbb9bdabc52ede0564340cfd3fb2
parent 6da2b63057f4ed8f2f6aefb0d9c748effdb50ed0
Author: Josuah Demangeon <mail@josuah.net>
Date:   Fri, 26 Oct 2018 22:05:28 +0200

Merge branch 'master' of git.josuah.net:dot

Diffstat:
Rbin/misc/ics2txt -> bin/conv/ics2txt | 0
Rbin/misc/fig -> bin/fun/fig | 0
Dbin/misc/agent | 7-------
Ms6/acme-client-log/run | 4+---
Ms6/acme-client-snooze/run | 8++++----
Ms6/anvil-snooze/run | 8--------
Ms6/axfrdns-log/run | 4+---
Ms6/axfrdns-run/run | 9++++-----
Ms6/bird-log/run | 4+---
Ms6/cherrymusic-log/run | 4+---
Ms6/cherrymusic-run/run | 1-
Ms6/collectd-log/run | 4+---
Ms6/collectd-run/run | 1-
Ms6/curvevpn-client/run | 6++----
Ms6/curvevpn-log/run | 4+---
Ms6/curvevpn-server/run | 6++----
Ms6/dnscache-log/run | 4+---
Ms6/dnscache-run/run | 13++++++-------
Ms6/ffingerd-log/run | 6+-----
Ms6/ffingerd-tcp/run | 0
Ms6/fossil-log/run | 4+---
Ms6/fossil-run/run | 1-
Ms6/ftpd-log/run | 4+---
Ms6/ftpd-tcp/run | 6++++--
Ms6/geomyidae-log/run | 4+---
Ds6/geomyidae-run/run | 14--------------
Rs6/geomyidae-run/env/BASE -> s6/geomyidae-tcp/env/BASE | 0
Rs6/geomyidae-run/env/HOST -> s6/geomyidae-tcp/env/HOST | 0
Rs6/geomyidae-run/env/PORT -> s6/geomyidae-tcp/env/PORT | 0
Rs6/geomyidae-run/producer-for -> s6/geomyidae-tcp/producer-for | 0
As6/geomyidae-tcp/run | 9+++++++++
Rs6/geomyidae-run/type -> s6/geomyidae-tcp/type | 0
Ms6/git-daemon-log/run | 4+---
Ms6/git-mirror-snooze/run | 8++++----
Ms6/httpd-log/run | 4+---
Ms6/httpfile-log/run | 4+---
Ms6/httpfile-tcp/run | 4++--
Ms6/httpfile-tls/run | 2+-
Ms6/ii-log/run | 4+---
Ms6/ii-tcp/run | 6++----
Ms6/ii-tls/run | 6++----
Ms6/mpop-log/run | 4+---
Ms6/mpop-run/run | 10+++++-----
Ms6/ngircd-log/run | 4+---
Ms6/ngircd-tls/run | 1-
Ms6/ntpclient-log/run | 4+---
Ms6/ntpclient-run/run | 7++++---
Ms6/opentracker-log/run | 4+---
Ms6/opentracker-run/run | 1-
Ms6/qemu-tap-log/run | 4+---
Ms6/qemu-tap-run/run | 12++++++------
Ms6/qemu-user-log/run | 4+---
Ms6/qemu-user-run/run | 12++++++------
Ms6/qmail-log/run | 4+---
Ms6/qmail-pop3d/run | 6++----
Ms6/qmail-send/run | 2+-
Ms6/qmail-tcp/run | 1+
Ms6/qmail-tls/run | 2+-
Ms6/quark-log/run | 4+---
Ms6/ratox-log/run | 4+---
Ms6/ratox-tcp/run | 6+-----
Ms6/s6-logger/run | 3++-
As6/ssh-agent-log/consumer-for | 1+
As6/ssh-agent-log/pipeline-name | 1+
As6/ssh-agent-log/run | 2++
Rs6/geomyidae-run/type -> s6/ssh-agent-log/type | 0
As6/ssh-agent-unix/producer-for | 1+
As6/ssh-agent-unix/run | 9+++++++++
Rs6/geomyidae-run/type -> s6/ssh-agent-unix/type | 0
Ms6/tinc-log/run | 4+---
Ms6/tinc-run/run | 1-
Ms6/tinydns-log/run | 4+---
Ms6/tinydns-run/run | 7+++----
Ms6/tinysshd-log/run | 4+---
Ms6/tinysshd-tcp/run | 9++++-----
Ms6/tor-log/run | 4+---
Ms6/tor-run/run | 1-
Ms6/transmission-log/run | 4+---
Ms6/u9fs-log/run | 4+---
Ms6/u9fs-mount-log/run | 4+---
Ms6/u9fs-run/run | 1-
Ms6/venti-log/run | 4+---
Ms6/venti-run/run | 3+--
Ms6/walldns-log/run | 4+---
Ms6/walldns-run/run | 6++----
85 files changed, 128 insertions(+), 226 deletions(-)

diff --git a/bin/misc/ics2txt b/bin/conv/ics2txt diff --git a/bin/misc/fig b/bin/fun/fig diff --git a/bin/misc/agent b/bin/misc/agent @@ -1,7 +0,0 @@ -#!/bin/sh -e -# start all authentication agents - -if ! pgrep -f "ssh-agent -a $HOME/.ssh/agent" -then rm -f "$HOME/.ssh/agent" - ssh-agent -a "$HOME/.ssh/agent" -fi diff --git a/s6/acme-client-log/run b/s6/acme-client-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/acme-client +fdmove -c 2 1 s6-log t /var/log/acme-client diff --git a/s6/acme-client-snooze/run b/s6/acme-client-snooze/run @@ -1,8 +1,5 @@ #!/usr/bin/env execlineb -# It uses ":well-known" instead of ".well-known" because httpfile(1) -# translates ':' to '.'. - -fdmove -c 2 1 +fdmove -c 1 s6-envdir env multisubstitute { importas -n AGREEMENT_URL AGREEMENT_URL importas -n WWWDIR WWWDIR @@ -10,6 +7,9 @@ s6-envdir env multisubstitute { importas -n DOMAIN DOMAIN } +# It uses ":well-known" instead of ".well-known" because httpfile(1) +# translates ':' to '.'. + if { mkdir -p ${WWWDIR}/${DOMAIN}/:well-known/acme-challenge } if { mkdir -p ${SSLDIR}/${DOMAIN} } if { mkdir -p ${SSLDIR}/private } diff --git a/s6/anvil-snooze/run b/s6/anvil-snooze/run @@ -1,8 +0,0 @@ -#!/usr/bin/env execlineb - -fdmove -c 2 1 - -if { mkdir -p /var/log/snooze-anvil } -backtick -n x { s6-clock } importas x x -redirfd -w 1 /var/log/snooze-anvil/$x -snooze ./job diff --git a/s6/axfrdns-log/run b/s6/axfrdns-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/axfrdns +fdmove -c 2 1 s6-log t /var/log/axfrdns diff --git a/s6/axfrdns-run/run b/s6/axfrdns-run/run @@ -1,10 +1,9 @@ #!/usr/bin/env execlineb -# djbdns zone transfert dns server -fdmove -c 2 1 +fdmove -c 1 +s6-envdir env -s6-envuidgid dns -s6-envdir env -s6-softliimt 300000 +s6-envuidgid dns +s6-softliimt 300000 s6-tcpserver -vDRHl0 0.0.0.0 53 axrfdns diff --git a/s6/bird-log/run b/s6/bird-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/bird +fdmove -c 2 1 s6-log t /var/log/bird diff --git a/s6/cherrymusic-log/run b/s6/cherrymusic-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/cherrymusic +fdmove -c 2 1 s6-log t /var/log/cherrymusic diff --git a/s6/cherrymusic-run/run b/s6/cherrymusic-run/run @@ -1,5 +1,4 @@ #!/usr/bin/env execlineb -# web-based music streaming fdmove -c 2 1 python3.6 diff --git a/s6/collectd-log/run b/s6/collectd-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/collectd +fdmove -c 2 1 s6-log t /var/log/collectd diff --git a/s6/collectd-run/run b/s6/collectd-run/run @@ -1,5 +1,4 @@ #!/usr/bin/env execlineb -# statistics collection daemon fdmove -c 2 1 collectd -f -C data/conf diff --git a/s6/curvevpn-client/run b/s6/curvevpn-client/run @@ -1,8 +1,6 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-envdir env -multisubstitute { +fdmove -c 1 +s6-envdir env multisubstitute { importas NAME NAME importas PUBKEY PUBKEY importas IP IP diff --git a/s6/curvevpn-log/run b/s6/curvevpn-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/curvevpn +fdmove -c 2 1 s6-log t /var/log/curvevpn diff --git a/s6/curvevpn-server/run b/s6/curvevpn-server/run @@ -1,8 +1,6 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-envdir env -multisubstitute { +fdmove -c 1 +s6-envdir env multisubstitute { importas NAME NAME importas IP IP importas PORT PORT diff --git a/s6/dnscache-log/run b/s6/dnscache-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/dnscache +fdmove -c 2 1 s6-log t /var/log/dnscache diff --git a/s6/dnscache-run/run b/s6/dnscache-run/run @@ -1,12 +1,11 @@ #!/usr/bin/env execlineb -# djbdns caching recursive dns server -fdmove -c 2 1 +fdmove -c 1 +s6-envdir env { + importas DATALIMIT DATALIMIT +} -importas D DATALIMIT - -s6-envguid dns -s6-envdir env -s6-softlimit -o 250 -d $D +s6-envguid dns +s6-softlimit -o 250 -d $DATALIMIT pipeline { dd 'if=/dev/random' } dnscache diff --git a/s6/ffingerd-log/run b/s6/ffingerd-log/run @@ -1,6 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -fdmove -c 2 1 - -s6-log t /var/log/ffingerd +fdmove -c 2 1 s6-log t /var/log/ffingerd diff --git a/s6/ffingerd-tcp/run b/s6/ffingerd-tcp/run diff --git a/s6/fossil-log/run b/s6/fossil-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/fossil +fdmove -c 2 1 s6-log t /var/log/fossil diff --git a/s6/fossil-run/run b/s6/fossil-run/run @@ -1,5 +1,4 @@ #!/usr/bin/env execlineb -# Write Once Read Many (WORM) storage system from Plan 9 (p9p) fdmove -c 2 1 foreground { mkdir -p /home/venti } diff --git a/s6/ftpd-log/run b/s6/ftpd-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/ftpd +fdmove -c 2 1 s6-log t /var/log/ftpd diff --git a/s6/ftpd-tcp/run b/s6/ftpd-tcp/run @@ -1,7 +1,9 @@ #!/local/bin/execlineb -P -fdmove -c 2 1 +fdmove -c 1 +s6-envdir env multisubstitute { + importas IP IP +} -s6-envdir env importas IP IP s6-envuidgid www s6-tcpserver -vD -b50 -c100 $IP 21 ftpd /var/www/ diff --git a/s6/geomyidae-log/run b/s6/geomyidae-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log /var/log/geomyidae +fdmove -c 2 1 s6-log t /var/log/geomyidae diff --git a/s6/geomyidae-run/run b/s6/geomyidae-run/run @@ -1,14 +0,0 @@ -#!/usr/bin/env execlineb -# simple gopher server with index.gph syntax and CGI support -fdmove -c 2 1 - -s6-envdir ./env/ - -importas HOST HOST -importas PORT PORT -importas BASE BASE - -geomyidae -d - -b $BASE - -h $HOST - -p $PORT diff --git a/s6/geomyidae-run/env/BASE b/s6/geomyidae-tcp/env/BASE diff --git a/s6/geomyidae-run/env/HOST b/s6/geomyidae-tcp/env/HOST diff --git a/s6/geomyidae-run/env/PORT b/s6/geomyidae-tcp/env/PORT diff --git a/s6/geomyidae-run/producer-for b/s6/geomyidae-tcp/producer-for diff --git a/s6/geomyidae-tcp/run b/s6/geomyidae-tcp/run @@ -0,0 +1,9 @@ +#!/usr/bin/env execlineb +fdmove -c 1 +s6-envdir env multisubstitute { + importas HOST HOST + importas PORT PORT + importas BASE BASE +} + +geomyidae -d -b $BASE -h $HOST -p $PORT diff --git a/s6/geomyidae-run/type b/s6/geomyidae-tcp/type diff --git a/s6/git-daemon-log/run b/s6/git-daemon-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/git-daemon +fdmove -c 2 1 s6-log t /var/log/git-daemon diff --git a/s6/git-mirror-snooze/run b/s6/git-mirror-snooze/run @@ -1,8 +1,8 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-envdir env -importas GIT GIT +fdmove -c 1 +s6-envdir env multisubstitute { + importas GIT GIT +} foreground { if { mkdir -p $GIT } diff --git a/s6/httpd-log/run b/s6/httpd-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/httpd +fdmove -c 2 1 s6-log t /var/log/httpd diff --git a/s6/httpfile-log/run b/s6/httpfile-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/httpfile +fdmove -c 2 1 s6-log t /var/log/httpfile diff --git a/s6/httpfile-tcp/run b/s6/httpfile-tcp/run @@ -1,7 +1,7 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - +fdmove -c 1 s6-envdir env + s6-envuidgid www s6-tcpserver -vD -b50 -c100 0.0.0.0 80 diff --git a/s6/httpfile-tls/run b/s6/httpfile-tls/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 +fdmove -c 1 s6-envdir env multisubstitute { importas -n ACCESSFILE ACCESSFILE } diff --git a/s6/ii-log/run b/s6/ii-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log /var/log/ii +fdmove -c 2 1 s6-log t /var/log/ii diff --git a/s6/ii-tcp/run b/s6/ii-tcp/run @@ -1,8 +1,6 @@ #!/usr/bin/env execlineb -# connect to an irc server through ii through tlsserver -fdmove -c 2 1 -s6-envdir env -multisubstitute { +fdmove -c 1 +s6-envdir env multisubstitute { importas HOST HOST importas PORT PORT importas USER USER diff --git a/s6/ii-tls/run b/s6/ii-tls/run @@ -1,8 +1,6 @@ #!/usr/bin/env execlineb -# connect to an irc server through ii through tlsserver -fdmove -c 2 1 -s6-envdir env -multisubstitute { +fdmove -c 1 +s6-envdir env multisubstitute { importas HOST HOST importas PORT PORT importas USER USER diff --git a/s6/mpop-log/run b/s6/mpop-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/mpop +fdmove -c 2 1 s6-log t /var/log/mpop diff --git a/s6/mpop-run/run b/s6/mpop-run/run @@ -1,10 +1,10 @@ #!/usr/bin/env execlineb -# update pop mail using mpop -fdmove -c 2 1 -s6-envdir env -importas USER USER +fdmove -c 1 +s6-envdir env multisubstitute { + importas USER USER +} -redirfd -r 0 ./data/mpoprc # it might not be readable as ${USER} +redirfd -r 0 ./data/mpoprc # it might not be readable as ${USER} s6-setuidgid $USER backtick -n HOME { homeof $USER } diff --git a/s6/ngircd-log/run b/s6/ngircd-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/ngircd +fdmove -c 2 1 s6-log t /var/log/ngircd diff --git a/s6/ngircd-tls/run b/s6/ngircd-tls/run @@ -1,5 +1,4 @@ #!/usr/bin/env execlineb -# Internet Relay Chat (IRC) daemon with TLS support (see ./tls) fdmove -c 2 1 ngircd -n -f data/conf diff --git a/s6/ntpclient-log/run b/s6/ntpclient-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/ntpclient +fdmove -c 2 1 s6-log t /var/log/ntpclient diff --git a/s6/ntpclient-run/run b/s6/ntpclient-run/run @@ -1,6 +1,7 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 -s6-envdir ./env/ -importas HOST HOST +fdmove -c 1 +s6-envdir env multisubstitute { + importas HOST HOST +} ntpclient -h $HOST diff --git a/s6/opentracker-log/run b/s6/opentracker-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/opentracker +fdmove -c 2 1 s6-log t /var/log/opentracker diff --git a/s6/opentracker-run/run b/s6/opentracker-run/run @@ -1,5 +1,4 @@ #!/usr/bin/env execlineb -# torrent tracker server fdmove -c 2 1 opentracker -d /home/tracker diff --git a/s6/qemu-tap-log/run b/s6/qemu-tap-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/qemu-tap +fdmove -c 2 1 s6-log t /var/log/qemu-tap diff --git a/s6/qemu-tap-run/run b/s6/qemu-tap-run/run @@ -1,4 +1,9 @@ #!/usr/bin/env execlineb +fdmove 1 +s6-envdir env multisubstitute { + importas NAME NAME +} + # qemu without networking services, using a tap ethernet device # The virtual machine main interface (nic,vlan=0) is communicating @@ -6,13 +11,8 @@ # anything yet. A bridge needs to be setup between this interface and # anything it needs to connect to. -fdmove 2 1 - -backtick name { getcwd PWD basename $PWD } -importas name name - qemu-system-x86_64 - -name $name + -name $NAME -m 333M -netdev tap,id=nd0,ifname=tap0,script=no,downscript=no -device virtio-net,netdev=nd0,mac=52:54:00:00:00:00 diff --git a/s6/qemu-user-log/run b/s6/qemu-user-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/qemu-user +fdmove -c 2 1 s6-log t /var/log/qemu-user diff --git a/s6/qemu-user-run/run b/s6/qemu-user-run/run @@ -1,17 +1,17 @@ #!/usr/bin/env execlineb +fdmove -c 1 +s6-envdir envmultisubstitute { + importas NAME NAME +} + # qemu with facilitated networking services # The virtual machine communicates with the hypervisor, which setups # a lot of servers (dns, tftp, dhcp...) for ease of use. -fdmove -c 2 1 - -s6-envdir env -importas NAME NAME - qemu-system-x86_64 - -m 333M -name $NAME + -m 333M -netdev user,id=nd0,hostfwd=tcp::10000-:22 -device e1000,netdev=nd0 -display none diff --git a/s6/qmail-log/run b/s6/qmail-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/qmail +fdmove -c 2 1 s6-log t /var/log/qmail diff --git a/s6/qmail-pop3d/run b/s6/qmail-pop3d/run @@ -1,8 +1,6 @@ #!/usr/bin/env execlineb -# qmail pop3 daemon -fdmove -c 2 1 -s6-envdir ./env/ -multisubstitute { +fdmove -c 1 +s6-envdir env multisubstitute { importas HOST HOST importas MAILDIR MAILDIR } diff --git a/s6/qmail-send/run b/s6/qmail-send/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 +fdmove -c 1 s6-envdir env multisubstitute { importas MAILDIR MAILDIR } diff --git a/s6/qmail-tcp/run b/s6/qmail-tcp/run @@ -1,5 +1,6 @@ #!/usr/bin/env execlineb fdmove -c 2 1 + s6-envuidgid qmaild s6-tcpserver -U 0.0.0.0 25 diff --git a/s6/qmail-tls/run b/s6/qmail-tls/run @@ -1,5 +1,5 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 +fdmove -c 1 s6-envdir env multisubstitute { importas -n ACCESSFILE ACCESSFILE } diff --git a/s6/quark-log/run b/s6/quark-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/quark +fdmove -c 2 1 s6-log t /var/log/quark diff --git a/s6/ratox-log/run b/s6/ratox-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/ratox +fdmove -c 2 1 s6-log t /var/log/ratox diff --git a/s6/ratox-tcp/run b/s6/ratox-tcp/run @@ -1,10 +1,6 @@ #!/usr/bin/env execlineb -# tox protocol client communicating through the filesystem fdmove -c 2 1 -define dir /home/tox - -mkdir -p $dir -cd $dir +backtick home { homeof $USER } if { mkdir -p $home/tox } cd $home/tox exec ratox diff --git a/s6/s6-logger/run b/s6/s6-logger/run @@ -1,7 +1,8 @@ #!/usr/bin/env execlineb - redirfd -w 2 /dev/console redirfd -w 1 /dev/null redirfd -rnb 0 fifo + s6-applyuidgid -u 0 -g 0 + s6-log -bp -- t /var/log/s6 diff --git a/s6/ssh-agent-log/consumer-for b/s6/ssh-agent-log/consumer-for @@ -0,0 +1 @@ +ssh-agent-unix diff --git a/s6/ssh-agent-log/pipeline-name b/s6/ssh-agent-log/pipeline-name @@ -0,0 +1 @@ +ssh-agent diff --git a/s6/ssh-agent-log/run b/s6/ssh-agent-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 s6-log t /var/log/ssh-agent diff --git a/s6/geomyidae-run/type b/s6/ssh-agent-log/type diff --git a/s6/ssh-agent-unix/producer-for b/s6/ssh-agent-unix/producer-for @@ -0,0 +1 @@ +ssh-agent-log diff --git a/s6/ssh-agent-unix/run b/s6/ssh-agent-unix/run @@ -0,0 +1,9 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env multisubstitute { + importas USER USER +} + +backtick home { homeof $USER + +ssh-agent -d -a $home/.ssh/sock diff --git a/s6/geomyidae-run/type b/s6/ssh-agent-unix/type diff --git a/s6/tinc-log/run b/s6/tinc-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/tinc +fdmove -c 2 1 s6-log t /var/log/tinc diff --git a/s6/tinc-run/run b/s6/tinc-run/run @@ -1,5 +1,4 @@ #!/usr/bin/env execlineb -# vpn focused on mesh networking fdmove -c 2 1 tincd -D diff --git a/s6/tinydns-log/run b/s6/tinydns-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/tinydns +fdmove -c 2 1 s6-log t /var/log/tinydns diff --git a/s6/tinydns-run/run b/s6/tinydns-run/run @@ -1,8 +1,7 @@ #!/usr/bin/env execlineb -# djbdns authoritative dns server -fdmove -c 2 1 +fdmove -c 1 +s6-envdir env -s6-envuidgid dns -s6-envdir env +s6-envuidgid dns tinydns diff --git a/s6/tinysshd-log/run b/s6/tinysshd-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/tinysshd +fdmove -c 2 1 s6-log t /var/log/tinysshd diff --git a/s6/tinysshd-tcp/run b/s6/tinysshd-tcp/run @@ -1,12 +1,11 @@ #!/usr/bin/env execlineb -# SSHv2 server with minimal footprint https://tinyssh.org/ -fdmove -c 2 1 +fdmove -c 1 +s6-envdir env multisubstitute { + importas PORT PORT +} foreground { if { test ! -d ./data/key/ } tinysshd-makekey ./data/key/ } foreground { chmod 500 ./data/key/ } -s6-envdir env -importas PORT PORT - s6-tcpserver 0.0.0.0 $PORT tinysshd -sovv data/key diff --git a/s6/tor-log/run b/s6/tor-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/tor +fdmove -c 2 1 s6-log t /var/log/tor diff --git a/s6/tor-run/run b/s6/tor-run/run @@ -1,5 +1,4 @@ #!/usr/bin/env execlineb -# tor daemon for routing and publishing services fdmove -c 2 1 tor -f ./data/conf diff --git a/s6/transmission-log/run b/s6/transmission-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log /var/log/transmission +fdmove -c 2 1 s6-log t /var/log/transmission diff --git a/s6/u9fs-log/run b/s6/u9fs-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/u9fs +fdmove -c 2 1 s6-log t /var/log/u9fs diff --git a/s6/u9fs-mount-log/run b/s6/u9fs-mount-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/u9fs-mount +fdmove -c 2 1 s6-log t /var/log/u9fs-mount diff --git a/s6/u9fs-run/run b/s6/u9fs-run/run @@ -1,5 +1,4 @@ #!/usr/bin/env execlineb -# forward u9fs from a remote host to a local socket through ssh fdmove -c 2 1 unixserver -v /tmp/9p diff --git a/s6/venti-log/run b/s6/venti-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/venti +fdmove -c 2 1 s6-log t /var/log/venti diff --git a/s6/venti-run/run b/s6/venti-run/run @@ -1,10 +1,9 @@ #!/usr/bin/env execlineb -# write once read many (worm) storage server from plan 9 (p9p) fdmove -c 2 1 s6-setuidgid venti venti -s - -c ./data/conf + -c data/conf -a tcp!*!17034 -h tcp!*!8080 diff --git a/s6/walldns-log/run b/s6/walldns-log/run @@ -1,4 +1,2 @@ #!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-log t /var/log/walldns +fdmove -c 2 1 s6-log t /var/log/walldns diff --git a/s6/walldns-run/run b/s6/walldns-run/run @@ -1,7 +1,5 @@ #!/usr/bin/env execlineb -# djbdns wall dns server -fdmove -c 2 1 - -s6-envdir env +fdmove -c 1 +s6-envdir env walldns