dot

packages and services management
Log | Files | Refs | README

commit b4c83d526b58b1dbef0417dc9896fe192bc65d7d
parent 44790e91b906686b40f9d494b5b6dc6c5d82fb77
Author: Josuah Demangeon <mail@josuah.net>
Date:   Sun, 29 Jul 2018 11:35:47 +0200

s6: flatter structure

Diffstat:
Abin/.s6-rc-ctl.swp | 0
Mbin/pack | 39++++++++++++++++++++-------------------
Dbin/s6 | 41-----------------------------------------
Abin/s6-rc-ctl | 53+++++++++++++++++++++++++++++++++++++++++++++++++++++
Abin/s6-rc-join | 10++++++++++
Abin/s6-rc-log | 13+++++++++++++
Abin/s6-rc-recompile | 7+++++++
Mconfigure | 5+++++
Mpack/9base/build | 1+
Mpack/abduco/build | 1-
Mpack/acme-client/build | 4++--
Mpack/bcftools/build | 1+
Mpack/blind/build | 1+
Mpack/cherrymusic/build | 1+
Mpack/curl/build | 1+
Mpack/dash/build | 1-
Mpack/djbdns-man/build | 14+++++++-------
Mpack/djbdns/build | 4++--
Mpack/dq/build | 4++--
Mpack/drawterm/build | 6+++---
Mpack/dwm/build | 5++---
Mpack/eel/build | 2+-
Mpack/entr/build | 3++-
Mpack/execline/build | 8++++----
Mpack/fluxcapacitor/build | 1+
Mpack/ghostscript/build | 5+++--
Mpack/git/build | 6+++---
Mpack/gmake/build | 1+
Mpack/gophermap/build | 4++--
Mpack/icecast/build | 5+++--
Mpack/ii/build | 1-
Mpack/irssi/build | 4++--
Mpack/jq/build | 5+++--
Mpack/less/build | 5+++--
Mpack/libalsa/build | 5+++--
Mpack/libav/build | 5+++--
Mpack/libbearssl/build | 5+++--
Mpack/libc9/build | 4++--
Mpack/libedit/build | 5+++--
Mpack/libevent/build | 5+++--
Mpack/libflac/build | 5+++--
Mpack/libgit2/build | 3++-
Mpack/libhts/build | 5+++--
Mpack/libjpeg/build | 1-
Mpack/liblzip/build | 1-
Mpack/liblzma/build | 3+--
Mpack/libmpg123/build | 5+++--
Mpack/libmusl/build | 5+++--
Mpack/libogg/build | 5+++--
Mpack/libopus/build | 5+++--
Mpack/libotr/build | 5+++--
Mpack/libpcap/build | 5+++--
Mpack/libpng/build | 1-
Mpack/libressl/build | 1-
Mpack/libsodium/build | 5+++--
Mpack/libtox/build | 4++--
Mpack/libvorbis/build | 5+++--
Mpack/libvpx/build | 2+-
Mpack/libx11/build | 5+++--
Mpack/libz/build | 1-
Mpack/links2/build | 5++++-
Mpack/man-freebsd/build | 5+++--
Mpack/man-plan9/build | 5+++--
Mpack/mandoc/build | 5+++--
Mpack/miniwi/build | 4++--
Mpack/mpop/build | 4++--
Mpack/msmtp/build | 4++--
Mpack/mupdf/build | 5+++--
Mpack/netpgp/build | 6+++---
Mpack/ngircd/build | 3++-
Mpack/oksh/build | 5+++--
Mpack/openssh/build | 5+++--
Mpack/opentracker/build | 5+++--
Mpack/opus-tools/build | 5+++--
Mpack/ploot/build | 5+++--
Mpack/qmail/build | 11+++--------
Mpack/quark/build | 1-
Mpack/radare2/build | 2++
Mpack/ratox/build | 1-
Mpack/reflex/build | 1-
Mpack/rlwrap/build | 5+++--
Mpack/rsync/build | 1-
Mpack/runit/build | 6+++---
Mpack/s6-dns/build | 6+++---
Mpack/s6-networking/build | 14+++++++-------
Mpack/s6-portable-utils/build | 6+++---
Mpack/s6-rc/build | 10+++++-----
Mpack/s6/build | 8++++----
Mpack/samtools/build | 4++--
Mpack/sbase/build | 4++--
Mpack/scc/build | 4++--
Mpack/scron/build | 4++--
Mpack/scrypt/build | 5+++--
Mpack/sct/build | 2+-
Mpack/sent/build | 2+-
Mpack/sfeed/build | 2+-
Mpack/shntool/build | 5+++--
Mpack/snooze/build | 2+-
Mpack/spoon/build | 2+-
Mpack/sselp/build | 4++--
Mpack/st/build | 1-
Mpack/stagit-gopher/build | 3+--
Mpack/stagit/build | 3+--
Dpack/supervise/build | 3---
Dpack/supervise/status | 0
Apack/syncmaildir/tar | 1+
Mpack/tabbed/build | 3+--
Mpack/tarsnap/build | 5+++--
Mpack/tcpdump/build | 5+++--
Mpack/tinc/build | 5+++--
Mpack/tinyldap/build | 6+++---
Mpack/tinysshd/build | 5+++--
Mpack/tmux/build | 5+++--
Mpack/tnftp/build | 5+++--
Mpack/tor/build | 2++
Mpack/transmission/build | 16++++++++--------
Mpack/tttml/build | 4++--
Mpack/u9fs/build | 1+
Mpack/vorbis-tools/build | 5+++--
Mpack/yacc/build | 5+++--
Mpack/yasm/build | 5+++--
Rpack/supervise/death_tally -> s6/.s6-svscan/lock | 0
As6/backup-log/consumer-for | 1+
As6/backup-log/run | 2++
As6/backup-log/type | 1+
As6/backup-run/producer-for | 1+
Rs6/backup/run/run -> s6/backup-run/run | 0
As6/backup-run/type | 1+
As6/backup/contents | 2++
Ds6/backup/log/run | 2--
As6/backup/type | 1+
As6/btpd-log/consumer-for | 1+
As6/btpd-log/run | 2++
As6/btpd-log/type | 1+
As6/btpd-run/producer-for | 1+
Rs6/btpd/run/run -> s6/btpd-run/run | 0
As6/btpd-run/type | 1+
As6/btpd/contents | 2++
Ds6/btpd/log/run | 2--
As6/btpd/type | 1+
As6/cherrymusic-log/consumer-for | 1+
As6/cherrymusic-log/run | 2++
As6/cherrymusic-log/type | 1+
As6/cherrymusic-run/producer-for | 1+
Rs6/cherrymusic/run/run -> s6/cherrymusic-run/run | 0
As6/cherrymusic-run/type | 1+
As6/cherrymusic/contents | 2++
Ds6/cherrymusic/log/run | 2--
As6/cherrymusic/type | 1+
As6/collectd-log/consumer-for | 1+
As6/collectd-log/run | 2++
As6/collectd-log/type | 1+
Rs6/collectd/run/data/conf -> s6/collectd-run/data/conf | 0
As6/collectd-run/producer-for | 1+
Rs6/collectd/run/run -> s6/collectd-run/run | 0
As6/collectd-run/type | 1+
As6/collectd/contents | 2++
Ds6/collectd/log/run | 2--
As6/collectd/type | 1+
As6/djbdns-axfrdns-log/consumer-for | 1+
As6/djbdns-axfrdns-log/run | 2++
As6/djbdns-axfrdns-log/type | 1+
Rs6/djbdns-axfrdns/run/env/ROOT -> s6/djbdns-axfrdns-run/env/ROOT | 0
As6/djbdns-axfrdns-run/producer-for | 1+
Rs6/djbdns-axfrdns/run/run -> s6/djbdns-axfrdns-run/run | 0
As6/djbdns-axfrdns-run/type | 1+
As6/djbdns-axfrdns/contents | 2++
Ds6/djbdns-axfrdns/log/run | 2--
As6/djbdns-axfrdns/type | 1+
As6/djbdns-dnscache-log/consumer-for | 1+
As6/djbdns-dnscache-log/run | 2++
As6/djbdns-dnscache-log/type | 1+
Rpack/supervise/lock -> s6/djbdns-dnscache-run/data/ip/127.0.0.1 | 0
Rs6/djbdns-dnscache/run/data/ip/127.0.0.1 -> s6/djbdns-dnscache-run/data/servers/@ | 0
Rs6/djbdns-dnscache/run/env/CACHESIZE -> s6/djbdns-dnscache-run/env/CACHESIZE | 0
Rs6/djbdns-dnscache/run/env/DATALIMIT -> s6/djbdns-dnscache-run/env/DATALIMIT | 0
Rs6/djbdns-dnscache/run/env/IP -> s6/djbdns-dnscache-run/env/IP | 0
Rs6/djbdns-dnscache/run/env/IPSEND -> s6/djbdns-dnscache-run/env/IPSEND | 0
Rs6/djbdns-dnscache/run/env/ROOT -> s6/djbdns-dnscache-run/env/ROOT | 0
As6/djbdns-dnscache-run/producer-for | 1+
Rs6/djbdns-dnscache/run/run -> s6/djbdns-dnscache-run/run | 0
As6/djbdns-dnscache-run/type | 1+
As6/djbdns-dnscache/contents | 2++
Ds6/djbdns-dnscache/log/run | 2--
As6/djbdns-dnscache/type | 1+
As6/djbdns-tinydns-log/consumer-for | 1+
As6/djbdns-tinydns-log/run | 2++
As6/djbdns-tinydns-log/type | 1+
Rs6/djbdns-tinydns/run/data/Makefile -> s6/djbdns-tinydns-run/data/Makefile | 0
Rs6/djbdns-tinydns/run/data/add-alias -> s6/djbdns-tinydns-run/data/add-alias | 0
Rs6/djbdns-tinydns/run/data/add-childns -> s6/djbdns-tinydns-run/data/add-childns | 0
Rs6/djbdns-tinydns/run/data/add-host -> s6/djbdns-tinydns-run/data/add-host | 0
Rs6/djbdns-tinydns/run/data/add-mx -> s6/djbdns-tinydns-run/data/add-mx | 0
Rs6/djbdns-tinydns/run/data/add-ns -> s6/djbdns-tinydns-run/data/add-ns | 0
Rs6/djbdns-dnscache/run/data/servers/@ -> s6/djbdns-tinydns-run/data/data | 0
Rs6/djbdns-tinydns/run/env/IP -> s6/djbdns-tinydns-run/env/IP | 0
Rs6/djbdns-tinydns/run/env/ROOT -> s6/djbdns-tinydns-run/env/ROOT | 0
As6/djbdns-tinydns-run/producer-for | 1+
Rs6/djbdns-tinydns/run/run -> s6/djbdns-tinydns-run/run | 0
As6/djbdns-tinydns-run/type | 1+
As6/djbdns-tinydns/contents | 2++
Ds6/djbdns-tinydns/log/run | 2--
As6/djbdns-tinydns/type | 1+
As6/djbdns-walldns-log/consumer-for | 1+
As6/djbdns-walldns-log/run | 2++
As6/djbdns-walldns-log/type | 1+
Rs6/djbdns-walldns/run/env/IP -> s6/djbdns-walldns-run/env/IP | 0
Rs6/djbdns-walldns/run/env/ROOT -> s6/djbdns-walldns-run/env/ROOT | 0
As6/djbdns-walldns-run/producer-for | 1+
Rs6/djbdns-walldns/run/run -> s6/djbdns-walldns-run/run | 0
As6/djbdns-walldns-run/type | 1+
As6/djbdns-walldns/contents | 2++
Ds6/djbdns-walldns/log/run | 2--
As6/djbdns-walldns/type | 1+
As6/fossil-log/consumer-for | 1+
As6/fossil-log/run | 2++
As6/fossil-log/type | 1+
As6/fossil-run/producer-for | 1+
Rs6/fossil/run/run -> s6/fossil-run/run | 0
As6/fossil-run/type | 1+
As6/fossil/contents | 2++
Ds6/fossil/log/run | 2--
As6/fossil/type | 1+
As6/ftpd-log/consumer-for | 1+
As6/ftpd-log/run | 2++
As6/ftpd-log/type | 1+
As6/ftpd-run/producer-for | 1+
Rs6/ftpd/run/run -> s6/ftpd-run/run | 0
As6/ftpd-run/type | 1+
As6/ftpd/contents | 2++
As6/ftpd/type | 1+
As6/geomyidae-log/consumer-for | 1+
As6/geomyidae-log/run | 2++
As6/geomyidae-log/type | 1+
Rs6/geomyidae/run/env/BASE -> s6/geomyidae-run/env/BASE | 0
Rs6/geomyidae/run/env/HOST -> s6/geomyidae-run/env/HOST | 0
Rs6/geomyidae/run/env/PORT -> s6/geomyidae-run/env/PORT | 0
As6/geomyidae-run/producer-for | 1+
Rs6/geomyidae/run/run -> s6/geomyidae-run/run | 0
As6/geomyidae-run/type | 1+
As6/geomyidae/contents | 2++
Ds6/geomyidae/log/run | 2--
As6/geomyidae/type | 1+
As6/git-daemon-log/consumer-for | 1+
As6/git-daemon-log/run | 2++
As6/git-daemon-log/type | 1+
As6/git-daemon-run/producer-for | 1+
Rs6/git-daemon/run/run -> s6/git-daemon-run/run | 0
As6/git-daemon-run/type | 1+
As6/git-daemon/contents | 2++
Ds6/git-daemon/log/run | 2--
As6/git-daemon/type | 1+
As6/git-mirror-log/consumer-for | 1+
As6/git-mirror-log/run | 2++
As6/git-mirror-log/type | 1+
Rs6/djbdns-tinydns/run/data/data -> s6/git-mirror-run/data/mirror | 0
As6/git-mirror-run/producer-for | 1+
Rs6/git-mirror/run/run -> s6/git-mirror-run/run | 0
As6/git-mirror-run/type | 1+
As6/git-mirror/contents | 2++
Ds6/git-mirror/log/run | 2--
As6/git-mirror/type | 1+
As6/gproxy-log/consumer-for | 1+
As6/gproxy-log/run | 2++
As6/gproxy-log/type | 1+
Rs6/gproxy/run/data/gproxy -> s6/gproxy-run/data/gproxy | 0
As6/gproxy-run/producer-for | 1+
Rs6/gproxy/run/run -> s6/gproxy-run/run | 0
As6/gproxy-run/type | 1+
As6/gproxy/contents | 2++
Ds6/gproxy/log/run | 2--
As6/gproxy/type | 1+
As6/httpd-log/consumer-for | 1+
As6/httpd-log/run | 2++
As6/httpd-log/type | 1+
As6/httpd-run/producer-for | 1+
Rs6/httpd/run/run -> s6/httpd-run/run | 0
As6/httpd-run/type | 1+
As6/httpd/contents | 2++
Ds6/httpd/log/run | 2--
As6/httpd/type | 1+
As6/ii-tcp-log/consumer-for | 1+
As6/ii-tcp-log/run | 2++
As6/ii-tcp-log/type | 1+
Rs6/ii-tcp/run/env/HOST -> s6/ii-tcp-run/env/HOST | 0
Rs6/git-mirror/run/data/mirror -> s6/ii-tcp-run/env/NAME | 0
Rs6/ii-tcp/run/env/NICK -> s6/ii-tcp-run/env/NICK | 0
Rs6/ii-tcp/run/env/NAME -> s6/ii-tcp-run/env/PASS | 0
Rs6/ii-tcp/run/env/PORT -> s6/ii-tcp-run/env/PORT | 0
Rs6/ii-tcp/run/env/USER -> s6/ii-tcp-run/env/USER | 0
Rs6/ii-tcp/run/finish -> s6/ii-tcp-run/finish | 0
As6/ii-tcp-run/producer-for | 1+
Rs6/ii-tcp/run/run -> s6/ii-tcp-run/run | 0
As6/ii-tcp-run/type | 1+
As6/ii-tcp/contents | 2++
Ds6/ii-tcp/log/run | 2--
As6/ii-tcp/type | 1+
As6/ii-tls-log/consumer-for | 1+
As6/ii-tls-log/run | 2++
As6/ii-tls-log/type | 1+
Rs6/ii-tcp/run/env/PASS -> s6/ii-tls-run/data/.empty | 0
Rs6/ii-tls/run/env/CAFILE -> s6/ii-tls-run/env/CAFILE | 0
Rs6/ii-tls/run/env/HOST -> s6/ii-tls-run/env/HOST | 0
Rs6/ii-tls/run/data/.empty -> s6/ii-tls-run/env/NAME | 0
Rs6/ii-tls/run/env/NICK -> s6/ii-tls-run/env/NICK | 0
Rs6/ii-tls/run/env/NAME -> s6/ii-tls-run/env/PASS | 0
Rs6/ii-tls/run/env/PORT -> s6/ii-tls-run/env/PORT | 0
Rs6/ii-tls/run/env/USER -> s6/ii-tls-run/env/USER | 0
Rs6/ii-tls/run/finish -> s6/ii-tls-run/finish | 0
As6/ii-tls-run/producer-for | 1+
Rs6/ii-tls/run/run -> s6/ii-tls-run/run | 0
As6/ii-tls-run/type | 1+
As6/ii-tls/contents | 2++
Ds6/ii-tls/log/run | 2--
As6/ii-tls/type | 1+
As6/mpop-log/consumer-for | 1+
As6/mpop-log/run | 2++
As6/mpop-log/type | 1+
Rs6/mpop/run/data/mpoprc -> s6/mpop-run/data/mpoprc | 0
Rs6/mpop/run/env/USER -> s6/mpop-run/env/USER | 0
As6/mpop-run/producer-for | 1+
Rs6/mpop/run/run -> s6/mpop-run/run | 0
As6/mpop-run/type | 1+
As6/mpop/contents | 2++
Ds6/mpop/log/run | 2--
As6/mpop/type | 1+
As6/ngircd-log/consumer-for | 1+
As6/ngircd-log/run | 2++
As6/ngircd-log/type | 1+
Rs6/ngircd/run/data/conf -> s6/ngircd-run/data/conf | 0
Rs6/ngircd/run/data/motd -> s6/ngircd-run/data/motd | 0
Rs6/ngircd/run/data/tls -> s6/ngircd-run/data/tls | 0
As6/ngircd-run/producer-for | 1+
Rs6/ngircd/run/run -> s6/ngircd-run/run | 0
As6/ngircd-run/type | 1+
As6/ngircd/contents | 2++
Ds6/ngircd/log/run | 2--
As6/ngircd/type | 1+
As6/ntpclient-log/consumer-for | 1+
As6/ntpclient-log/run | 2++
As6/ntpclient-log/type | 1+
As6/ntpclient-run/env/HOST | 1+
As6/ntpclient-run/producer-for | 1+
As6/ntpclient-run/run | 7+++++++
As6/ntpclient-run/type | 1+
As6/ntpclient/contents | 2++
Ds6/ntpclient/log/run | 3---
Ds6/ntpclient/run/env/HOST | 1-
Ds6/ntpclient/run/run | 7-------
As6/ntpclient/type | 1+
As6/opentracker-log/consumer-for | 1+
As6/opentracker-log/run | 2++
As6/opentracker-log/type | 1+
As6/opentracker-run/producer-for | 1+
As6/opentracker-run/run | 6++++++
As6/opentracker-run/type | 1+
As6/opentracker/contents | 2++
Ds6/opentracker/log/run | 2--
Ds6/opentracker/run/run | 6------
As6/opentracker/type | 1+
As6/plot-log/consumer-for | 1+
As6/plot-log/run | 2++
As6/plot-log/type | 1+
As6/plot-run/data/plot | 62++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
As6/plot-run/producer-for | 1+
As6/plot-run/run | 6++++++
As6/plot-run/type | 1+
As6/plot/contents | 2++
Ds6/plot/log/run | 2--
Ds6/plot/run/data/plot | 62--------------------------------------------------------------
Ds6/plot/run/run | 6------
As6/plot/type | 1+
As6/qemu-tap-log/consumer-for | 1+
As6/qemu-tap-log/run | 2++
As6/qemu-tap-log/type | 1+
As6/qemu-tap-run/producer-for | 1+
As6/qemu-tap-run/run | 23+++++++++++++++++++++++
As6/qemu-tap-run/type | 1+
As6/qemu-tap/contents | 2++
Ds6/qemu-tap/log/run | 2--
Ds6/qemu-tap/run/run | 23-----------------------
As6/qemu-tap/type | 1+
As6/qemu-user-log/consumer-for | 1+
As6/qemu-user-log/run | 2++
As6/qemu-user-log/type | 1+
Rs6/ii-tls/run/env/PASS -> s6/qemu-user-run/env/NAME | 0
As6/qemu-user-run/producer-for | 1+
As6/qemu-user-run/run | 21+++++++++++++++++++++
As6/qemu-user-run/type | 1+
As6/qemu-user/contents | 2++
Ds6/qemu-user/log/run | 2--
Ds6/qemu-user/run/env/NAME | 0
Ds6/qemu-user/run/run | 21---------------------
As6/qemu-user/type | 1+
As6/qmail-pop3d-log/consumer-for | 1+
As6/qmail-pop3d-log/run | 2++
As6/qmail-pop3d-log/type | 1+
As6/qmail-pop3d-run/producer-for | 1+
As6/qmail-pop3d-run/qmail-pop3d-log/run | 2++
As6/qmail-pop3d-run/qmail-pop3d/env/CERTFILE | 1+
Rs6/geomyidae/run/env/HOST -> s6/qmail-pop3d-run/qmail-pop3d/env/HOST | 0
As6/qmail-pop3d-run/qmail-pop3d/env/KEYFILE | 1+
As6/qmail-pop3d-run/qmail-pop3d/env/MAILDIR | 1+
As6/qmail-pop3d-run/qmail-pop3d/run | 12++++++++++++
As6/qmail-pop3d-run/type | 1+
As6/qmail-send-log/consumer-for | 1+
As6/qmail-send-log/run | 2++
As6/qmail-send-log/type | 1+
As6/qmail-send-run/data/alias/.qmail-mail | 1+
As6/qmail-send-run/data/control/defaultdelivery | 1+
Rs6/geomyidae/run/env/HOST -> s6/qmail-send-run/data/control/defaultdomain | 0
Rs6/geomyidae/run/env/HOST -> s6/qmail-send-run/data/control/locals | 0
Rs6/geomyidae/run/env/HOST -> s6/qmail-send-run/data/control/me | 0
Rs6/geomyidae/run/env/HOST -> s6/qmail-send-run/data/control/plusdomain | 0
Rs6/geomyidae/run/env/HOST -> s6/qmail-send-run/data/control/rcpthosts | 0
As6/qmail-send-run/env/MAILDIR | 1+
As6/qmail-send-run/producer-for | 1+
As6/qmail-send-run/run | 8++++++++
As6/qmail-send-run/type | 1+
As6/qmail-smtpd-log/consumer-for | 1+
As6/qmail-smtpd-log/run | 2++
As6/qmail-smtpd-log/type | 1+
As6/qmail-smtpd-run/producer-for | 1+
As6/qmail-smtpd-run/qmail-smtpd-log/run | 2++
As6/qmail-smtpd-run/qmail-smtpd/run | 20++++++++++++++++++++
Rs6/ngircd/run/data/tls -> s6/qmail-smtpd-run/qmail-smtpd/tls | 0
As6/qmail-smtpd-run/type | 1+
As6/qmail/contents | 3+++
Ds6/qmail/log/run | 2--
Ds6/qmail/pop3d/qmail-pop3d-log/run | 2--
Ds6/qmail/pop3d/qmail-pop3d/env/CERTFILE | 1-
Ds6/qmail/pop3d/qmail-pop3d/env/HOST | 1-
Ds6/qmail/pop3d/qmail-pop3d/env/KEYFILE | 1-
Ds6/qmail/pop3d/qmail-pop3d/env/MAILDIR | 1-
Ds6/qmail/pop3d/qmail-pop3d/run | 12------------
Ds6/qmail/send/data/alias/.qmail-mail | 1-
Ds6/qmail/send/data/control/defaultdelivery | 1-
Ds6/qmail/send/data/control/defaultdomain | 1-
Ds6/qmail/send/data/control/locals | 1-
Ds6/qmail/send/data/control/me | 1-
Ds6/qmail/send/data/control/plusdomain | 1-
Ds6/qmail/send/data/control/rcpthosts | 1-
Ds6/qmail/send/env/MAILDIR | 1-
Ds6/qmail/send/run | 8--------
Ds6/qmail/smtpd/qmail-smtpd-log/run | 2--
Ds6/qmail/smtpd/qmail-smtpd/run | 20--------------------
Ds6/qmail/smtpd/qmail-smtpd/tls | 8--------
As6/qmail/type | 1+
As6/quark-log/consumer-for | 1+
As6/quark-log/run | 2++
As6/quark-log/type | 1+
As6/quark-run/producer-for | 1+
As6/quark-run/run | 14++++++++++++++
As6/quark-run/type | 1+
As6/quark-tor-log/consumer-for | 1+
As6/quark-tor-log/run | 2++
As6/quark-tor-log/type | 1+
As6/quark-tor-run/producer-for | 1+
As6/quark-tor-run/run | 17+++++++++++++++++
As6/quark-tor-run/type | 1+
As6/quark-tor/contents | 2++
Ds6/quark-tor/log/run | 2--
Ds6/quark-tor/run/run | 17-----------------
As6/quark-tor/type | 1+
As6/quark/contents | 2++
Ds6/quark/log/run | 2--
Ds6/quark/run/run | 14--------------
As6/quark/type | 1+
As6/ratox-log/consumer-for | 1+
As6/ratox-log/run | 2++
As6/ratox-log/type | 1+
As6/ratox-run/producer-for | 1+
As6/ratox-run/run | 11+++++++++++
As6/ratox-run/type | 1+
As6/ratox/contents | 2++
Ds6/ratox/log/run | 2--
Ds6/ratox/run/run | 11-----------
As6/ratox/type | 1+
As6/s6 | 2++
As6/snooze-acme-client-log/consumer-for | 1+
As6/snooze-acme-client-log/run | 2++
As6/snooze-acme-client-log/type | 1+
As6/snooze-acme-client-run/data/conf | 17+++++++++++++++++
As6/snooze-acme-client-run/producer-for | 1+
As6/snooze-acme-client-run/run | 4++++
As6/snooze-acme-client-run/type | 1+
As6/snooze-acme-client/contents | 2++
Ds6/snooze-acme-client/log/run | 2--
Ds6/snooze-acme-client/run/data/conf | 17-----------------
Ds6/snooze-acme-client/run/run | 4----
As6/snooze-acme-client/type | 1+
As6/snooze-tls-cert-log/consumer-for | 1+
As6/snooze-tls-cert-log/run | 2++
As6/snooze-tls-cert-log/type | 1+
Rpack/supervise/death_tally -> s6/snooze-tls-cert-run/data/... | 0
Rs6/geomyidae/run/env/HOST -> s6/snooze-tls-cert-run/env/HOST | 0
As6/snooze-tls-cert-run/producer-for | 1+
As6/snooze-tls-cert-run/run | 17+++++++++++++++++
As6/snooze-tls-cert-run/type | 1+
As6/snooze-tls-cert/contents | 2++
Ds6/snooze-tls-cert/log/run | 2--
Ds6/snooze-tls-cert/run/data/... | 0
Ds6/snooze-tls-cert/run/env/HOST | 1-
Ds6/snooze-tls-cert/run/run | 17-----------------
As6/snooze-tls-cert/type | 1+
As6/snooze-tls-dhparam-log/consumer-for | 1+
As6/snooze-tls-dhparam-log/run | 2++
As6/snooze-tls-dhparam-log/type | 1+
As6/snooze-tls-dhparam-run/producer-for | 1+
As6/snooze-tls-dhparam-run/run | 6++++++
As6/snooze-tls-dhparam-run/type | 1+
As6/snooze-tls-dhparam/contents | 2++
Ds6/snooze-tls-dhparam/log/run | 2--
Ds6/snooze-tls-dhparam/run/run | 6------
As6/snooze-tls-dhparam/type | 1+
As6/ssh-fwd-log/consumer-for | 1+
As6/ssh-fwd-log/run | 2++
As6/ssh-fwd-log/type | 1+
As6/ssh-fwd-run/producer-for | 1+
As6/ssh-fwd-run/run | 15+++++++++++++++
As6/ssh-fwd-run/type | 1+
As6/ssh-fwd/contents | 2++
Ds6/ssh-fwd/log/run | 2--
Ds6/ssh-fwd/run/run | 15---------------
As6/ssh-fwd/type | 1+
As6/tinc-log/consumer-for | 1+
As6/tinc-log/run | 2++
As6/tinc-log/type | 1+
As6/tinc-run/data/conf.d/common.conf | 2++
As6/tinc-run/data/hosts/kroa | 13+++++++++++++
As6/tinc-run/data/hosts/nas | 13+++++++++++++
As6/tinc-run/data/hosts/pdmg | 12++++++++++++
As6/tinc-run/data/hosts/rpi | 13+++++++++++++
As6/tinc-run/data/hosts/t470s | 12++++++++++++
As6/tinc-run/data/tinc-up | 11+++++++++++
As6/tinc-run/producer-for | 1+
As6/tinc-run/run | 9+++++++++
As6/tinc-run/type | 1+
As6/tinc/contents | 2++
Ds6/tinc/log/run | 2--
Ds6/tinc/run/data/conf.d/common.conf | 2--
Ds6/tinc/run/data/hosts/kroa | 13-------------
Ds6/tinc/run/data/hosts/nas | 13-------------
Ds6/tinc/run/data/hosts/pdmg | 12------------
Ds6/tinc/run/data/hosts/rpi | 13-------------
Ds6/tinc/run/data/hosts/t470s | 12------------
Ds6/tinc/run/data/tinc-up | 11-----------
Ds6/tinc/run/run | 9---------
As6/tinc/type | 1+
As6/tinysshd-log/consumer-for | 1+
As6/tinysshd-log/run | 2++
As6/tinysshd-log/type | 1+
As6/tinysshd-run/env/PORT | 1+
As6/tinysshd-run/producer-for | 1+
As6/tinysshd-run/run | 14++++++++++++++
As6/tinysshd-run/type | 1+
As6/tinysshd/contents | 2++
Ds6/tinysshd/log/run | 2--
Ds6/tinysshd/run/env/PORT | 1-
Ds6/tinysshd/run/run | 14--------------
As6/tinysshd/type | 1+
As6/tls-server-log/consumer-for | 1+
As6/tls-server-log/run | 2++
As6/tls-server-log/type | 1+
As6/tls-server-run/producer-for | 1+
As6/tls-server-run/run | 12++++++++++++
As6/tls-server-run/type | 1+
As6/tls-server/contents | 2++
Ds6/tls-server/log/run | 2--
Ds6/tls-server/run/run | 12------------
As6/tls-server/type | 1+
As6/tor-log/consumer-for | 1+
As6/tor-log/run | 2++
As6/tor-log/type | 1+
As6/tor-run/data/conf | 26++++++++++++++++++++++++++
As6/tor-run/producer-for | 1+
As6/tor-run/run | 6++++++
As6/tor-run/type | 1+
As6/tor/contents | 2++
Ds6/tor/log/run | 2--
Ds6/tor/run/data/conf | 26--------------------------
Ds6/tor/run/run | 6------
As6/tor/type | 1+
As6/transmission-log/consumer-for | 1+
As6/transmission-log/run | 2++
As6/transmission-log/type | 1+
Rpack/supervise/death_tally -> s6/transmission-run/env/PASS | 0
As6/transmission-run/env/USER | 1+
As6/transmission-run/producer-for | 1+
As6/transmission-run/run | 10++++++++++
As6/transmission-run/type | 1+
As6/transmission/contents | 2++
Ds6/transmission/log/run | 2--
Ds6/transmission/run/env/PASS | 0
Ds6/transmission/run/env/USER | 1-
Ds6/transmission/run/run | 10----------
As6/transmission/type | 1+
As6/u9fs-log/consumer-for | 1+
As6/u9fs-log/run | 2++
As6/u9fs-log/type | 1+
As6/u9fs-mount-log/consumer-for | 1+
As6/u9fs-mount-log/run | 2++
As6/u9fs-mount-log/type | 1+
As6/u9fs-mount-run/down | 4++++
As6/u9fs-mount-run/producer-for | 1+
As6/u9fs-mount-run/type | 1+
As6/u9fs-mount-run/up | 5+++++
As6/u9fs-mount/contents | 2++
Ds6/u9fs-mount/log/run | 2--
Ds6/u9fs-mount/run/down | 4----
Ds6/u9fs-mount/run/up | 5-----
As6/u9fs-mount/type | 1+
As6/u9fs-run/producer-for | 1+
As6/u9fs-run/run | 8++++++++
As6/u9fs-run/type | 1+
As6/u9fs/contents | 2++
Ds6/u9fs/log/run | 2--
Ds6/u9fs/run/run | 8--------
As6/u9fs/type | 1+
As6/venti-log/consumer-for | 1+
As6/venti-log/run | 2++
As6/venti-log/type | 1+
As6/venti-run/data/conf | 8++++++++
As6/venti-run/data/fmt | 9+++++++++
As6/venti-run/producer-for | 1+
As6/venti-run/run | 11+++++++++++
As6/venti-run/type | 1+
As6/venti/contents | 2++
Ds6/venti/log/run | 2--
Ds6/venti/run/data/conf | 8--------
Ds6/venti/run/data/fmt | 9---------
Ds6/venti/run/run | 11-----------
As6/venti/type | 1+
Rpack/supervise/death_tally -> supervise/death_tally | 0
Rpack/supervise/death_tally -> supervise/lock | 0
Asupervise/status | 0
636 files changed, 1210 insertions(+), 847 deletions(-)

diff --git a/bin/.s6-rc-ctl.swp b/bin/.s6-rc-ctl.swp Binary files differ. diff --git a/bin/pack b/bin/pack @@ -1,33 +1,36 @@ #!/bin/sh -e # source-based package manager that fetches compile and install -PACKDIR=$HOME/conf/pack +# /src/<package>/<version> - source files of <package> at a given +# <version>. +# +# /opt/<package>/<version> - files installed by <package> at a given +# <version>. -export PACK=$PACKDIR/$2 +export PACK=/etc/pack/$2 export DEST=/local -export PREFIX=$DEST/opt/$2 -export SOURCE=$DEST/src/$2 +export PREFIX=/opt/$2 case $1 in -(tar) test -d "$SOURCE" && exit 0 - mkdir -p "$SOURCE" +(tar) test -d "/src/$2" && exit 0 + mkdir -p "/src/$2" IFS="" read -r url <$PACK/tar wget -O - "$url" | case $url in (*.tgz|*.tar.gz) gzip -d - ;; (*.tbz|*.tar.bz2) bzip2 -d - ;; (*.txz|*.tar.xz) xz -d - ;; (*.tlz|*.tar.lz) lzip -d - ;; - esac | tar -xf - -C "$SOURCE" || exec rm -rf "$SOURCE" - mv "$SOURCE"/*/* "$SOURCE" - rmdir "$SOURCE"/* 2>/dev/null || true + esac | tar -xf - -C "/src/$2" || exec rm -rf "/src/$2" + mv "/src/$2"/*/* "/src/$2" + rmdir "/src/$2"/* 2>/dev/null || true ;; -(git) test -d "$SOURCE" && exit 0 +(git) test -d "/src/$2" && exit 0 IFS="" read -r url <$PACK/git - git clone "$url" "$SOURCE" + git clone "$url" "/src/$2" ;; -(cvs) test -d "$SOURCE" && exit 0 - mkdir -p "$SOURCE" - cd "$SOURCE" +(cvs) test -d "/src/$2" && exit 0 + mkdir -p "/src/$2" + cd "/src/$2" read -r url path <$PACK/cvs cvs -qd "$url" checkout -P "$path" ;; @@ -36,9 +39,9 @@ case $1 in test -f "$PACK/git" && exec "$0" git "$2" test -f "$PACK/cvs" && exec "$0" cvs "$2" ;; -(build) test -d "$SOURCE" || "$0" get "$2" +(build) test -d "/src/$2" || "$0" get "$2" printf '\033[1m[ building %s ]\033[m\n' "$2" - cd "$SOURCE" + cd "/src/$2" mkdir -p "$PREFIX" exec "$PACK/build" ;; @@ -55,11 +58,9 @@ case $1 in rm -rf "$PREFIX" ;; (up) "$0" del "$2" - rm -rf "$SOURCE" + rm -rf "/src/$2" "$0" add "$2" ;; (*) echo 'usage: pack {tar,git,cvs,get,build,add,up} package' - echo - ls "$PACKDIR" ;; esac diff --git a/bin/s6 b/bin/s6 @@ -1,41 +0,0 @@ -#!/bin/sh -e - -# /etc/s6-rc/compiled -# /run/s6-rc/ - -S6="$HOME/conf/s6" - -case $1 in -(start) - exec s6-svscan /run/s6 2>&1 | exec s6-log t /run/log/s6-svscan/ & - ;; -(stop) - exec s6-svscanctl -t /run/s6 - ;; -(reload) - exec s6-svscanctl -a /run/s6 - ;; -(restart) - "$0" stop - exec "$0" start - ;; -(enable) - test -d "$S6/$2" - mkdir -p "/etc/s6/$2" - ls "$S6/$2" | while IFS='' read -r s - do cp -r "$S6/$2/$s" "/etc/s6/$2-$s" - echo "$2-$s" - done >"/etc/s6/$2/contents" - s6-rc - ;; -(disable) - ;; -(check) - exec pgrep s6-svscan - ;; -(*) - echo "usage: s6 {start,stop,restart,reload,enable,disable,check}" - echo - ls "$S6" - ;; -esac diff --git a/bin/s6-rc-ctl b/bin/s6-rc-ctl @@ -0,0 +1,53 @@ +#!/bin/sh -ex + +# Update a live service directory with the source directory provided +# from the command line. It will compile it into a new directory. +# +# /etc/s6-rc/ - Repository of available directories to be copied or +# symlinked ino the /var/s6-rc/source directory. By convention, +# there is <name> for the bundle, <name>-run for the longrun, +# <name>-one for the oneshots, <name>-log for the logger. +# +# /var/s6-rc/source - Where the directories gets copied or symlinked +# prior to be compiled. +# +# /var/s6-rc/compiled-$(s6-clock) - directory where the source +# directory gets compiled in. +# +# /var/s6-rc/compiled - End target directory used as live directory. +# It is a symlink to the latest compiled-@timestamp directory. + +mkdir -p /var/s6-rc/source + +case "$1" in +(start) + rm -rf /var/s6-rc/scandir + mkdir -p /var/s6-rc/scandir + exec s6-svscan /var/s6-rc/scandir 2>&1 | + exec s6-log t /var/log/s6-svscan & + sleep 1 + s6-rc-recompile + s6-rc-init -l /var/s6-rc/live -c /var/s6-rc/compiled /var/s6-rc/scandir + ;; +(stop) + s6-svscanctl -t /var/s6-rc/scandir + ;; +(reload) + s6-rc-recompile + s6-rc-update -l /var/s6-rc/live /var/s6-rc/compiled + ;; +(add) + test -d "/etc/s6-rc/$2" + cp -r "/etc/s6-rc/$2"/* /var/s6-rc/source + mkdir -p "/var/s6-rc/source/$2" + ls "/etc/s6-rc/$2" >"/var/s6-rc/source/$2/contents" + echo bundle >"/var/s6-rc/source/$2/type" + ;; +(del) + xargs -i rm -rf /var/s6-rc/source/{} </var/s6-rc/source/$2/contents + rm -rf "/var/s6-rc/source/$2" + ;; +(*) + echo 'usage: s6-rc-ctl {start,stop,reload,add,del}' + ;; +esac diff --git a/bin/s6-rc-join b/bin/s6-rc-join @@ -0,0 +1,10 @@ +#!/usr/bin/env execlineb + +multisubstitute { importas 1 1 importas 2 2 } +backtick -n n1 { basename $1 } +backtick -n n2 { basename $2 } +multisubstitute { importas n1 n1 importas n2 n2 } +if { redirfd -a 1 ${1}/producer-for echo $n2 } +if { redirfd -a 1 ${2}/consumer-for echo $n1 } +if { sort -u ${1}/producer-for -o ${1}/producer-for } +if { sort -u ${2}/consumer-for -o ${2}/consumer-for } diff --git a/bin/s6-rc-log b/bin/s6-rc-log @@ -0,0 +1,13 @@ +#!/usr/bin/env execlineb + +define fmt "#!/usr/bin/env execlineb +s6-log t /var/log/%s +" + +multisubstitute { importas 1 1 importas fmt fmt } +backtick n1 { basename ${1} } +importas -n n1 n1 +if { mkdir -p ${1}-log } +if { s6-rc-join ${1} ${1}-log } +if { redirfd -a 1 ${1}-log/run printf $fmt ${n1} } +chmod +x ${1}-log/run diff --git a/bin/s6-rc-recompile b/bin/s6-rc-recompile @@ -0,0 +1,7 @@ +#!/usr/bin/env execlineb + +backtick -n t { s6-clock } +importas t t +if { s6-rc-compile /var/s6-rc/compiled-$t /var/s6-rc/source } +if { ln -sf /var/s6-rc/compiled-$t /var/s6-rc/source/compiled } +if { mv -f /var/s6-rc/source/compiled /var/s6-rc } diff --git a/configure b/configure @@ -6,3 +6,8 @@ cd "$(dirname "$0")/dot" find * -type d -exec sh -c 'mkdir -p "$HOME/.$0"' {} ';' -o \ -type f -exec sh -c 'ln -sf "$PWD/$0" "$HOME/.$0"' {} ';' -o \ -type l -exec sh -c 'ln -sf "$(readlink "$0")" "$HOME/.$0"' {} ';' + +if test "$(whoami)" = root +then ln -sf /root/conf/s6 /etc/s6-rc + ln -sf /root/conf/pack /etc/pack +fi diff --git a/pack/9base/build b/pack/9base/build @@ -1,4 +1,5 @@ #!/bin/sh -ex + mkdir -p /9/etc cp -f "$PACK/rcmain" /9/etc/rcmain make PLAN9=/9 PREFIX=/9 install diff --git a/pack/abduco/build b/pack/abduco/build @@ -1,5 +1,4 @@ #!/bin/sh -ex cp "$PACK/config.mk" . - make PREFIX="$PREFIX" install diff --git a/pack/acme-client/build b/pack/acme-client/build @@ -1,7 +1,7 @@ #!/bin/sh -ex -export CFLAGS=-I"'$DEST/include'" -export LDFLAGS=-L"'$DEST/lib'" +export CFLAGS=-I"'/opt/libressl/current/include'" +export LDFLAGS=-L"'/opt/libressl/current/lib'" export PATH=$PACK:$PATH gmake MAN1DIR="$PREFIX/share/man/man1" PREFIX="$PREFIX" install diff --git a/pack/bcftools/build b/pack/bcftools/build @@ -1,3 +1,4 @@ #!/bin/sh -ex + ./configure make prefix="$PREFIX" install diff --git a/pack/blind/build b/pack/blind/build @@ -1,3 +1,4 @@ #!/bin/sh -ex + ./configure make prefix="$PREFIX" install diff --git a/pack/cherrymusic/build b/pack/cherrymusic/build @@ -1,3 +1,4 @@ #!/bin/sh -ex + ./configure make prefix="$PREFIX" install diff --git a/pack/curl/build b/pack/curl/build @@ -1,3 +1,4 @@ #!/bin/sh -ex + ./configure make prefix="$PREFIX" install diff --git a/pack/dash/build b/pack/dash/build @@ -1,5 +1,4 @@ #!/bin/sh -ex ./configure --prefix="$PREFIX" - make install diff --git a/pack/djbdns-man/build b/pack/djbdns-man/build @@ -1,8 +1,8 @@ #!/bin/sh -ex - cd $SOURCE - mkdir -p $PREFIX//share/man/man1 - cp *.1 $PREFIX//share/man/man1 - mkdir -p $PREFIX//share/man/man5 - cp *.5 $PREFIX//share/man/man5 - mkdir -p $PREFIX//share/man/man8 - cp *.8 $PREFIX//share/man/man8 + +mkdir -p "$PREFIX/share/man/man1" +mkdir -p "$PREFIX/share/man/man5" +mkdir -p "$PREFIX/share/man/man8" +cp *.1 "$PREFIX/share/man/man1" +cp *.5 "$PREFIX/share/man/man5" +cp *.8 "$PREFIX/share/man/man8" diff --git a/pack/djbdns/build b/pack/djbdns/build @@ -1,8 +1,8 @@ #!/bin/sh -ex ! patch -N -p1 <$PACK/djbdns-1.05-ipv6.diff -echo gcc -O2 -include /usr/include/errno.h >conf-cc -echo "$PREFIX" >conf-home +echo gcc -O2 -include /usr/include/errno.h >conf-cc +echo "$PREFIX" >conf-home make make setup diff --git a/pack/dq/build b/pack/dq/build @@ -1,7 +1,7 @@ #!/bin/sh -ex -echo bin >conf-bin -echo share/man >conf-man +echo bin >conf-bin +echo share/man >conf-man make sh -e ./make-install.sh "$PREFIX" diff --git a/pack/drawterm/build b/pack/drawterm/build @@ -9,6 +9,6 @@ esac cd "$SOURCE" make -mkdir -p "$PREFIX/bin/" "$PREFIX/share/man/man1/" -cp drawterm "$PREFIX/bin/" -cp drawterm.1 "$PREFIX/share/man/man1/" +mkdir -p "$PREFIX/bin" "$PREFIX/share/man/man1" +cp drawterm "$PREFIX/bin" +cp drawterm.1 "$PREFIX/share/man/man1" diff --git a/pack/dwm/build b/pack/dwm/build @@ -1,5 +1,4 @@ #!/bin/sh -ex -cp $PACK/config.h $PACK/config.mk . - -make PREIFX=$PREFIX install +cp "$PACK/config.h" "$PACK/config.mk" . +make "PREFIX=$PREFIX" install diff --git a/pack/eel/build b/pack/eel/build @@ -1,3 +1,3 @@ #!/bin/sh -ex -make prefix="$PREFIX" install +make PREFIX="$PREFIX" install diff --git a/pack/entr/build b/pack/entr/build @@ -1,3 +1,4 @@ #!/bin/sh -ex + ./configure -make PREFIX=$PREFIX MANPREFIX=$PREFIX/share/man/ install +make "PREFIX=$PREFIX" "MANPREFIX=$PREFIX/share/man" install diff --git a/pack/execline/build b/pack/execline/build @@ -1,9 +1,9 @@ #!/bin/sh -ex ./configure \ - --prefix=$PREFIX/ \ - --with-sysdeps=$DEST/lib/skalibs/sysdeps \ - --with-include=$DEST/include \ - --with-lib=$DEST/lib/skalibs + --prefix="$PREFIX" \ + --with-sysdeps=/opt/libskarnet/current/lib/skalibs/sysdeps \ + --with-include=/opt/libskarnet/current/include \ + --with-lib=/opt/libskarnet/current/lib/skalibs gmake install diff --git a/pack/fluxcapacitor/build b/pack/fluxcapacitor/build @@ -1,3 +1,4 @@ #!/bin/sh -ex + ./configure make prefix="$PREFIX" install diff --git a/pack/ghostscript/build b/pack/ghostscript/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/git/build b/pack/git/build @@ -1,11 +1,11 @@ #!/bin/sh -ex -export CFLAGS="-I'$DEST/include/'" -export LDFLAGS="-L'$DEST/lib/'" +export CFLAGS="-I'/opt/libz/current/include'" +export LDFLAGS="-L'/opt/libz/current/lib'" ./configure --prefix="$PREFIX" \ --without-tcltk \ --without-iconv \ - --with-zlib="$DEST" + --with-zlib=/opt/libz/currentlibz/current gmake install diff --git a/pack/gmake/build b/pack/gmake/build @@ -1,4 +1,5 @@ #!/bin/sh -ex + ./configure --prefix="$PREFIX" --program-prefix=g ./build.sh ./make install diff --git a/pack/gophermap/build b/pack/gophermap/build @@ -1,3 +1,3 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +make PREFIX="$PREFIX" install diff --git a/pack/icecast/build b/pack/icecast/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/ii/build b/pack/ii/build @@ -1,5 +1,4 @@ #!/bin/sh -ex ! patch -N -p1 <$PACK/ii-1.8-ucspi.diff - make PREFIX="$PREFIX" install diff --git a/pack/irssi/build b/pack/irssi/build @@ -1,7 +1,7 @@ #!/bin/sh -ex -export OPENSSL_CFLAGS="-I$PACK/include" -export OPENSSL_LIBS="-L$PACK/lib -lssl" +export OPENSSL_CFLAGS='-I/opt/libressl/current/include' +export OPENSSL_LIBS='-L/opt/libressl/current/lib -lssl' cp -R "$PACK"/* . ./configure \ diff --git a/pack/jq/build b/pack/jq/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/less/build b/pack/less/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/libalsa/build b/pack/libalsa/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/libav/build b/pack/libav/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/libbearssl/build b/pack/libbearssl/build @@ -1,6 +1,7 @@ #!/bin/sh -ex + gmake mkdir -p "$PREFIX/bin" "$PREFIX/lib" "$PREFIX/include" cp build/brssl build/test* "$PREFIX/bin" -cp build/libbearssl.* "$PREFIX/lib" -cp inc/* "$PREFIX/include" +cp build/libbearssl.* "$PREFIX/lib" +cp inc/* "$PREFIX/include" diff --git a/pack/libc9/build b/pack/libc9/build @@ -1,3 +1,3 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +make diff --git a/pack/libedit/build b/pack/libedit/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/libevent/build b/pack/libevent/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/libflac/build b/pack/libflac/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/libgit2/build b/pack/libgit2/build @@ -1,4 +1,5 @@ #!/bin/sh -ex + cp "$PACK/features.h" "$SOURCE/include/git2/sys/" rm -f "$SOURCE/src/hash/hash_generic.c" @@ -8,7 +9,7 @@ rm -fR "$SOURCE/src/win32/" cd src cc -c -fPIC \ - -I./ -I"$DEST/include" -I../include/ -I../deps/http-parser/ \ + -I./ -I"/opt/libressl/current/include" -I../include/ -I../deps/http-parser/ \ ./*.c ./*/*.c ./*/*/*.c ../deps/http-parser/*.c cc -shared -o libgit2.so *.o ar -rcs libgit2.a *.o diff --git a/pack/libhts/build b/pack/libhts/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/libjpeg/build b/pack/libjpeg/build @@ -1,5 +1,4 @@ #!/bin/sh -e ./configure --prefix="$PREFIX" - make install diff --git a/pack/liblzip/build b/pack/liblzip/build @@ -1,5 +1,4 @@ #!/bin/sh -ex ./configure --prefix="$PREFIX" - make install diff --git a/pack/liblzma/build b/pack/liblzma/build @@ -1,5 +1,4 @@ -#!/bin/sh -e +#!/bin/sh -ex ./configure --prefix="$PREFIX" - gmake install diff --git a/pack/libmpg123/build b/pack/libmpg123/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/libmusl/build b/pack/libmusl/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/libogg/build b/pack/libogg/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/libopus/build b/pack/libopus/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/libotr/build b/pack/libotr/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/libpcap/build b/pack/libpcap/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/libpng/build b/pack/libpng/build @@ -1,5 +1,4 @@ #!/bin/sh -e ./configure --prefix="$PREFIX" - gmake install diff --git a/pack/libressl/build b/pack/libressl/build @@ -1,5 +1,4 @@ #!/bin/sh -ex ./configure --prefix="$PREFIX" - make install diff --git a/pack/libsodium/build b/pack/libsodium/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/libtox/build b/pack/libtox/build @@ -1,7 +1,7 @@ #!/bin/sh -ex ./configure --prefix="$PREFIX" \ - --with-libsodium-libs="$DEST/lib" \ - --with-libsodium-headers="$DEST/include" + --with-libsodium-libs=/opt/libsodium/current/lib \ + --with-libsodium-headers=/opt/libsodium/current/include make install diff --git a/pack/libvorbis/build b/pack/libvorbis/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/libvpx/build b/pack/libvpx/build @@ -3,4 +3,4 @@ ./configure --prefix="$PREFIX" \ --extra-cflags="-fPIC" -make install +make install diff --git a/pack/libx11/build b/pack/libx11/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/libz/build b/pack/libz/build @@ -1,5 +1,4 @@ #!/bin/sh -ex ./configure --prefix="$PREFIX" - make install diff --git a/pack/links2/build b/pack/links2/build @@ -1,5 +1,8 @@ #!/bin/sh -ex -make CFLAGS="-I'$DEST/include'" + +make \ + CFLAGS="-I'/opt/libressl/current/include'" \ + LDFLAGS="-L'/opt/libressl/lib/include'" mkdir -p "$PREFIX/bin" "$PREFIX/share/man/man1" cp links "$PREFIX/bin" cp links.1 "$PREFIX/share/man/man1" diff --git a/pack/man-freebsd/build b/pack/man-freebsd/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/man-plan9/build b/pack/man-plan9/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/mandoc/build b/pack/mandoc/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/miniwi/build b/pack/miniwi/build @@ -1,3 +1,3 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +make PREFIX="$PREFIX" install diff --git a/pack/mpop/build b/pack/mpop/build @@ -1,7 +1,7 @@ #!/bin/sh -ex -export libssl_CFLAGS="-I'$DEST/include'" -export libssl_LIBS="-static -L'$DEST/lib' -lssl -lcrypto" +export libssl_CFLAGS="-I'/opt/libressl/current/include'" +export libssl_LIBS="-static -L'/opt/libressl/current/lib' -lssl -lcrypto" ./configure --prefix="$PREFIX" diff --git a/pack/msmtp/build b/pack/msmtp/build @@ -1,7 +1,7 @@ #!/bin/sh -ex -export libssl_CFLAGS="-I'$DEST/include'" -export libssl_LIBS="-L'$DEST/lib' -lssl -lcrypto" +export libssl_CFLAGS="-I'/opt/libressl/current/include'" +export libssl_LIBS="-L'/opt/libressl/current/lib' -lssl -lcrypto" ./configure --prefix="$PREFIX" --with-tls=openssl diff --git a/pack/mupdf/build b/pack/mupdf/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/netpgp/build b/pack/netpgp/build @@ -1,9 +1,9 @@ #!/bin/sh -ex -export CFLAGS="-I$DEST/include" -export LDFLAGS="-L$DEST/lib" +export CFLAGS="-I/opt/libressl/current/include" +export LDFLAGS="-L/opt/libressl/current/lib" ./configure --prefix="$PREFIX" \ - --with-openssl="$DEST" + --with-openssl="/opt/libressl/current/lib" make install diff --git a/pack/ngircd/build b/pack/ngircd/build @@ -1,2 +1,3 @@ #!/bin/sh -ex -./configure --sbindir="$PREFIX/bin" --with-openssl + +./configure --sbindir="$PREFIX/bin" --with-openssl=/opt/libressl/current diff --git a/pack/oksh/build b/pack/oksh/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/openssh/build b/pack/openssh/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/opentracker/build b/pack/opentracker/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/opus-tools/build b/pack/opus-tools/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/ploot/build b/pack/ploot/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/qmail/build b/pack/qmail/build @@ -1,13 +1,9 @@ #!/bin/sh -ex -<<<<<<< HEAD DATA=/var/qmail -======= -DATA=/var/s6/qmail-send/data ->>>>>>> b8e8dd691657b3ab3d91cc7c3e9358584ac563cb -echo gcc -O2 -include /usr/include/errno.h >conf-cc -echo "$DATA" >conf-qmail +echo gcc -O2 -include /usr/include/errno.h >conf-cc +echo "$DATA" >conf-qmail touch nroff chmod +x nroff @@ -18,4 +14,4 @@ rm -rf "$DATA/bin/" "$DATA/man/" ln -sf "$PREFIX/bin/" "$DATA/" ln -sf "$PREFIX/share/man/" "$DATA/" make setup check -./config- \ No newline at end of file +./config diff --git a/pack/quark/build b/pack/quark/build @@ -1,5 +1,4 @@ #!/bin/sh -e cp "$PACK/config.h" . - make PREFIX="$PREFIX" install diff --git a/pack/radare2/build b/pack/radare2/build @@ -1,2 +1,4 @@ #!/bin/sh -ex + export LDFLAGS=-lm +make diff --git a/pack/ratox/build b/pack/ratox/build @@ -1,5 +1,4 @@ #!/bin/sh -ex cp "$PACK/config.mk" . - make prefix="$PREFIX" install diff --git a/pack/reflex/build b/pack/reflex/build @@ -1,6 +1,5 @@ #!/bin/sh -ex ./configure --prefix="$PREFIX" - make install mv "$DEST/bin/reflex" "$DEST/bin/flex" diff --git a/pack/rlwrap/build b/pack/rlwrap/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/rsync/build b/pack/rsync/build @@ -1,5 +1,4 @@ #!/bin/sh -ex ./configure --prefix="$PREFIX" - make install diff --git a/pack/runit/build b/pack/runit/build @@ -3,7 +3,7 @@ test -d src || mv */* . ./package/compile -mkdir -p $PREFIX//share/man/man8 -cp man/* $PREFIX//share/man/man8 -mkdir -p $PREFIX//bin +mkdir -p $PREFIX//share/man/man8 +cp man/* $PREFIX//share/man/man8 +mkdir -p $PREFIX//bin cp command/* $PREFIX//bin diff --git a/pack/s6-dns/build b/pack/s6-dns/build @@ -2,8 +2,8 @@ ./configure \ --prefix=$PREFIX/ \ - --with-sysdeps=$DEST/lib/skalibs/sysdeps \ - --with-include=$DEST/include \ - --with-lib=$DEST/lib/skalibs + --with-sysdeps=/opt/libskarnet/lib/skalibs/sysdeps \ + --with-include=/opt/libskarnet/include \ + --with-lib=/opt/libskarnet/lib/skalibs gmake install diff --git a/pack/s6-networking/build b/pack/s6-networking/build @@ -2,13 +2,13 @@ ./configure \ --prefix=$PREFIX/ \ - --with-sysdeps=$DEST/lib/skalibs/sysdeps \ - --with-include=$DEST/include \ - --with-lib=$DEST/lib/skalibs \ - --with-lib=$DEST/lib/execline \ - --with-lib=$DEST/lib/s6 \ - --with-lib=$DEST/lib/s6-dns \ + --with-sysdeps=/opt/libskarnet/lib/skalibs/sysdeps \ + --with-include=/opt/libskarnet/include \ + --with-lib=/opt/libskarnet/lib/skalibs \ + --with-lib=/opt/libskarnet/lib/execline \ + --with-lib=/opt/libskarnet/lib/s6 \ + --with-lib=/opt/libskarnet/lib/s6-dns \ --enable-ssl=bearssl \ - --with-ssl-path=$DEST + --with-ssl-path=/opt/libbearssl gmake install diff --git a/pack/s6-portable-utils/build b/pack/s6-portable-utils/build @@ -2,8 +2,8 @@ ./configure \ --prefix=$PREFIX/ \ - --with-sysdeps=$DEST/lib/skalibs/sysdeps \ - --with-include=$DEST/include \ - --with-lib=$DEST/lib/skalibs + --with-sysdeps=/opt/libskarnet/lib/skalibs/sysdeps \ + --with-include=/opt/libskarnet/include \ + --with-lib=/opt/libskarnet/lib/skalibs gmake install diff --git a/pack/s6-rc/build b/pack/s6-rc/build @@ -2,10 +2,10 @@ ./configure \ --prefix=$PREFIX/ \ - --with-sysdeps=$DEST/lib/skalibs/sysdeps \ - --with-include=$DEST/include \ - --with-lib=$DEST/lib/skalibs \ - --with-lib=$DEST/lib/execline \ - --with-lib=$DEST/lib/s6 + --with-sysdeps=/opt/libskarnet/lib/skalibs/sysdeps \ + --with-include=/opt/libskarnet/include \ + --with-lib=/opt/libskarnet/lib/skalibs \ + --with-lib=/opt/execline/lib/execline \ + --with-lib=/opt/s6/lib/s6 gmake install diff --git a/pack/s6/build b/pack/s6/build @@ -2,9 +2,9 @@ ./configure \ --prefix=$PREFIX/ \ - --with-sysdeps=$DEST/lib/skalibs/sysdeps \ - --with-include=$DEST/include \ - --with-lib=$DEST/lib/skalibs \ - --with-lib=$DEST/lib/execline + --with-sysdeps=/opt/libskarnet/lib/skalibs/sysdeps \ + --with-include=/opt/libskarnet/include \ + --with-lib=/opt/libskarnet/lib/skalibs \ + --with-lib=/opt/execline/lib/execline gmake install diff --git a/pack/samtools/build b/pack/samtools/build @@ -1,3 +1,3 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +make PREFIX="$PREFIX" install diff --git a/pack/sbase/build b/pack/sbase/build @@ -1,3 +1,3 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +make PREFIX="$PREFIX" install diff --git a/pack/scc/build b/pack/scc/build @@ -1,3 +1,3 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +make PREFIX="$PREFIX" install diff --git a/pack/scron/build b/pack/scron/build @@ -1,3 +1,3 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +make PREFIX="$PREFIX" install diff --git a/pack/scrypt/build b/pack/scrypt/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/sct/build b/pack/sct/build @@ -1,5 +1,5 @@ #!/bin/sh -ex mkdir -p "$PREFIX/bin" -cc -std=c99 -L /usr/X11R6/lib -I /usr/X11R6/include \ +cc -std=c99 -L/usr/X11R6/lib -I/usr/X11R6/include \ -o "$PREFIX/bin/sct" sct.c -lm -lX11 -lXrandr diff --git a/pack/sent/build b/pack/sent/build @@ -1,3 +1,3 @@ #!/bin/sh -ex -make prefix="$PREFIX" install +make PREFIX="$PREFIX" install diff --git a/pack/sfeed/build b/pack/sfeed/build @@ -1,5 +1,5 @@ #!/bin/sh -ex -cp "$PACK/sfeed_twtxt.c" . +cp "$PACK/sfeed_twtxt.c" . make MANPREFIX="$PREFIX/share/man" PREFIX="$PREFIX" install cc -o "$PREFIX/bin/sfeed_twtxt" sfeed_twtxt.c util.c diff --git a/pack/shntool/build b/pack/shntool/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/snooze/build b/pack/snooze/build @@ -1,3 +1,3 @@ -#!/bin/sh -e +#!/bin/sh -ex make PREFIX="$PREFIX" install diff --git a/pack/spoon/build b/pack/spoon/build @@ -1,6 +1,6 @@ #!/bin/sh -ex -cp "$(dirname "$0")/config.h" "./config.h" +cp "$PACK/config.h" . ./configure sed -r '/mpd/ s,^[^#],#,' Makefile >sed mv sed Makefile diff --git a/pack/sselp/build b/pack/sselp/build @@ -1,3 +1,3 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +make PREFIX="$PREFIX" install diff --git a/pack/st/build b/pack/st/build @@ -2,5 +2,4 @@ cp "$PACK/helios_dark.h" colors.h cp "$PACK/config.h" "$PACK/config.mk" . - make PREFIX="$PREFIX" install diff --git a/pack/stagit-gopher/build b/pack/stagit-gopher/build @@ -1,5 +1,4 @@ #!/bin/sh -ex -cp "$PACK/config.mk" ./ - +cp "$PACK/config.mk" . make PREFIX="$PREFIX" install diff --git a/pack/stagit/build b/pack/stagit/build @@ -1,5 +1,4 @@ #!/bin/sh -ex -cp "$PACK/config.mk" ./ - +cp "$PACK/config.mk" . make PREFIX="$PREFIX" install diff --git a/pack/supervise/build b/pack/supervise/build @@ -1,3 +0,0 @@ -#!/bin/sh -ex -./configure -make prefix="$PREFIX" install diff --git a/pack/supervise/status b/pack/supervise/status Binary files differ. diff --git a/pack/syncmaildir/tar b/pack/syncmaildir/tar @@ -0,0 +1 @@ +https://sourceforge.net/projects/syncmaildir/files/syncmaildir/syncmaildir-1.2.6.2.tar.gz diff --git a/pack/tabbed/build b/pack/tabbed/build @@ -1,5 +1,4 @@ -#!/bin/sh -e +#!/bin/sh -ex cp "$PACK/config.mk" . - make PREFIX="$PREFIX" install diff --git a/pack/tarsnap/build b/pack/tarsnap/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/tcpdump/build b/pack/tcpdump/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/tinc/build b/pack/tinc/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/tinyldap/build b/pack/tinyldap/build @@ -1,11 +1,11 @@ #!/bin/sh -ex -rm -rf tinyldap/ -make DIET='sh -cx "cc -I${DEST}/include/ -L${DEST}/lib/ \$$@"' +rm -rf tinyldap +make DIET='sh -cx "cc -I/opt/libowfat/include/ -L/opt/libowfat/lib/ \$$@"' mkdir -p "$PREFIX/bin/" cp addindex bindrequest dumpidx ldapclient ldapclient_str parse tinyldap \ tinyldap_debug tinyldap_standalone \ "$PREFIX/bin/" -#cc -L"$DEST/lib/" -L./ -I"$DEST/include/" -I./ -pipe "$PACK/checkpassword.c" -lowfat +#cc -L/opt/libowfat/lib/ -L./ -I/opt/libowfat/include/ -I./ -pipe "$PACK/checkpassword.c" -lowfat diff --git a/pack/tinysshd/build b/pack/tinysshd/build @@ -1,5 +1,6 @@ #!/bin/sh -ex -echo bin >conf-bin -echo share/man >conf-man + +echo bin >conf-bin +echo share/man >conf-man make sh -e ./make-install.sh "$PREFIX" diff --git a/pack/tmux/build b/pack/tmux/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/tnftp/build b/pack/tnftp/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/tor/build b/pack/tor/build @@ -1,5 +1,7 @@ #!/bin/sh -ex + ./configure --prefix="$PREFIX" \ --sbindir="$PREFIX/bin" \ --with-libevent-dir="$PACK" \ --with-openssl-dir="$PACK" +make install diff --git a/pack/transmission/build b/pack/transmission/build @@ -3,20 +3,20 @@ export PKG_CONFIG=$(which true) export LIBCURL_LIBS=-lcurl -export LIBCURL_CFLAGS="-I$DEST/include" -export LIBCURL_LDFLAGS="-L$DEST/lib" +export LIBCURL_CFLAGS="-I/opt/libcurl/include" +export LIBCURL_LDFLAGS="-L/opt/libcurl/lib" export LIBEVENT_LIBS=-levent -export LIBEVENT_CFLAGS="-I$DEST/lib" -export LIBEVENT_LDFLAGS="-L$DEST/lib" +export LIBEVENT_CFLAGS="-I/opt/libevent/include" +export LIBEVENT_LDFLAGS="-L/opt/libevent/lib" export ZLIB_LIBS=-lz -export ZLIB_CFLAGS="-I$DEST/lib" -export ZLIB_LDFLAGS="-L$DEST/lib" +export ZLIB_CFLAGS="-I/opt/libz/include" +export ZLIB_LDFLAGS="-L/opt/libz/lib" export OPENSSL_LIBS='-lssl -lcrypto' -export OPENSSL_CFLAGS="-I$DEST/lib" -export OPENSSL_LDFLAGS="-L$DEST/lib" +export OPENSSL_CFLAGS="-I/opt/libressl/include" +export OPENSSL_LDFLAGS="-L/opt/libressl/lib" ./configure --prefix="$PREFIX" \ --with-crypto=openssl \ diff --git a/pack/tttml/build b/pack/tttml/build @@ -1,3 +1,3 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +make PREFIX="$PREFIX" install diff --git a/pack/u9fs/build b/pack/u9fs/build @@ -1,4 +1,5 @@ #!/bin/sh -ex + sed '4 s/^$/#define ruserok(a, b, c, d) (-1)/' authrhosts.c >sed mv sed authrhosts.c diff --git a/pack/vorbis-tools/build b/pack/vorbis-tools/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/yacc/build b/pack/yacc/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/yasm/build b/pack/yasm/build @@ -1,3 +1,4 @@ #!/bin/sh -ex -./configure -make prefix="$PREFIX" install + +./configure --prefix="$PREFIX" +make install diff --git a/pack/supervise/death_tally b/s6/.s6-svscan/lock diff --git a/s6/backup-log/consumer-for b/s6/backup-log/consumer-for @@ -0,0 +1 @@ +backup diff --git a/s6/backup-log/run b/s6/backup-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/backup diff --git a/s6/backup-log/type b/s6/backup-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/backup-run/producer-for b/s6/backup-run/producer-for @@ -0,0 +1 @@ +backup-log diff --git a/s6/backup/run/run b/s6/backup-run/run diff --git a/s6/backup-run/type b/s6/backup-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/backup/contents b/s6/backup/contents @@ -0,0 +1,2 @@ +backup-log +backup-run diff --git a/s6/backup/log/run b/s6/backup/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/backup/ diff --git a/s6/backup/type b/s6/backup/type @@ -0,0 +1 @@ +longrun diff --git a/s6/btpd-log/consumer-for b/s6/btpd-log/consumer-for @@ -0,0 +1 @@ +btpd diff --git a/s6/btpd-log/run b/s6/btpd-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/btpd diff --git a/s6/btpd-log/type b/s6/btpd-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/btpd-run/producer-for b/s6/btpd-run/producer-for @@ -0,0 +1 @@ +btpd-log diff --git a/s6/btpd/run/run b/s6/btpd-run/run diff --git a/s6/btpd-run/type b/s6/btpd-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/btpd/contents b/s6/btpd/contents @@ -0,0 +1,2 @@ +btpd-log +btpd-run diff --git a/s6/btpd/log/run b/s6/btpd/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/btpd/ diff --git a/s6/btpd/type b/s6/btpd/type @@ -0,0 +1 @@ +longrun diff --git a/s6/cherrymusic-log/consumer-for b/s6/cherrymusic-log/consumer-for @@ -0,0 +1 @@ +cherrymusic diff --git a/s6/cherrymusic-log/run b/s6/cherrymusic-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/cherrymusic diff --git a/s6/cherrymusic-log/type b/s6/cherrymusic-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/cherrymusic-run/producer-for b/s6/cherrymusic-run/producer-for @@ -0,0 +1 @@ +cherrymusic-log diff --git a/s6/cherrymusic/run/run b/s6/cherrymusic-run/run diff --git a/s6/cherrymusic-run/type b/s6/cherrymusic-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/cherrymusic/contents b/s6/cherrymusic/contents @@ -0,0 +1,2 @@ +cherrymusic-log +cherrymusic-run diff --git a/s6/cherrymusic/log/run b/s6/cherrymusic/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/cherrymusic/ diff --git a/s6/cherrymusic/type b/s6/cherrymusic/type @@ -0,0 +1 @@ +longrun diff --git a/s6/collectd-log/consumer-for b/s6/collectd-log/consumer-for @@ -0,0 +1 @@ +collectd diff --git a/s6/collectd-log/run b/s6/collectd-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/collectd diff --git a/s6/collectd-log/type b/s6/collectd-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/collectd/run/data/conf b/s6/collectd-run/data/conf diff --git a/s6/collectd-run/producer-for b/s6/collectd-run/producer-for @@ -0,0 +1 @@ +collectd-log diff --git a/s6/collectd/run/run b/s6/collectd-run/run diff --git a/s6/collectd-run/type b/s6/collectd-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/collectd/contents b/s6/collectd/contents @@ -0,0 +1,2 @@ +collectd-log +collectd-run diff --git a/s6/collectd/log/run b/s6/collectd/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/collectd/ diff --git a/s6/collectd/type b/s6/collectd/type @@ -0,0 +1 @@ +longrun diff --git a/s6/djbdns-axfrdns-log/consumer-for b/s6/djbdns-axfrdns-log/consumer-for @@ -0,0 +1 @@ +djbdns-axfrdns diff --git a/s6/djbdns-axfrdns-log/run b/s6/djbdns-axfrdns-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/djbdns-axfrdns diff --git a/s6/djbdns-axfrdns-log/type b/s6/djbdns-axfrdns-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/djbdns-axfrdns/run/env/ROOT b/s6/djbdns-axfrdns-run/env/ROOT diff --git a/s6/djbdns-axfrdns-run/producer-for b/s6/djbdns-axfrdns-run/producer-for @@ -0,0 +1 @@ +djbdns-axfrdns-log diff --git a/s6/djbdns-axfrdns/run/run b/s6/djbdns-axfrdns-run/run diff --git a/s6/djbdns-axfrdns-run/type b/s6/djbdns-axfrdns-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/djbdns-axfrdns/contents b/s6/djbdns-axfrdns/contents @@ -0,0 +1,2 @@ +djbdns-axfrdns-log +djbdns-axfrdns-run diff --git a/s6/djbdns-axfrdns/log/run b/s6/djbdns-axfrdns/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/djbdns-axfrdns/ diff --git a/s6/djbdns-axfrdns/type b/s6/djbdns-axfrdns/type @@ -0,0 +1 @@ +longrun diff --git a/s6/djbdns-dnscache-log/consumer-for b/s6/djbdns-dnscache-log/consumer-for @@ -0,0 +1 @@ +djbdns-dnscache diff --git a/s6/djbdns-dnscache-log/run b/s6/djbdns-dnscache-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/djbdns-dnscache diff --git a/s6/djbdns-dnscache-log/type b/s6/djbdns-dnscache-log/type @@ -0,0 +1 @@ +longrun diff --git a/pack/supervise/lock b/s6/djbdns-dnscache-run/data/ip/127.0.0.1 diff --git a/s6/djbdns-dnscache/run/data/ip/127.0.0.1 b/s6/djbdns-dnscache-run/data/servers/@ diff --git a/s6/djbdns-dnscache/run/env/CACHESIZE b/s6/djbdns-dnscache-run/env/CACHESIZE diff --git a/s6/djbdns-dnscache/run/env/DATALIMIT b/s6/djbdns-dnscache-run/env/DATALIMIT diff --git a/s6/djbdns-dnscache/run/env/IP b/s6/djbdns-dnscache-run/env/IP diff --git a/s6/djbdns-dnscache/run/env/IPSEND b/s6/djbdns-dnscache-run/env/IPSEND diff --git a/s6/djbdns-dnscache/run/env/ROOT b/s6/djbdns-dnscache-run/env/ROOT diff --git a/s6/djbdns-dnscache-run/producer-for b/s6/djbdns-dnscache-run/producer-for @@ -0,0 +1 @@ +djbdns-dnscache-log diff --git a/s6/djbdns-dnscache/run/run b/s6/djbdns-dnscache-run/run diff --git a/s6/djbdns-dnscache-run/type b/s6/djbdns-dnscache-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/djbdns-dnscache/contents b/s6/djbdns-dnscache/contents @@ -0,0 +1,2 @@ +djbdns-dnscache-log +djbdns-dnscache-run diff --git a/s6/djbdns-dnscache/log/run b/s6/djbdns-dnscache/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/djbdns-dnscache/ diff --git a/s6/djbdns-dnscache/type b/s6/djbdns-dnscache/type @@ -0,0 +1 @@ +longrun diff --git a/s6/djbdns-tinydns-log/consumer-for b/s6/djbdns-tinydns-log/consumer-for @@ -0,0 +1 @@ +djbdns-tinydns diff --git a/s6/djbdns-tinydns-log/run b/s6/djbdns-tinydns-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/djbdns-tinydns diff --git a/s6/djbdns-tinydns-log/type b/s6/djbdns-tinydns-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/djbdns-tinydns/run/data/Makefile b/s6/djbdns-tinydns-run/data/Makefile diff --git a/s6/djbdns-tinydns/run/data/add-alias b/s6/djbdns-tinydns-run/data/add-alias diff --git a/s6/djbdns-tinydns/run/data/add-childns b/s6/djbdns-tinydns-run/data/add-childns diff --git a/s6/djbdns-tinydns/run/data/add-host b/s6/djbdns-tinydns-run/data/add-host diff --git a/s6/djbdns-tinydns/run/data/add-mx b/s6/djbdns-tinydns-run/data/add-mx diff --git a/s6/djbdns-tinydns/run/data/add-ns b/s6/djbdns-tinydns-run/data/add-ns diff --git a/s6/djbdns-dnscache/run/data/servers/@ b/s6/djbdns-tinydns-run/data/data diff --git a/s6/djbdns-tinydns/run/env/IP b/s6/djbdns-tinydns-run/env/IP diff --git a/s6/djbdns-tinydns/run/env/ROOT b/s6/djbdns-tinydns-run/env/ROOT diff --git a/s6/djbdns-tinydns-run/producer-for b/s6/djbdns-tinydns-run/producer-for @@ -0,0 +1 @@ +djbdns-tinydns-log diff --git a/s6/djbdns-tinydns/run/run b/s6/djbdns-tinydns-run/run diff --git a/s6/djbdns-tinydns-run/type b/s6/djbdns-tinydns-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/djbdns-tinydns/contents b/s6/djbdns-tinydns/contents @@ -0,0 +1,2 @@ +djbdns-tinydns-log +djbdns-tinydns-run diff --git a/s6/djbdns-tinydns/log/run b/s6/djbdns-tinydns/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/djbdns-tinydns/ diff --git a/s6/djbdns-tinydns/type b/s6/djbdns-tinydns/type @@ -0,0 +1 @@ +longrun diff --git a/s6/djbdns-walldns-log/consumer-for b/s6/djbdns-walldns-log/consumer-for @@ -0,0 +1 @@ +djbdns-walldns diff --git a/s6/djbdns-walldns-log/run b/s6/djbdns-walldns-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/djbdns-walldns diff --git a/s6/djbdns-walldns-log/type b/s6/djbdns-walldns-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/djbdns-walldns/run/env/IP b/s6/djbdns-walldns-run/env/IP diff --git a/s6/djbdns-walldns/run/env/ROOT b/s6/djbdns-walldns-run/env/ROOT diff --git a/s6/djbdns-walldns-run/producer-for b/s6/djbdns-walldns-run/producer-for @@ -0,0 +1 @@ +djbdns-walldns-log diff --git a/s6/djbdns-walldns/run/run b/s6/djbdns-walldns-run/run diff --git a/s6/djbdns-walldns-run/type b/s6/djbdns-walldns-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/djbdns-walldns/contents b/s6/djbdns-walldns/contents @@ -0,0 +1,2 @@ +djbdns-walldns-log +djbdns-walldns-run diff --git a/s6/djbdns-walldns/log/run b/s6/djbdns-walldns/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/djbdns-walldns/ diff --git a/s6/djbdns-walldns/type b/s6/djbdns-walldns/type @@ -0,0 +1 @@ +longrun diff --git a/s6/fossil-log/consumer-for b/s6/fossil-log/consumer-for @@ -0,0 +1 @@ +fossil diff --git a/s6/fossil-log/run b/s6/fossil-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/fossil diff --git a/s6/fossil-log/type b/s6/fossil-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/fossil-run/producer-for b/s6/fossil-run/producer-for @@ -0,0 +1 @@ +fossil-log diff --git a/s6/fossil/run/run b/s6/fossil-run/run diff --git a/s6/fossil-run/type b/s6/fossil-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/fossil/contents b/s6/fossil/contents @@ -0,0 +1,2 @@ +fossil-log +fossil-run diff --git a/s6/fossil/log/run b/s6/fossil/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/fossil/ diff --git a/s6/fossil/type b/s6/fossil/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ftpd-log/consumer-for b/s6/ftpd-log/consumer-for @@ -0,0 +1 @@ +ftpd diff --git a/s6/ftpd-log/run b/s6/ftpd-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/ftpd diff --git a/s6/ftpd-log/type b/s6/ftpd-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ftpd-run/producer-for b/s6/ftpd-run/producer-for @@ -0,0 +1 @@ +ftpd-log diff --git a/s6/ftpd/run/run b/s6/ftpd-run/run diff --git a/s6/ftpd-run/type b/s6/ftpd-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ftpd/contents b/s6/ftpd/contents @@ -0,0 +1,2 @@ +ftpd-log +ftpd-run diff --git a/s6/ftpd/type b/s6/ftpd/type @@ -0,0 +1 @@ +longrun diff --git a/s6/geomyidae-log/consumer-for b/s6/geomyidae-log/consumer-for @@ -0,0 +1 @@ +geomyidae diff --git a/s6/geomyidae-log/run b/s6/geomyidae-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/geomyidae diff --git a/s6/geomyidae-log/type b/s6/geomyidae-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/geomyidae/run/env/BASE b/s6/geomyidae-run/env/BASE diff --git a/s6/geomyidae/run/env/HOST b/s6/geomyidae-run/env/HOST diff --git a/s6/geomyidae/run/env/PORT b/s6/geomyidae-run/env/PORT diff --git a/s6/geomyidae-run/producer-for b/s6/geomyidae-run/producer-for @@ -0,0 +1 @@ +geomyidae-log diff --git a/s6/geomyidae/run/run b/s6/geomyidae-run/run diff --git a/s6/geomyidae-run/type b/s6/geomyidae-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/geomyidae/contents b/s6/geomyidae/contents @@ -0,0 +1,2 @@ +geomyidae-log +geomyidae-run diff --git a/s6/geomyidae/log/run b/s6/geomyidae/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/geomyidae/ diff --git a/s6/geomyidae/type b/s6/geomyidae/type @@ -0,0 +1 @@ +longrun diff --git a/s6/git-daemon-log/consumer-for b/s6/git-daemon-log/consumer-for @@ -0,0 +1 @@ +git-daemon diff --git a/s6/git-daemon-log/run b/s6/git-daemon-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/git-daemon diff --git a/s6/git-daemon-log/type b/s6/git-daemon-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/git-daemon-run/producer-for b/s6/git-daemon-run/producer-for @@ -0,0 +1 @@ +git-daemon-log diff --git a/s6/git-daemon/run/run b/s6/git-daemon-run/run diff --git a/s6/git-daemon-run/type b/s6/git-daemon-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/git-daemon/contents b/s6/git-daemon/contents @@ -0,0 +1,2 @@ +git-daemon-log +git-daemon-run diff --git a/s6/git-daemon/log/run b/s6/git-daemon/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/git-daemon/ diff --git a/s6/git-daemon/type b/s6/git-daemon/type @@ -0,0 +1 @@ +longrun diff --git a/s6/git-mirror-log/consumer-for b/s6/git-mirror-log/consumer-for @@ -0,0 +1 @@ +git-mirror diff --git a/s6/git-mirror-log/run b/s6/git-mirror-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/git-mirror diff --git a/s6/git-mirror-log/type b/s6/git-mirror-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/djbdns-tinydns/run/data/data b/s6/git-mirror-run/data/mirror diff --git a/s6/git-mirror-run/producer-for b/s6/git-mirror-run/producer-for @@ -0,0 +1 @@ +git-mirror-log diff --git a/s6/git-mirror/run/run b/s6/git-mirror-run/run diff --git a/s6/git-mirror-run/type b/s6/git-mirror-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/git-mirror/contents b/s6/git-mirror/contents @@ -0,0 +1,2 @@ +git-mirror-log +git-mirror-run diff --git a/s6/git-mirror/log/run b/s6/git-mirror/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/git-mirror/ diff --git a/s6/git-mirror/type b/s6/git-mirror/type @@ -0,0 +1 @@ +longrun diff --git a/s6/gproxy-log/consumer-for b/s6/gproxy-log/consumer-for @@ -0,0 +1 @@ +gproxy diff --git a/s6/gproxy-log/run b/s6/gproxy-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/gproxy diff --git a/s6/gproxy-log/type b/s6/gproxy-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/gproxy/run/data/gproxy b/s6/gproxy-run/data/gproxy diff --git a/s6/gproxy-run/producer-for b/s6/gproxy-run/producer-for @@ -0,0 +1 @@ +gproxy-log diff --git a/s6/gproxy/run/run b/s6/gproxy-run/run diff --git a/s6/gproxy-run/type b/s6/gproxy-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/gproxy/contents b/s6/gproxy/contents @@ -0,0 +1,2 @@ +gproxy-log +gproxy-run diff --git a/s6/gproxy/log/run b/s6/gproxy/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/gproxy/ diff --git a/s6/gproxy/type b/s6/gproxy/type @@ -0,0 +1 @@ +longrun diff --git a/s6/httpd-log/consumer-for b/s6/httpd-log/consumer-for @@ -0,0 +1 @@ +httpd diff --git a/s6/httpd-log/run b/s6/httpd-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/httpd diff --git a/s6/httpd-log/type b/s6/httpd-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/httpd-run/producer-for b/s6/httpd-run/producer-for @@ -0,0 +1 @@ +httpd-log diff --git a/s6/httpd/run/run b/s6/httpd-run/run diff --git a/s6/httpd-run/type b/s6/httpd-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/httpd/contents b/s6/httpd/contents @@ -0,0 +1,2 @@ +httpd-log +httpd-run diff --git a/s6/httpd/log/run b/s6/httpd/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/httpd diff --git a/s6/httpd/type b/s6/httpd/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ii-tcp-log/consumer-for b/s6/ii-tcp-log/consumer-for @@ -0,0 +1 @@ +ii-tcp diff --git a/s6/ii-tcp-log/run b/s6/ii-tcp-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/ii-tcp diff --git a/s6/ii-tcp-log/type b/s6/ii-tcp-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ii-tcp/run/env/HOST b/s6/ii-tcp-run/env/HOST diff --git a/s6/git-mirror/run/data/mirror b/s6/ii-tcp-run/env/NAME diff --git a/s6/ii-tcp/run/env/NICK b/s6/ii-tcp-run/env/NICK diff --git a/s6/ii-tcp/run/env/NAME b/s6/ii-tcp-run/env/PASS diff --git a/s6/ii-tcp/run/env/PORT b/s6/ii-tcp-run/env/PORT diff --git a/s6/ii-tcp/run/env/USER b/s6/ii-tcp-run/env/USER diff --git a/s6/ii-tcp/run/finish b/s6/ii-tcp-run/finish diff --git a/s6/ii-tcp-run/producer-for b/s6/ii-tcp-run/producer-for @@ -0,0 +1 @@ +ii-tcp-log diff --git a/s6/ii-tcp/run/run b/s6/ii-tcp-run/run diff --git a/s6/ii-tcp-run/type b/s6/ii-tcp-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ii-tcp/contents b/s6/ii-tcp/contents @@ -0,0 +1,2 @@ +ii-tcp-log +ii-tcp-run diff --git a/s6/ii-tcp/log/run b/s6/ii-tcp/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/ii-tcp/ diff --git a/s6/ii-tcp/type b/s6/ii-tcp/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ii-tls-log/consumer-for b/s6/ii-tls-log/consumer-for @@ -0,0 +1 @@ +ii-tls diff --git a/s6/ii-tls-log/run b/s6/ii-tls-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/ii-tls diff --git a/s6/ii-tls-log/type b/s6/ii-tls-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ii-tcp/run/env/PASS b/s6/ii-tls-run/data/.empty diff --git a/s6/ii-tls/run/env/CAFILE b/s6/ii-tls-run/env/CAFILE diff --git a/s6/ii-tls/run/env/HOST b/s6/ii-tls-run/env/HOST diff --git a/s6/ii-tls/run/data/.empty b/s6/ii-tls-run/env/NAME diff --git a/s6/ii-tls/run/env/NICK b/s6/ii-tls-run/env/NICK diff --git a/s6/ii-tls/run/env/NAME b/s6/ii-tls-run/env/PASS diff --git a/s6/ii-tls/run/env/PORT b/s6/ii-tls-run/env/PORT diff --git a/s6/ii-tls/run/env/USER b/s6/ii-tls-run/env/USER diff --git a/s6/ii-tls/run/finish b/s6/ii-tls-run/finish diff --git a/s6/ii-tls-run/producer-for b/s6/ii-tls-run/producer-for @@ -0,0 +1 @@ +ii-tls-log diff --git a/s6/ii-tls/run/run b/s6/ii-tls-run/run diff --git a/s6/ii-tls-run/type b/s6/ii-tls-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ii-tls/contents b/s6/ii-tls/contents @@ -0,0 +1,2 @@ +ii-tls-log +ii-tls-run diff --git a/s6/ii-tls/log/run b/s6/ii-tls/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/ii-tls/ diff --git a/s6/ii-tls/type b/s6/ii-tls/type @@ -0,0 +1 @@ +longrun diff --git a/s6/mpop-log/consumer-for b/s6/mpop-log/consumer-for @@ -0,0 +1 @@ +mpop diff --git a/s6/mpop-log/run b/s6/mpop-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/mpop diff --git a/s6/mpop-log/type b/s6/mpop-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/mpop/run/data/mpoprc b/s6/mpop-run/data/mpoprc diff --git a/s6/mpop/run/env/USER b/s6/mpop-run/env/USER diff --git a/s6/mpop-run/producer-for b/s6/mpop-run/producer-for @@ -0,0 +1 @@ +mpop-log diff --git a/s6/mpop/run/run b/s6/mpop-run/run diff --git a/s6/mpop-run/type b/s6/mpop-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/mpop/contents b/s6/mpop/contents @@ -0,0 +1,2 @@ +mpop-log +mpop-run diff --git a/s6/mpop/log/run b/s6/mpop/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/mpop/ diff --git a/s6/mpop/type b/s6/mpop/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ngircd-log/consumer-for b/s6/ngircd-log/consumer-for @@ -0,0 +1 @@ +ngircd diff --git a/s6/ngircd-log/run b/s6/ngircd-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/ngircd diff --git a/s6/ngircd-log/type b/s6/ngircd-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ngircd/run/data/conf b/s6/ngircd-run/data/conf diff --git a/s6/ngircd/run/data/motd b/s6/ngircd-run/data/motd diff --git a/s6/ngircd/run/data/tls b/s6/ngircd-run/data/tls diff --git a/s6/ngircd-run/producer-for b/s6/ngircd-run/producer-for @@ -0,0 +1 @@ +ngircd-log diff --git a/s6/ngircd/run/run b/s6/ngircd-run/run diff --git a/s6/ngircd-run/type b/s6/ngircd-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ngircd/contents b/s6/ngircd/contents @@ -0,0 +1,2 @@ +ngircd-log +ngircd-run diff --git a/s6/ngircd/log/run b/s6/ngircd/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/ngircd/ diff --git a/s6/ngircd/type b/s6/ngircd/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ntpclient-log/consumer-for b/s6/ntpclient-log/consumer-for @@ -0,0 +1 @@ +ntpclient diff --git a/s6/ntpclient-log/run b/s6/ntpclient-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/ntpclient diff --git a/s6/ntpclient-log/type b/s6/ntpclient-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ntpclient-run/env/HOST b/s6/ntpclient-run/env/HOST @@ -0,0 +1 @@ +pool.ntp.org diff --git a/s6/ntpclient-run/producer-for b/s6/ntpclient-run/producer-for @@ -0,0 +1 @@ +ntpclient-log diff --git a/s6/ntpclient-run/run b/s6/ntpclient-run/run @@ -0,0 +1,7 @@ +#!/local/bin/execlineb -P + +fdmove -c 2 1 +s6-envdir ./env/ +importas HOST HOST + +ntpclient -h $HOST diff --git a/s6/ntpclient-run/type b/s6/ntpclient-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ntpclient/contents b/s6/ntpclient/contents @@ -0,0 +1,2 @@ +ntpclient-log +ntpclient-run diff --git a/s6/ntpclient/log/run b/s6/ntpclient/log/run @@ -1,3 +0,0 @@ -#!/local/bin/execlineb -P - -s6-log /var/log/ntpclient diff --git a/s6/ntpclient/run/env/HOST b/s6/ntpclient/run/env/HOST @@ -1 +0,0 @@ -pool.ntp.org diff --git a/s6/ntpclient/run/run b/s6/ntpclient/run/run @@ -1,7 +0,0 @@ -#!/local/bin/execlineb -P - -fdmove -c 2 1 -s6-envdir ./env/ -importas HOST HOST - -ntpclient -h $HOST diff --git a/s6/ntpclient/type b/s6/ntpclient/type @@ -0,0 +1 @@ +longrun diff --git a/s6/opentracker-log/consumer-for b/s6/opentracker-log/consumer-for @@ -0,0 +1 @@ +opentracker diff --git a/s6/opentracker-log/run b/s6/opentracker-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/opentracker diff --git a/s6/opentracker-log/type b/s6/opentracker-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/opentracker-run/producer-for b/s6/opentracker-run/producer-for @@ -0,0 +1 @@ +opentracker-log diff --git a/s6/opentracker-run/run b/s6/opentracker-run/run @@ -0,0 +1,6 @@ +#!/local/bin/execlineb +# torrent tracker server + +fdmove -c 2 1 + +opentracker -d /home/tracker diff --git a/s6/opentracker-run/type b/s6/opentracker-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/opentracker/contents b/s6/opentracker/contents @@ -0,0 +1,2 @@ +opentracker-log +opentracker-run diff --git a/s6/opentracker/log/run b/s6/opentracker/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/opentracker/ diff --git a/s6/opentracker/run/run b/s6/opentracker/run/run @@ -1,6 +0,0 @@ -#!/local/bin/execlineb -# torrent tracker server - -fdmove -c 2 1 - -opentracker -d /home/tracker diff --git a/s6/opentracker/type b/s6/opentracker/type @@ -0,0 +1 @@ +longrun diff --git a/s6/plot-log/consumer-for b/s6/plot-log/consumer-for @@ -0,0 +1 @@ +plot diff --git a/s6/plot-log/run b/s6/plot-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/plot diff --git a/s6/plot-log/type b/s6/plot-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/plot-run/data/plot b/s6/plot-run/data/plot @@ -0,0 +1,62 @@ +#!/9/bin/rc -e + +fn csv_cat_tail { + lines=$1 + shift + sed 1q $1 + {for (file in $*) sed 1d $file} | tail -n $lines +} + +fn csv_join { + file=$1 + shift + + if (~ $#* 0) + exec cat $file + if not csv_join $* | tr ',' '\t' | + join -1 1 -2 1 <{tr ',' '\t' <$file} - | tr ' ' ',' +} + +fn csv_labels { + printf 'epoch' + printf ',%s' $* + printf '\n' + + sed 1d # because first line often contains data since boot time +} + +last=100 + +mkdir -p $SRV/img + +for (host in /var/collectd/*) { + cd $host + + if (test -d cpu) { + csv_join \ + <{csv_cat_tail $last cpu/percent-idle-*} \ + <{csv_cat_tail $last cpu/percent-nice-*} \ + <{csv_cat_tail $last cpu/percent-user-*} \ + <{csv_cat_tail $last cpu/percent-interrupt-*} \ + <{csv_cat_tail $last cpu/percent-system-*} | + csv_labels idle nice user interrupt system | + ploot -t CPU -u % green cyan yellow red orange | + ff2png >$img/cpu.png + } + + if (test -d load) { + csv_cat_tail $last load/load-relative-* | + ploot -t Load red yellow orange | + ff2png >$img/load.png + } + + if (test -d memory) { + csv_join \ + <{csv_cat_tail $last memory/percent-active-*} \ + <{csv_cat_tail $last memory/percent-inactive-*} \ + <{csv_cat_tail $last memory/percent-free-*} | + csv_labels active inactive free | + ploot -t Memory -u % red yellow green | + ff2png >$img/mem.png + } +} diff --git a/s6/plot-run/producer-for b/s6/plot-run/producer-for @@ -0,0 +1 @@ +plot-log diff --git a/s6/plot-run/run b/s6/plot-run/run @@ -0,0 +1,6 @@ +#!/local/bin/execlineb +# generate statistics with the plot tool + +fdmove -c 2 1 + +snooze -H * -M * -S * ./data/plot diff --git a/s6/plot-run/type b/s6/plot-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/plot/contents b/s6/plot/contents @@ -0,0 +1,2 @@ +plot-log +plot-run diff --git a/s6/plot/log/run b/s6/plot/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/plot/ diff --git a/s6/plot/run/data/plot b/s6/plot/run/data/plot @@ -1,62 +0,0 @@ -#!/9/bin/rc -e - -fn csv_cat_tail { - lines=$1 - shift - sed 1q $1 - {for (file in $*) sed 1d $file} | tail -n $lines -} - -fn csv_join { - file=$1 - shift - - if (~ $#* 0) - exec cat $file - if not csv_join $* | tr ',' '\t' | - join -1 1 -2 1 <{tr ',' '\t' <$file} - | tr ' ' ',' -} - -fn csv_labels { - printf 'epoch' - printf ',%s' $* - printf '\n' - - sed 1d # because first line often contains data since boot time -} - -last=100 - -mkdir -p $SRV/img - -for (host in /var/collectd/*) { - cd $host - - if (test -d cpu) { - csv_join \ - <{csv_cat_tail $last cpu/percent-idle-*} \ - <{csv_cat_tail $last cpu/percent-nice-*} \ - <{csv_cat_tail $last cpu/percent-user-*} \ - <{csv_cat_tail $last cpu/percent-interrupt-*} \ - <{csv_cat_tail $last cpu/percent-system-*} | - csv_labels idle nice user interrupt system | - ploot -t CPU -u % green cyan yellow red orange | - ff2png >$img/cpu.png - } - - if (test -d load) { - csv_cat_tail $last load/load-relative-* | - ploot -t Load red yellow orange | - ff2png >$img/load.png - } - - if (test -d memory) { - csv_join \ - <{csv_cat_tail $last memory/percent-active-*} \ - <{csv_cat_tail $last memory/percent-inactive-*} \ - <{csv_cat_tail $last memory/percent-free-*} | - csv_labels active inactive free | - ploot -t Memory -u % red yellow green | - ff2png >$img/mem.png - } -} diff --git a/s6/plot/run/run b/s6/plot/run/run @@ -1,6 +0,0 @@ -#!/local/bin/execlineb -# generate statistics with the plot tool - -fdmove -c 2 1 - -snooze -H * -M * -S * ./data/plot diff --git a/s6/plot/type b/s6/plot/type @@ -0,0 +1 @@ +longrun diff --git a/s6/qemu-tap-log/consumer-for b/s6/qemu-tap-log/consumer-for @@ -0,0 +1 @@ +qemu-tap diff --git a/s6/qemu-tap-log/run b/s6/qemu-tap-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/qemu-tap diff --git a/s6/qemu-tap-log/type b/s6/qemu-tap-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/qemu-tap-run/producer-for b/s6/qemu-tap-run/producer-for @@ -0,0 +1 @@ +qemu-tap-log diff --git a/s6/qemu-tap-run/run b/s6/qemu-tap-run/run @@ -0,0 +1,23 @@ +#!/local/bin/execlineb +# qemu without networking services, using a tap ethernet device + +# The virtual machine main interface (nic,vlan=0) is communicating +# through a tap device (tap,vlan=0) in the host that is not connected to +# 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 + -m 333M + -netdev tap,id=nd0,ifname=tap0,script=no,downscript=no + -device virtio-net,netdev=nd0,mac=52:54:00:00:00:00 + /var/iso/$name.iso + +# -display none +# -display curses +# -display vnc=0.0.0.0:0 diff --git a/s6/qemu-tap-run/type b/s6/qemu-tap-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/qemu-tap/contents b/s6/qemu-tap/contents @@ -0,0 +1,2 @@ +qemu-tap-log +qemu-tap-run diff --git a/s6/qemu-tap/log/run b/s6/qemu-tap/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/qemu-tap/ diff --git a/s6/qemu-tap/run/run b/s6/qemu-tap/run/run @@ -1,23 +0,0 @@ -#!/local/bin/execlineb -# qemu without networking services, using a tap ethernet device - -# The virtual machine main interface (nic,vlan=0) is communicating -# through a tap device (tap,vlan=0) in the host that is not connected to -# 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 - -m 333M - -netdev tap,id=nd0,ifname=tap0,script=no,downscript=no - -device virtio-net,netdev=nd0,mac=52:54:00:00:00:00 - /var/iso/$name.iso - -# -display none -# -display curses -# -display vnc=0.0.0.0:0 diff --git a/s6/qemu-tap/type b/s6/qemu-tap/type @@ -0,0 +1 @@ +longrun diff --git a/s6/qemu-user-log/consumer-for b/s6/qemu-user-log/consumer-for @@ -0,0 +1 @@ +qemu-user diff --git a/s6/qemu-user-log/run b/s6/qemu-user-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/qemu-user diff --git a/s6/qemu-user-log/type b/s6/qemu-user-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ii-tls/run/env/PASS b/s6/qemu-user-run/env/NAME diff --git a/s6/qemu-user-run/producer-for b/s6/qemu-user-run/producer-for @@ -0,0 +1 @@ +qemu-user-log diff --git a/s6/qemu-user-run/run b/s6/qemu-user-run/run @@ -0,0 +1,21 @@ +#!/local/bin/execlineb +# 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 + -netdev user,id=nd0,hostfwd=tcp::10000-:22 + -device e1000,netdev=nd0 + -display none + /var/iso/$NAME.iso + +# -display curses +# -display vnc=0.0.0.0:0 diff --git a/s6/qemu-user-run/type b/s6/qemu-user-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/qemu-user/contents b/s6/qemu-user/contents @@ -0,0 +1,2 @@ +qemu-user-log +qemu-user-run diff --git a/s6/qemu-user/log/run b/s6/qemu-user/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/qemu-user/ diff --git a/s6/qemu-user/run/env/NAME b/s6/qemu-user/run/env/NAME diff --git a/s6/qemu-user/run/run b/s6/qemu-user/run/run @@ -1,21 +0,0 @@ -#!/local/bin/execlineb -# 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 - -netdev user,id=nd0,hostfwd=tcp::10000-:22 - -device e1000,netdev=nd0 - -display none - /var/iso/$NAME.iso - -# -display curses -# -display vnc=0.0.0.0:0 diff --git a/s6/qemu-user/type b/s6/qemu-user/type @@ -0,0 +1 @@ +longrun diff --git a/s6/qmail-pop3d-log/consumer-for b/s6/qmail-pop3d-log/consumer-for @@ -0,0 +1 @@ +qmail-pop3d diff --git a/s6/qmail-pop3d-log/run b/s6/qmail-pop3d-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/qmail-pop3d diff --git a/s6/qmail-pop3d-log/type b/s6/qmail-pop3d-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/qmail-pop3d-run/producer-for b/s6/qmail-pop3d-run/producer-for @@ -0,0 +1 @@ +qmail-pop3d-log diff --git a/s6/qmail-pop3d-run/qmail-pop3d-log/run b/s6/qmail-pop3d-run/qmail-pop3d-log/run @@ -0,0 +1,2 @@ +#!/local/bin/execlineb -P +s6-log T /var/log/qmail-pop3d/ diff --git a/s6/qmail-pop3d-run/qmail-pop3d/env/CERTFILE b/s6/qmail-pop3d-run/qmail-pop3d/env/CERTFILE @@ -0,0 +1 @@ +/var/s6/snooze-tls-cert/data/pem diff --git a/s6/geomyidae/run/env/HOST b/s6/qmail-pop3d-run/qmail-pop3d/env/HOST diff --git a/s6/qmail-pop3d-run/qmail-pop3d/env/KEYFILE b/s6/qmail-pop3d-run/qmail-pop3d/env/KEYFILE @@ -0,0 +1 @@ +/var/s6/snooze-tls-cert/data/key diff --git a/s6/qmail-pop3d-run/qmail-pop3d/env/MAILDIR b/s6/qmail-pop3d-run/qmail-pop3d/env/MAILDIR @@ -0,0 +1 @@ +./mail/INBOX/ diff --git a/s6/qmail-pop3d-run/qmail-pop3d/run b/s6/qmail-pop3d-run/qmail-pop3d/run @@ -0,0 +1,12 @@ +#!/local/bin/execlineb -P +# qmail pop3 daemon + +fdmove -c 2 1 +s6-envdir ./env/ +multisubstitute { + importas HOST HOST + importas MAILDIR MAILDIR +} + +s6-tlsserver 0.0.0.0 995 +qmail-popup $HOST checkpassword qmail-pop3d $MAILDIR diff --git a/s6/qmail-pop3d-run/type b/s6/qmail-pop3d-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/qmail-send-log/consumer-for b/s6/qmail-send-log/consumer-for @@ -0,0 +1 @@ +qmail-send diff --git a/s6/qmail-send-log/run b/s6/qmail-send-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/qmail-send diff --git a/s6/qmail-send-log/type b/s6/qmail-send-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/qmail-send-run/data/alias/.qmail-mail b/s6/qmail-send-run/data/alias/.qmail-mail @@ -0,0 +1 @@ +&josuah diff --git a/s6/qmail-send-run/data/control/defaultdelivery b/s6/qmail-send-run/data/control/defaultdelivery @@ -0,0 +1 @@ +./mail/INBOX/ diff --git a/s6/geomyidae/run/env/HOST b/s6/qmail-send-run/data/control/defaultdomain diff --git a/s6/geomyidae/run/env/HOST b/s6/qmail-send-run/data/control/locals diff --git a/s6/geomyidae/run/env/HOST b/s6/qmail-send-run/data/control/me diff --git a/s6/geomyidae/run/env/HOST b/s6/qmail-send-run/data/control/plusdomain diff --git a/s6/geomyidae/run/env/HOST b/s6/qmail-send-run/data/control/rcpthosts diff --git a/s6/qmail-send-run/env/MAILDIR b/s6/qmail-send-run/env/MAILDIR @@ -0,0 +1 @@ +./mail/INBOX/ diff --git a/s6/qmail-send-run/producer-for b/s6/qmail-send-run/producer-for @@ -0,0 +1 @@ +qmail-send-log diff --git a/s6/qmail-send-run/run b/s6/qmail-send-run/run @@ -0,0 +1,8 @@ +#!/local/bin/execlineb +# start watching qmail dir for queued messages + +fdmove -c 2 1 +s6-envdir ./env/ +importas MAILDIR MAILDIR + +qmail-start $MAILDIR diff --git a/s6/qmail-send-run/type b/s6/qmail-send-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/qmail-smtpd-log/consumer-for b/s6/qmail-smtpd-log/consumer-for @@ -0,0 +1 @@ +qmail-smtpd diff --git a/s6/qmail-smtpd-log/run b/s6/qmail-smtpd-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/qmail-smtpd diff --git a/s6/qmail-smtpd-log/type b/s6/qmail-smtpd-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/qmail-smtpd-run/producer-for b/s6/qmail-smtpd-run/producer-for @@ -0,0 +1 @@ +qmail-smtpd-log diff --git a/s6/qmail-smtpd-run/qmail-smtpd-log/run b/s6/qmail-smtpd-run/qmail-smtpd-log/run @@ -0,0 +1,2 @@ +#!/local/bin/execlineb -P +s6-log T /var/log/qmail-smtpd/ diff --git a/s6/qmail-smtpd-run/qmail-smtpd/run b/s6/qmail-smtpd-run/qmail-smtpd/run @@ -0,0 +1,20 @@ +#!/local/bin/execlineb +# qmail smtp daemon + +fdmove -c 2 1 + +foreground { if { test ! -d ./data/key/ } + if { mkdir -p ./data/key/ } + cd ./data/key/ + if { openssl req -x509 -newkey rsa:4096 -days 365 -keyout key -out pem } + if { openssl dhparam -out dhp 4096 } +} +if { chmod -R 500 ./data/key/ } +if { chmod 400 ./data/key/key ./data/key/pem ./data/key/dhp } + +s6-envdir ./env/ + +s6-envuidgid qmaild + +s6-tcpserver -U 0.0.0.0 25 +qmail-smtpd diff --git a/s6/ngircd/run/data/tls b/s6/qmail-smtpd-run/qmail-smtpd/tls diff --git a/s6/qmail-smtpd-run/type b/s6/qmail-smtpd-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/qmail/contents b/s6/qmail/contents @@ -0,0 +1,3 @@ +qmail-log +qmail-send +qmail-smtpd diff --git a/s6/qmail/log/run b/s6/qmail/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/qmail-send/ diff --git a/s6/qmail/pop3d/qmail-pop3d-log/run b/s6/qmail/pop3d/qmail-pop3d-log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/qmail-pop3d/ diff --git a/s6/qmail/pop3d/qmail-pop3d/env/CERTFILE b/s6/qmail/pop3d/qmail-pop3d/env/CERTFILE @@ -1 +0,0 @@ -/var/s6/snooze-tls-cert/data/pem diff --git a/s6/qmail/pop3d/qmail-pop3d/env/HOST b/s6/qmail/pop3d/qmail-pop3d/env/HOST @@ -1 +0,0 @@ -josuah.net diff --git a/s6/qmail/pop3d/qmail-pop3d/env/KEYFILE b/s6/qmail/pop3d/qmail-pop3d/env/KEYFILE @@ -1 +0,0 @@ -/var/s6/snooze-tls-cert/data/key diff --git a/s6/qmail/pop3d/qmail-pop3d/env/MAILDIR b/s6/qmail/pop3d/qmail-pop3d/env/MAILDIR @@ -1 +0,0 @@ -./mail/INBOX/ diff --git a/s6/qmail/pop3d/qmail-pop3d/run b/s6/qmail/pop3d/qmail-pop3d/run @@ -1,12 +0,0 @@ -#!/local/bin/execlineb -P -# qmail pop3 daemon - -fdmove -c 2 1 -s6-envdir ./env/ -multisubstitute { - importas HOST HOST - importas MAILDIR MAILDIR -} - -s6-tlsserver 0.0.0.0 995 -qmail-popup $HOST checkpassword qmail-pop3d $MAILDIR diff --git a/s6/qmail/send/data/alias/.qmail-mail b/s6/qmail/send/data/alias/.qmail-mail @@ -1 +0,0 @@ -&josuah diff --git a/s6/qmail/send/data/control/defaultdelivery b/s6/qmail/send/data/control/defaultdelivery @@ -1 +0,0 @@ -./mail/INBOX/ diff --git a/s6/qmail/send/data/control/defaultdomain b/s6/qmail/send/data/control/defaultdomain @@ -1 +0,0 @@ -josuah.net diff --git a/s6/qmail/send/data/control/locals b/s6/qmail/send/data/control/locals @@ -1 +0,0 @@ -josuah.net diff --git a/s6/qmail/send/data/control/me b/s6/qmail/send/data/control/me @@ -1 +0,0 @@ -josuah.net diff --git a/s6/qmail/send/data/control/plusdomain b/s6/qmail/send/data/control/plusdomain @@ -1 +0,0 @@ -josuah.net diff --git a/s6/qmail/send/data/control/rcpthosts b/s6/qmail/send/data/control/rcpthosts @@ -1 +0,0 @@ -josuah.net diff --git a/s6/qmail/send/env/MAILDIR b/s6/qmail/send/env/MAILDIR @@ -1 +0,0 @@ -./mail/INBOX/ diff --git a/s6/qmail/send/run b/s6/qmail/send/run @@ -1,8 +0,0 @@ -#!/local/bin/execlineb -# start watching qmail dir for queued messages - -fdmove -c 2 1 -s6-envdir ./env/ -importas MAILDIR MAILDIR - -qmail-start $MAILDIR diff --git a/s6/qmail/smtpd/qmail-smtpd-log/run b/s6/qmail/smtpd/qmail-smtpd-log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/qmail-smtpd/ diff --git a/s6/qmail/smtpd/qmail-smtpd/run b/s6/qmail/smtpd/qmail-smtpd/run @@ -1,20 +0,0 @@ -#!/local/bin/execlineb -# qmail smtp daemon - -fdmove -c 2 1 - -foreground { if { test ! -d ./data/key/ } - if { mkdir -p ./data/key/ } - cd ./data/key/ - if { openssl req -x509 -newkey rsa:4096 -days 365 -keyout key -out pem } - if { openssl dhparam -out dhp 4096 } -} -if { chmod -R 500 ./data/key/ } -if { chmod 400 ./data/key/key ./data/key/pem ./data/key/dhp } - -s6-envdir ./env/ - -s6-envuidgid qmaild - -s6-tcpserver -U 0.0.0.0 25 -qmail-smtpd diff --git a/s6/qmail/smtpd/qmail-smtpd/tls b/s6/qmail/smtpd/qmail-smtpd/tls @@ -1,8 +0,0 @@ -#!/bin/sh -e - -openssl req -x509 -newkey rsa:4096 -days 365 -keyout key -out pem -chmod 400 key -chmod 444 pem - -openssl dhparam -out dhp 4096 -chmod 444 dhp diff --git a/s6/qmail/type b/s6/qmail/type @@ -0,0 +1 @@ +longrun diff --git a/s6/quark-log/consumer-for b/s6/quark-log/consumer-for @@ -0,0 +1 @@ +quark diff --git a/s6/quark-log/run b/s6/quark-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/quark diff --git a/s6/quark-log/type b/s6/quark-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/quark-run/producer-for b/s6/quark-run/producer-for @@ -0,0 +1 @@ +quark-log diff --git a/s6/quark-run/run b/s6/quark-run/run @@ -0,0 +1,14 @@ +#!/local/bin/execlineb +# static http server + +fdmove -c 2 1 + +quark -l + -u srv + -h 0.0.0.0 + -p 80 + -d /var/www + -v "josuah.net josuah.net$ josuah.net" + -v "josuah.cyb josuah.cyb$ josuah.net" + -v "cyberia.systems cyberia.systems$ cyberia.systems" + -v "www.atelier-fu.fr atelier-fu.fr$ atelier-fu.fr" diff --git a/s6/quark-run/type b/s6/quark-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/quark-tor-log/consumer-for b/s6/quark-tor-log/consumer-for @@ -0,0 +1 @@ +quark-tor diff --git a/s6/quark-tor-log/run b/s6/quark-tor-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/quark-tor diff --git a/s6/quark-tor-log/type b/s6/quark-tor-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/quark-tor-run/producer-for b/s6/quark-tor-run/producer-for @@ -0,0 +1 @@ +quark-tor-log diff --git a/s6/quark-tor-run/run b/s6/quark-tor-run/run @@ -0,0 +1,17 @@ +#!/local/bin/execlineb +# static http server + +fdmove -c 2 1 + +backtick tor { homeof tor } +importas tor tor + +backtick host { cat $tor/http/hostname } +importas host host + +quark -l + -u srv + -h 0.0.0.0 + -p 80 + -d /home/srv + -v $host" "$host"$ cyberia.systems" diff --git a/s6/quark-tor-run/type b/s6/quark-tor-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/quark-tor/contents b/s6/quark-tor/contents @@ -0,0 +1,2 @@ +quark-tor-log +quark-tor-run diff --git a/s6/quark-tor/log/run b/s6/quark-tor/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/quark-tor/ diff --git a/s6/quark-tor/run/run b/s6/quark-tor/run/run @@ -1,17 +0,0 @@ -#!/local/bin/execlineb -# static http server - -fdmove -c 2 1 - -backtick tor { homeof tor } -importas tor tor - -backtick host { cat $tor/http/hostname } -importas host host - -quark -l - -u srv - -h 0.0.0.0 - -p 80 - -d /home/srv - -v $host" "$host"$ cyberia.systems" diff --git a/s6/quark-tor/type b/s6/quark-tor/type @@ -0,0 +1 @@ +longrun diff --git a/s6/quark/contents b/s6/quark/contents @@ -0,0 +1,2 @@ +quark-log +quark-run diff --git a/s6/quark/log/run b/s6/quark/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/quark/ diff --git a/s6/quark/run/run b/s6/quark/run/run @@ -1,14 +0,0 @@ -#!/local/bin/execlineb -# static http server - -fdmove -c 2 1 - -quark -l - -u srv - -h 0.0.0.0 - -p 80 - -d /var/www - -v "josuah.net josuah.net$ josuah.net" - -v "josuah.cyb josuah.cyb$ josuah.net" - -v "cyberia.systems cyberia.systems$ cyberia.systems" - -v "www.atelier-fu.fr atelier-fu.fr$ atelier-fu.fr" diff --git a/s6/quark/type b/s6/quark/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ratox-log/consumer-for b/s6/ratox-log/consumer-for @@ -0,0 +1 @@ +ratox diff --git a/s6/ratox-log/run b/s6/ratox-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/ratox diff --git a/s6/ratox-log/type b/s6/ratox-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ratox-run/producer-for b/s6/ratox-run/producer-for @@ -0,0 +1 @@ +ratox-log diff --git a/s6/ratox-run/run b/s6/ratox-run/run @@ -0,0 +1,11 @@ +#!/local/bin/execlineb +# tox protocol client communicating through the filesystem + +fdmove -c 2 1 + +define dir /home/tox + +mkdir -p $dir +cd $dir + +exec ratox diff --git a/s6/ratox-run/type b/s6/ratox-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ratox/contents b/s6/ratox/contents @@ -0,0 +1,2 @@ +ratox-log +ratox-run diff --git a/s6/ratox/log/run b/s6/ratox/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/ratox/ diff --git a/s6/ratox/run/run b/s6/ratox/run/run @@ -1,11 +0,0 @@ -#!/local/bin/execlineb -# tox protocol client communicating through the filesystem - -fdmove -c 2 1 - -define dir /home/tox - -mkdir -p $dir -cd $dir - -exec ratox diff --git a/s6/ratox/type b/s6/ratox/type @@ -0,0 +1 @@ +longrun diff --git a/s6/s6 b/s6/s6 @@ -0,0 +1 @@ +/root/conf/s6+ \ No newline at end of file diff --git a/s6/snooze-acme-client-log/consumer-for b/s6/snooze-acme-client-log/consumer-for @@ -0,0 +1 @@ +snooze-acme-client diff --git a/s6/snooze-acme-client-log/run b/s6/snooze-acme-client-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/snooze-acme-client diff --git a/s6/snooze-acme-client-log/type b/s6/snooze-acme-client-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/snooze-acme-client-run/data/conf b/s6/snooze-acme-client-run/data/conf @@ -0,0 +1,17 @@ +authority letsencrypt { + api url "https://acme-v01.api.letsencrypt.org/directory" + account key "/etc/acme/letsencrypt-privkey.pem" +} + +authority letsencrypt-staging { + api url "https://acme-staging.api.letsencrypt.org/directory" + account key "/etc/acme/letsencrypt-staging-privkey.pem" +} + +domain josuah.net { + alternative names { mail.josuah.net } + domain key "data/ssl/josuah.net.key" + domain certificate "data/ssl/josuah.net.crt" + domain full chain certificate "data/ssl/josuah.net.pem" + sign with letsencrypt +} diff --git a/s6/snooze-acme-client-run/producer-for b/s6/snooze-acme-client-run/producer-for @@ -0,0 +1 @@ +snooze-acme-client-log diff --git a/s6/snooze-acme-client-run/run b/s6/snooze-acme-client-run/run @@ -0,0 +1,4 @@ +#!/local/bin/execlineb -P + +if { mkdir -p /etc/acme /etc/ssl/acme/private /var/www/acme } +acme-client -vAD -f data/conf josuah.net diff --git a/s6/snooze-acme-client-run/type b/s6/snooze-acme-client-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/snooze-acme-client/contents b/s6/snooze-acme-client/contents @@ -0,0 +1,2 @@ +snooze-acme-client-log +snooze-acme-client-run diff --git a/s6/snooze-acme-client/log/run b/s6/snooze-acme-client/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/snooze-acme-client diff --git a/s6/snooze-acme-client/run/data/conf b/s6/snooze-acme-client/run/data/conf @@ -1,17 +0,0 @@ -authority letsencrypt { - api url "https://acme-v01.api.letsencrypt.org/directory" - account key "/etc/acme/letsencrypt-privkey.pem" -} - -authority letsencrypt-staging { - api url "https://acme-staging.api.letsencrypt.org/directory" - account key "/etc/acme/letsencrypt-staging-privkey.pem" -} - -domain josuah.net { - alternative names { mail.josuah.net } - domain key "data/ssl/josuah.net.key" - domain certificate "data/ssl/josuah.net.crt" - domain full chain certificate "data/ssl/josuah.net.pem" - sign with letsencrypt -} diff --git a/s6/snooze-acme-client/run/run b/s6/snooze-acme-client/run/run @@ -1,4 +0,0 @@ -#!/local/bin/execlineb -P - -if { mkdir -p /etc/acme /etc/ssl/acme/private /var/www/acme } -acme-client -vAD -f data/conf josuah.net diff --git a/s6/snooze-acme-client/type b/s6/snooze-acme-client/type @@ -0,0 +1 @@ +longrun diff --git a/s6/snooze-tls-cert-log/consumer-for b/s6/snooze-tls-cert-log/consumer-for @@ -0,0 +1 @@ +snooze-tls-cert diff --git a/s6/snooze-tls-cert-log/run b/s6/snooze-tls-cert-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/snooze-tls-cert diff --git a/s6/snooze-tls-cert-log/type b/s6/snooze-tls-cert-log/type @@ -0,0 +1 @@ +longrun diff --git a/pack/supervise/death_tally b/s6/snooze-tls-cert-run/data/... diff --git a/s6/geomyidae/run/env/HOST b/s6/snooze-tls-cert-run/env/HOST diff --git a/s6/snooze-tls-cert-run/producer-for b/s6/snooze-tls-cert-run/producer-for @@ -0,0 +1 @@ +snooze-tls-cert-log diff --git a/s6/snooze-tls-cert-run/run b/s6/snooze-tls-cert-run/run @@ -0,0 +1,17 @@ +#!/local/bin/execlineb -P + +fdmove -c 2 1 +s6-envdir ./env/ +importas HOST HOST + +snooze -d 1 +if { chmod 400 data } +openssl req + -new + -newkey rsa + -days 365 + -nodes + -x509 + -subj /CN=josuah.net + -keyout data/key + -out data/pem diff --git a/s6/snooze-tls-cert-run/type b/s6/snooze-tls-cert-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/snooze-tls-cert/contents b/s6/snooze-tls-cert/contents @@ -0,0 +1,2 @@ +snooze-tls-cert-log +snooze-tls-cert-run diff --git a/s6/snooze-tls-cert/log/run b/s6/snooze-tls-cert/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/snooze-tls-cert/ diff --git a/s6/snooze-tls-cert/run/data/... b/s6/snooze-tls-cert/run/data/... diff --git a/s6/snooze-tls-cert/run/env/HOST b/s6/snooze-tls-cert/run/env/HOST @@ -1 +0,0 @@ -josuah.net diff --git a/s6/snooze-tls-cert/run/run b/s6/snooze-tls-cert/run/run @@ -1,17 +0,0 @@ -#!/local/bin/execlineb -P - -fdmove -c 2 1 -s6-envdir ./env/ -importas HOST HOST - -snooze -d 1 -if { chmod 400 data } -openssl req - -new - -newkey rsa - -days 365 - -nodes - -x509 - -subj /CN=josuah.net - -keyout data/key - -out data/pem diff --git a/s6/snooze-tls-cert/type b/s6/snooze-tls-cert/type @@ -0,0 +1 @@ +longrun diff --git a/s6/snooze-tls-dhparam-log/consumer-for b/s6/snooze-tls-dhparam-log/consumer-for @@ -0,0 +1 @@ +snooze-tls-dhparam diff --git a/s6/snooze-tls-dhparam-log/run b/s6/snooze-tls-dhparam-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/snooze-tls-dhparam diff --git a/s6/snooze-tls-dhparam-log/type b/s6/snooze-tls-dhparam-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/snooze-tls-dhparam-run/producer-for b/s6/snooze-tls-dhparam-run/producer-for @@ -0,0 +1 @@ +snooze-tls-dhparam-log diff --git a/s6/snooze-tls-dhparam-run/run b/s6/snooze-tls-dhparam-run/run @@ -0,0 +1,6 @@ +#!/local/bin/execlineb -P + +movefd -c 2 1 + +snooze -m /3 -d 1 +openssl dhparam -out ./data/dhp 4096 diff --git a/s6/snooze-tls-dhparam-run/type b/s6/snooze-tls-dhparam-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/snooze-tls-dhparam/contents b/s6/snooze-tls-dhparam/contents @@ -0,0 +1,2 @@ +snooze-tls-dhparam-log +snooze-tls-dhparam-run diff --git a/s6/snooze-tls-dhparam/log/run b/s6/snooze-tls-dhparam/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/snooze-tls-dhparam/ diff --git a/s6/snooze-tls-dhparam/run/run b/s6/snooze-tls-dhparam/run/run @@ -1,6 +0,0 @@ -#!/local/bin/execlineb -P - -movefd -c 2 1 - -snooze -m /3 -d 1 -openssl dhparam -out ./data/dhp 4096 diff --git a/s6/snooze-tls-dhparam/type b/s6/snooze-tls-dhparam/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ssh-fwd-log/consumer-for b/s6/ssh-fwd-log/consumer-for @@ -0,0 +1 @@ +ssh-fwd diff --git a/s6/ssh-fwd-log/run b/s6/ssh-fwd-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/ssh-fwd diff --git a/s6/ssh-fwd-log/type b/s6/ssh-fwd-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ssh-fwd-run/producer-for b/s6/ssh-fwd-run/producer-for @@ -0,0 +1 @@ +ssh-fwd-log diff --git a/s6/ssh-fwd-run/run b/s6/ssh-fwd-run/run @@ -0,0 +1,15 @@ +#!/local/bin/execlineb +# ssh tunnelling + +fdmove -c 2 1 + +s6-envdir ./env/ +multisubstitute { + importas PORT_LOCAL PORT_LOCAL + importas PORT_REMOTE PORT_REMOTE + importas HOST HOST + importas USER USER +} + +ssh -L ${PORT_LOCAL}:${HOST}:${PORT_REMOTE} + -n ${USER}@${HOST} diff --git a/s6/ssh-fwd-run/type b/s6/ssh-fwd-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/ssh-fwd/contents b/s6/ssh-fwd/contents @@ -0,0 +1,2 @@ +ssh-fwd-log +ssh-fwd-run diff --git a/s6/ssh-fwd/log/run b/s6/ssh-fwd/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/ssh-fwd/ diff --git a/s6/ssh-fwd/run/run b/s6/ssh-fwd/run/run @@ -1,15 +0,0 @@ -#!/local/bin/execlineb -# ssh tunnelling - -fdmove -c 2 1 - -s6-envdir ./env/ -multisubstitute { - importas PORT_LOCAL PORT_LOCAL - importas PORT_REMOTE PORT_REMOTE - importas HOST HOST - importas USER USER -} - -ssh -L ${PORT_LOCAL}:${HOST}:${PORT_REMOTE} - -n ${USER}@${HOST} diff --git a/s6/ssh-fwd/type b/s6/ssh-fwd/type @@ -0,0 +1 @@ +longrun diff --git a/s6/tinc-log/consumer-for b/s6/tinc-log/consumer-for @@ -0,0 +1 @@ +tinc diff --git a/s6/tinc-log/run b/s6/tinc-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/tinc diff --git a/s6/tinc-log/type b/s6/tinc-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/tinc-run/data/conf.d/common.conf b/s6/tinc-run/data/conf.d/common.conf @@ -0,0 +1,2 @@ +DeviceStandby = no +PingTimeout = 15 diff --git a/s6/tinc-run/data/hosts/kroa b/s6/tinc-run/data/hosts/kroa @@ -0,0 +1,13 @@ +Address = kroa.josuah.net +Subnet = 172.16.55.5 +Port = 6655 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAmnT1YEcPTOiaa/GfWsFF1p3Qo/xeIjIb6e/cG62nKcjJSS+L3G+P +VUFOT7YfRdggzWDAMvxdAq5+DFcg2v3iDm8yTcv8ITaSKHFp4Tarkl2zEs5VELVY +mcPrYI99oyo9xiXh+x1G9/wp+uKxgoeU4m0+iNwyZw7ypoIgJhx8TfT7rgaXmyNX +HDBu/hBH7orTF3TMRp/VrWqD8UQyD0tK1gGQe4WIQJqouPxd44O8tKRgtha69q42 +kZ92DuFHLjTkYFjt4WKGEUAdja+aqbk5QeNyoOHtw9VkTIJcWShwPTYj0Ykdm/BS +oyBpV8pID+xWz81lpMilfanlPjgmzc6UvQIDAQAB +-----END RSA PUBLIC KEY----- +Ed25519PublicKey = UzE1NtmdKv3MWpslesWIT4/AB3a8WZX+AP/2suMRUnK diff --git a/s6/tinc-run/data/hosts/nas b/s6/tinc-run/data/hosts/nas @@ -0,0 +1,13 @@ +Address = nas.josuah.net +Subnet = 172.16.55.2 +Port = 655 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAxFl/zn8owPVa0EBaazQaUck0ImV3+VS9+jOs0tePcQxuYHtX94dm +ZlYADJP/TaN8IEezQcgm2+iyavoOEBTCKhQ7/mYqG6UI2bcZjtu5UFl37YUJEYHN +dhvrhJwoYOWTFSu/d+UT/k8tFxoW308AXxqmb85egSBg8zaekrS7ibBSMi+AVaAz +g/Me+qgWh2j6jGh55Av1JeJ+1trlRLIvMRDwPe0U4hRjEZ/nBXFQS67AW1qg2tSF +3ieQgIr12FyZMw3ieWKiUW3JShdYRRMnV8hfKsn98R8LOirXBY2nCqRkWvKjYyY6 +bN2MzG57jdprYDR4ljglDFaXsNCDFgWTXwIDAQAB +-----END RSA PUBLIC KEY----- +Ed25519PublicKey = QbVvGg+CgFHyzWzbmG4hpY7Kus3kMZean2Vj52v2roN diff --git a/s6/tinc-run/data/hosts/pdmg b/s6/tinc-run/data/hosts/pdmg @@ -0,0 +1,12 @@ +Subnet = 172.16.55.4 +Port = 655 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAxnCPtS3uHC8ZwZCDDPpDZWfuQF2PP1GdqHAF7pmk1mXCfapSVU/I +5gVP7scrbSKhNXpeQvgfRk7BQ+O1TpvhYDJRR6/xlACbaWeoFIQLbBMik10Dvw7k +Zrt/cnF8WTdEgQ52GIhwJhc/ZoBQHLfoAPZrD3lyTG4PQb/VyouQVJq8JgthHgIi +u3jz3meiB292rz9kg+wafl7YVsvWQZMK3CAHWjKLOaSNFYM6zkZU42v5d2mkC1aT +JowYMn0GRTKL4IC2WkzAt1JNK5Hd8YexdKBfqmobZI+SevlPYVkZLM7jmcTR7836 +bdBZF/tZpvRUY7eHSwVni576SwO+zakt3wIDAQAB +-----END RSA PUBLIC KEY----- +Ed25519PublicKey = 5ooarAS0cWAxPQ6q2wn/1ZvhLYuz6ZRSJGZFFMMeZBF diff --git a/s6/tinc-run/data/hosts/rpi b/s6/tinc-run/data/hosts/rpi @@ -0,0 +1,13 @@ +Address = rpi.josuah.net +Subnet = 172.16.55.3 +Port = 655 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA35oN9yPu+lF7ZmphYandl896xjKYnNjIn5UB4gGvfbBEEA3kKYev +6Z4ApOvw2AgQ3WVbAynG3KbNj5jsCBBG8M9PfSPeFn4jpjycDqORi3sW6z3MQHfZ +u61jif16QtuuwXtrTiWO+MEVmSsCH9Vxtq5L6qJHZA7pEkQMxu/aEjOpYdpwZb/M +AnO7TU+PzTjUte40sfrIczHHkpDh8CdS1mKseF1XcNBhUANB7F6hQwhwD96GdGer +ioqMpltyyXMz4oZvhV+LD/jVOUXD1FZjiqO5TNtCFXYDLF/gxq/vmQ84eDo/I3Mo +E7wbHst5mOSRLBUP9cCAys/r6+JAdg+LfwIDAQAB +-----END RSA PUBLIC KEY----- +Ed25519PublicKey = Zsy56fH9Hbd/qiRWRy/7YEKv4eQUPI1o+3iXs8lHN1N diff --git a/s6/tinc-run/data/hosts/t470s b/s6/tinc-run/data/hosts/t470s @@ -0,0 +1,12 @@ +Subnet = 172.16.55.1 + +Port = 12196 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAs99vlkaTp2BWltxN5KiBMkH/fHV1O3DWARK6ojFlhgENdmGjDxxk +0rshmaAvSjZ3uU2z+QkUIpovqEZf5I5abrAu1yKyMTIMFwqasa5D3TSkcePf+dD7 +LIr/YBWPl6kxHrNd2s3qPXBoYNaTBX7CCdXla7Rlz1/EnkMCfSLLd6YQsaCR4MsE +dwgR17bu5MsvB9YNLvbkqHHZCwvwIHrvX8dxvCr1BZwHAt/SDwg0nnTD2YNBUUl+ +SsXzMNfKiEjqmfHGfzMmP9Q9yjM6W5YAr+/Y7OPb/LnsPbYNC1L5YqaKskM431JU +vcpAPqjRJTvo+ji4hKrKdRal6tE61ZUW4wIDAQAB +-----END RSA PUBLIC KEY----- +Ed25519PublicKey = Wnd7bglt6wxqz/QJT1KH9wajs2LUUnMTHTDSU7/SsQM diff --git a/s6/tinc-run/data/tinc-up b/s6/tinc-run/data/tinc-up @@ -0,0 +1,11 @@ +#!/bin/sh -ex + +case $(uname) in +(*BSD) + ifconfig "$INTERFACE" "$(tinc -c . get subnet)" netmask 255.255.255.0 + ;; +(Linux) + ip link set "$INTERFACE" up + ip addr add "$(tinc -c . get subnet | sed q)/24" dev "$INTERFACE" + ;; +esac diff --git a/s6/tinc-run/producer-for b/s6/tinc-run/producer-for @@ -0,0 +1 @@ +tinc-log diff --git a/s6/tinc-run/run b/s6/tinc-run/run @@ -0,0 +1,9 @@ +#!/local/bin/execlineb +# vpn focused on mesh networking + +fdmove -c 2 1 + +tincd -D + -d 5 + --config=./data + --pidfile=./data/pid diff --git a/s6/tinc-run/type b/s6/tinc-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/tinc/contents b/s6/tinc/contents @@ -0,0 +1,2 @@ +tinc-log +tinc-run diff --git a/s6/tinc/log/run b/s6/tinc/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/tinc/ diff --git a/s6/tinc/run/data/conf.d/common.conf b/s6/tinc/run/data/conf.d/common.conf @@ -1,2 +0,0 @@ -DeviceStandby = no -PingTimeout = 15 diff --git a/s6/tinc/run/data/hosts/kroa b/s6/tinc/run/data/hosts/kroa @@ -1,13 +0,0 @@ -Address = kroa.josuah.net -Subnet = 172.16.55.5 -Port = 6655 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAmnT1YEcPTOiaa/GfWsFF1p3Qo/xeIjIb6e/cG62nKcjJSS+L3G+P -VUFOT7YfRdggzWDAMvxdAq5+DFcg2v3iDm8yTcv8ITaSKHFp4Tarkl2zEs5VELVY -mcPrYI99oyo9xiXh+x1G9/wp+uKxgoeU4m0+iNwyZw7ypoIgJhx8TfT7rgaXmyNX -HDBu/hBH7orTF3TMRp/VrWqD8UQyD0tK1gGQe4WIQJqouPxd44O8tKRgtha69q42 -kZ92DuFHLjTkYFjt4WKGEUAdja+aqbk5QeNyoOHtw9VkTIJcWShwPTYj0Ykdm/BS -oyBpV8pID+xWz81lpMilfanlPjgmzc6UvQIDAQAB ------END RSA PUBLIC KEY----- -Ed25519PublicKey = UzE1NtmdKv3MWpslesWIT4/AB3a8WZX+AP/2suMRUnK diff --git a/s6/tinc/run/data/hosts/nas b/s6/tinc/run/data/hosts/nas @@ -1,13 +0,0 @@ -Address = nas.josuah.net -Subnet = 172.16.55.2 -Port = 655 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAxFl/zn8owPVa0EBaazQaUck0ImV3+VS9+jOs0tePcQxuYHtX94dm -ZlYADJP/TaN8IEezQcgm2+iyavoOEBTCKhQ7/mYqG6UI2bcZjtu5UFl37YUJEYHN -dhvrhJwoYOWTFSu/d+UT/k8tFxoW308AXxqmb85egSBg8zaekrS7ibBSMi+AVaAz -g/Me+qgWh2j6jGh55Av1JeJ+1trlRLIvMRDwPe0U4hRjEZ/nBXFQS67AW1qg2tSF -3ieQgIr12FyZMw3ieWKiUW3JShdYRRMnV8hfKsn98R8LOirXBY2nCqRkWvKjYyY6 -bN2MzG57jdprYDR4ljglDFaXsNCDFgWTXwIDAQAB ------END RSA PUBLIC KEY----- -Ed25519PublicKey = QbVvGg+CgFHyzWzbmG4hpY7Kus3kMZean2Vj52v2roN diff --git a/s6/tinc/run/data/hosts/pdmg b/s6/tinc/run/data/hosts/pdmg @@ -1,12 +0,0 @@ -Subnet = 172.16.55.4 -Port = 655 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAxnCPtS3uHC8ZwZCDDPpDZWfuQF2PP1GdqHAF7pmk1mXCfapSVU/I -5gVP7scrbSKhNXpeQvgfRk7BQ+O1TpvhYDJRR6/xlACbaWeoFIQLbBMik10Dvw7k -Zrt/cnF8WTdEgQ52GIhwJhc/ZoBQHLfoAPZrD3lyTG4PQb/VyouQVJq8JgthHgIi -u3jz3meiB292rz9kg+wafl7YVsvWQZMK3CAHWjKLOaSNFYM6zkZU42v5d2mkC1aT -JowYMn0GRTKL4IC2WkzAt1JNK5Hd8YexdKBfqmobZI+SevlPYVkZLM7jmcTR7836 -bdBZF/tZpvRUY7eHSwVni576SwO+zakt3wIDAQAB ------END RSA PUBLIC KEY----- -Ed25519PublicKey = 5ooarAS0cWAxPQ6q2wn/1ZvhLYuz6ZRSJGZFFMMeZBF diff --git a/s6/tinc/run/data/hosts/rpi b/s6/tinc/run/data/hosts/rpi @@ -1,13 +0,0 @@ -Address = rpi.josuah.net -Subnet = 172.16.55.3 -Port = 655 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA35oN9yPu+lF7ZmphYandl896xjKYnNjIn5UB4gGvfbBEEA3kKYev -6Z4ApOvw2AgQ3WVbAynG3KbNj5jsCBBG8M9PfSPeFn4jpjycDqORi3sW6z3MQHfZ -u61jif16QtuuwXtrTiWO+MEVmSsCH9Vxtq5L6qJHZA7pEkQMxu/aEjOpYdpwZb/M -AnO7TU+PzTjUte40sfrIczHHkpDh8CdS1mKseF1XcNBhUANB7F6hQwhwD96GdGer -ioqMpltyyXMz4oZvhV+LD/jVOUXD1FZjiqO5TNtCFXYDLF/gxq/vmQ84eDo/I3Mo -E7wbHst5mOSRLBUP9cCAys/r6+JAdg+LfwIDAQAB ------END RSA PUBLIC KEY----- -Ed25519PublicKey = Zsy56fH9Hbd/qiRWRy/7YEKv4eQUPI1o+3iXs8lHN1N diff --git a/s6/tinc/run/data/hosts/t470s b/s6/tinc/run/data/hosts/t470s @@ -1,12 +0,0 @@ -Subnet = 172.16.55.1 - -Port = 12196 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAs99vlkaTp2BWltxN5KiBMkH/fHV1O3DWARK6ojFlhgENdmGjDxxk -0rshmaAvSjZ3uU2z+QkUIpovqEZf5I5abrAu1yKyMTIMFwqasa5D3TSkcePf+dD7 -LIr/YBWPl6kxHrNd2s3qPXBoYNaTBX7CCdXla7Rlz1/EnkMCfSLLd6YQsaCR4MsE -dwgR17bu5MsvB9YNLvbkqHHZCwvwIHrvX8dxvCr1BZwHAt/SDwg0nnTD2YNBUUl+ -SsXzMNfKiEjqmfHGfzMmP9Q9yjM6W5YAr+/Y7OPb/LnsPbYNC1L5YqaKskM431JU -vcpAPqjRJTvo+ji4hKrKdRal6tE61ZUW4wIDAQAB ------END RSA PUBLIC KEY----- -Ed25519PublicKey = Wnd7bglt6wxqz/QJT1KH9wajs2LUUnMTHTDSU7/SsQM diff --git a/s6/tinc/run/data/tinc-up b/s6/tinc/run/data/tinc-up @@ -1,11 +0,0 @@ -#!/bin/sh -ex - -case $(uname) in -(*BSD) - ifconfig "$INTERFACE" "$(tinc -c . get subnet)" netmask 255.255.255.0 - ;; -(Linux) - ip link set "$INTERFACE" up - ip addr add "$(tinc -c . get subnet | sed q)/24" dev "$INTERFACE" - ;; -esac diff --git a/s6/tinc/run/run b/s6/tinc/run/run @@ -1,9 +0,0 @@ -#!/local/bin/execlineb -# vpn focused on mesh networking - -fdmove -c 2 1 - -tincd -D - -d 5 - --config=./data - --pidfile=./data/pid diff --git a/s6/tinc/type b/s6/tinc/type @@ -0,0 +1 @@ +longrun diff --git a/s6/tinysshd-log/consumer-for b/s6/tinysshd-log/consumer-for @@ -0,0 +1 @@ +tinysshd diff --git a/s6/tinysshd-log/run b/s6/tinysshd-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/tinysshd diff --git a/s6/tinysshd-log/type b/s6/tinysshd-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/tinysshd-run/env/PORT b/s6/tinysshd-run/env/PORT @@ -0,0 +1 @@ +22 diff --git a/s6/tinysshd-run/producer-for b/s6/tinysshd-run/producer-for @@ -0,0 +1 @@ +tinysshd-log diff --git a/s6/tinysshd-run/run b/s6/tinysshd-run/run @@ -0,0 +1,14 @@ +#!/local/bin/execlineb +# SSHv2 server with minimal footprint https://tinyssh.org/ + +fdmove -c 2 1 + +foreground { mkdir -p ./data/ } +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/tinysshd-run/type b/s6/tinysshd-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/tinysshd/contents b/s6/tinysshd/contents @@ -0,0 +1,2 @@ +tinysshd-log +tinysshd-run diff --git a/s6/tinysshd/log/run b/s6/tinysshd/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/tinysshd/ diff --git a/s6/tinysshd/run/env/PORT b/s6/tinysshd/run/env/PORT @@ -1 +0,0 @@ -22 diff --git a/s6/tinysshd/run/run b/s6/tinysshd/run/run @@ -1,14 +0,0 @@ -#!/local/bin/execlineb -# SSHv2 server with minimal footprint https://tinyssh.org/ - -fdmove -c 2 1 - -foreground { mkdir -p ./data/ } -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/tinysshd/type b/s6/tinysshd/type @@ -0,0 +1 @@ +longrun diff --git a/s6/tls-server-log/consumer-for b/s6/tls-server-log/consumer-for @@ -0,0 +1 @@ +tls-server diff --git a/s6/tls-server-log/run b/s6/tls-server-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/tls-server diff --git a/s6/tls-server-log/type b/s6/tls-server-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/tls-server-run/producer-for b/s6/tls-server-run/producer-for @@ -0,0 +1 @@ +tls-server-log diff --git a/s6/tls-server-run/run b/s6/tls-server-run/run @@ -0,0 +1,12 @@ +#!/local/bin/execlineb +# TLS proxy based off brsl and ucspi-unix + +fdmove -c 2 1 + +s6-envdir ./env/ +importas HOST HOST + +mkdir -p /tmp/tls/ + +unixserver /tmp/tls/$HOST +brssl client $HOST diff --git a/s6/tls-server-run/type b/s6/tls-server-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/tls-server/contents b/s6/tls-server/contents @@ -0,0 +1,2 @@ +tls-server-log +tls-server-run diff --git a/s6/tls-server/log/run b/s6/tls-server/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/tls/ diff --git a/s6/tls-server/run/run b/s6/tls-server/run/run @@ -1,12 +0,0 @@ -#!/local/bin/execlineb -# TLS proxy based off brsl and ucspi-unix - -fdmove -c 2 1 - -s6-envdir ./env/ -importas HOST HOST - -mkdir -p /tmp/tls/ - -unixserver /tmp/tls/$HOST -brssl client $HOST diff --git a/s6/tls-server/type b/s6/tls-server/type @@ -0,0 +1 @@ +longrun diff --git a/s6/tor-log/consumer-for b/s6/tor-log/consumer-for @@ -0,0 +1 @@ +tor diff --git a/s6/tor-log/run b/s6/tor-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/tor diff --git a/s6/tor-log/type b/s6/tor-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/tor-run/data/conf b/s6/tor-run/data/conf @@ -0,0 +1,26 @@ +Log debug stderr +RunAsDaemon 0 + +DataDirectory @LOCALSTATEDIR@/var/tor + +## Once you have configured a hidden service, you can look at the +## contents of the file ".../hidden_service/hostname" for the address +## to tell people. +## +## HiddenServicePort x y:z says to redirect requests on port x to the +## address y:z. + +SOCKSPort 0 +User tor +PIDFile /home/tor/pid +Log notice stderr +DataDirectory /home/tor + +HiddenServiceDir /home/tor/gopher +HiddenServicePort 70 127.0.0.1:71 + +HiddenServiceDir /home/tor/http +HiddenServicePort 80 127.0.0.1:8080 + +HiddenServiceDir /home/tor/icecast +HiddenServicePort 3232 127.0.0.1:3232 diff --git a/s6/tor-run/producer-for b/s6/tor-run/producer-for @@ -0,0 +1 @@ +tor-log diff --git a/s6/tor-run/run b/s6/tor-run/run @@ -0,0 +1,6 @@ +#!/local/bin/execlineb +# tor daemon for routing and publishing services + +fdmove -c 2 1 + +tor -f ./data/conf diff --git a/s6/tor-run/type b/s6/tor-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/tor/contents b/s6/tor/contents @@ -0,0 +1,2 @@ +tor-log +tor-run diff --git a/s6/tor/log/run b/s6/tor/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/tor/ diff --git a/s6/tor/run/data/conf b/s6/tor/run/data/conf @@ -1,26 +0,0 @@ -Log debug stderr -RunAsDaemon 0 - -DataDirectory @LOCALSTATEDIR@/var/tor - -## Once you have configured a hidden service, you can look at the -## contents of the file ".../hidden_service/hostname" for the address -## to tell people. -## -## HiddenServicePort x y:z says to redirect requests on port x to the -## address y:z. - -SOCKSPort 0 -User tor -PIDFile /home/tor/pid -Log notice stderr -DataDirectory /home/tor - -HiddenServiceDir /home/tor/gopher -HiddenServicePort 70 127.0.0.1:71 - -HiddenServiceDir /home/tor/http -HiddenServicePort 80 127.0.0.1:8080 - -HiddenServiceDir /home/tor/icecast -HiddenServicePort 3232 127.0.0.1:3232 diff --git a/s6/tor/run/run b/s6/tor/run/run @@ -1,6 +0,0 @@ -#!/local/bin/execlineb -# tor daemon for routing and publishing services - -fdmove -c 2 1 - -tor -f ./data/conf diff --git a/s6/tor/type b/s6/tor/type @@ -0,0 +1 @@ +longrun diff --git a/s6/transmission-log/consumer-for b/s6/transmission-log/consumer-for @@ -0,0 +1 @@ +transmission diff --git a/s6/transmission-log/run b/s6/transmission-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/transmission diff --git a/s6/transmission-log/type b/s6/transmission-log/type @@ -0,0 +1 @@ +longrun diff --git a/pack/supervise/death_tally b/s6/transmission-run/env/PASS diff --git a/s6/transmission-run/env/USER b/s6/transmission-run/env/USER @@ -0,0 +1 @@ +torrent diff --git a/s6/transmission-run/producer-for b/s6/transmission-run/producer-for @@ -0,0 +1 @@ +transmission-log diff --git a/s6/transmission-run/run b/s6/transmission-run/run @@ -0,0 +1,10 @@ +#!/local/bin/execlineb -P + +s6-envdir env + +multisubstitute { + importas USER USER + importas PASS PASS +} + +transmission-daemon -f -t -u $USER -v $PASS diff --git a/s6/transmission-run/type b/s6/transmission-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/transmission/contents b/s6/transmission/contents @@ -0,0 +1,2 @@ +transmission-log +transmission-run diff --git a/s6/transmission/log/run b/s6/transmission/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/transmission diff --git a/s6/transmission/run/env/PASS b/s6/transmission/run/env/PASS diff --git a/s6/transmission/run/env/USER b/s6/transmission/run/env/USER @@ -1 +0,0 @@ -torrent diff --git a/s6/transmission/run/run b/s6/transmission/run/run @@ -1,10 +0,0 @@ -#!/local/bin/execlineb -P - -s6-envdir env - -multisubstitute { - importas USER USER - importas PASS PASS -} - -transmission-daemon -f -t -u $USER -v $PASS diff --git a/s6/transmission/type b/s6/transmission/type @@ -0,0 +1 @@ +longrun diff --git a/s6/u9fs-log/consumer-for b/s6/u9fs-log/consumer-for @@ -0,0 +1 @@ +u9fs diff --git a/s6/u9fs-log/run b/s6/u9fs-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/u9fs diff --git a/s6/u9fs-log/type b/s6/u9fs-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/u9fs-mount-log/consumer-for b/s6/u9fs-mount-log/consumer-for @@ -0,0 +1 @@ +u9fs-mount diff --git a/s6/u9fs-mount-log/run b/s6/u9fs-mount-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/u9fs-mount diff --git a/s6/u9fs-mount-log/type b/s6/u9fs-mount-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/u9fs-mount-run/down b/s6/u9fs-mount-run/down @@ -0,0 +1,4 @@ +#!/usr/local/bin/execlineb +# mount a 9p filesystem from a local UNIX socket + +exec /mnt/9p diff --git a/s6/u9fs-mount-run/producer-for b/s6/u9fs-mount-run/producer-for @@ -0,0 +1 @@ +u9fs-mount-log diff --git a/s6/u9fs-mount-run/type b/s6/u9fs-mount-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/u9fs-mount-run/up b/s6/u9fs-mount-run/up @@ -0,0 +1,5 @@ +#!/usr/local/bin/execlineb +# mount a 9p filesystem from a local UNIX socket + +mkdir -p /mnt/9p +exec 9pfs -U /tmp/9p /mnt/9p diff --git a/s6/u9fs-mount/contents b/s6/u9fs-mount/contents @@ -0,0 +1,2 @@ +u9fs-mount-log +u9fs-mount-run diff --git a/s6/u9fs-mount/log/run b/s6/u9fs-mount/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/u9fs-mount/ diff --git a/s6/u9fs-mount/run/down b/s6/u9fs-mount/run/down @@ -1,4 +0,0 @@ -#!/usr/local/bin/execlineb -# mount a 9p filesystem from a local UNIX socket - -exec /mnt/9p diff --git a/s6/u9fs-mount/run/up b/s6/u9fs-mount/run/up @@ -1,5 +0,0 @@ -#!/usr/local/bin/execlineb -# mount a 9p filesystem from a local UNIX socket - -mkdir -p /mnt/9p -exec 9pfs -U /tmp/9p /mnt/9p diff --git a/s6/u9fs-mount/type b/s6/u9fs-mount/type @@ -0,0 +1 @@ +longrun diff --git a/s6/u9fs-run/producer-for b/s6/u9fs-run/producer-for @@ -0,0 +1 @@ +u9fs-log diff --git a/s6/u9fs-run/run b/s6/u9fs-run/run @@ -0,0 +1,8 @@ +#!/local/bin/execlineb +# forward u9fs from a remote host to a local socket through ssh + +fdmove -c 2 1 + +unixserver -v /tmp/9p +ssh u9fs@host +u9fs -l /dev/stderr -a none -u u9fs /home/u9fs diff --git a/s6/u9fs-run/type b/s6/u9fs-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/u9fs/contents b/s6/u9fs/contents @@ -0,0 +1,2 @@ +u9fs-log +u9fs-run diff --git a/s6/u9fs/log/run b/s6/u9fs/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/u9fs/ diff --git a/s6/u9fs/run/run b/s6/u9fs/run/run @@ -1,8 +0,0 @@ -#!/local/bin/execlineb -# forward u9fs from a remote host to a local socket through ssh - -fdmove -c 2 1 - -unixserver -v /tmp/9p -ssh u9fs@host -u9fs -l /dev/stderr -a none -u u9fs /home/u9fs diff --git a/s6/u9fs/type b/s6/u9fs/type @@ -0,0 +1 @@ +longrun diff --git a/s6/venti-log/consumer-for b/s6/venti-log/consumer-for @@ -0,0 +1 @@ +venti diff --git a/s6/venti-log/run b/s6/venti-log/run @@ -0,0 +1,2 @@ +#!/usr/bin/env execlineb +s6-log t /var/log/venti diff --git a/s6/venti-log/type b/s6/venti-log/type @@ -0,0 +1 @@ +longrun diff --git a/s6/venti-run/data/conf b/s6/venti-run/data/conf @@ -0,0 +1,8 @@ +index main + +isect /home/venti/isect0 +isect /home/venti/isect1 +arenas /home/venti/arena0 +mem 10M +bcmem 20M +icmem 30M diff --git a/s6/venti-run/data/fmt b/s6/venti-run/data/fmt @@ -0,0 +1,9 @@ +#!/bin/sh -e + +dd if=/dev/zero of=/home/venti/isect0 bs=1M count=1' +dd if=/dev/zero of=/home/venti/arena0 bs=1M count=1k + +/9/port/bin/venti/fmtisect isect0 /home/venti/isect0 +/9/port/bin/venti/fmtisect isect1 /home/venti/isect1 +/9/port/bin/venti/fmtarenas arena0 /home/venti/arena0 +/9/port/bin/venti/fmtindex conf diff --git a/s6/venti-run/producer-for b/s6/venti-run/producer-for @@ -0,0 +1 @@ +venti-log diff --git a/s6/venti-run/run b/s6/venti-run/run @@ -0,0 +1,11 @@ +#!/local/bin/execlineb -P +# write once read many (worm) storage server from plan 9 (p9p) + +fdmove -c 2 1 + +s6-setuidgid venti + +venti -s + -c ./data/conf + -a tcp!*!17034 + -h tcp!*!8080 diff --git a/s6/venti-run/type b/s6/venti-run/type @@ -0,0 +1 @@ +longrun diff --git a/s6/venti/contents b/s6/venti/contents @@ -0,0 +1,2 @@ +venti-log +venti-run diff --git a/s6/venti/log/run b/s6/venti/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/venti/ diff --git a/s6/venti/run/data/conf b/s6/venti/run/data/conf @@ -1,8 +0,0 @@ -index main - -isect /home/venti/isect0 -isect /home/venti/isect1 -arenas /home/venti/arena0 -mem 10M -bcmem 20M -icmem 30M diff --git a/s6/venti/run/data/fmt b/s6/venti/run/data/fmt @@ -1,9 +0,0 @@ -#!/bin/sh -e - -dd if=/dev/zero of=/home/venti/isect0 bs=1M count=1' -dd if=/dev/zero of=/home/venti/arena0 bs=1M count=1k - -/9/port/bin/venti/fmtisect isect0 /home/venti/isect0 -/9/port/bin/venti/fmtisect isect1 /home/venti/isect1 -/9/port/bin/venti/fmtarenas arena0 /home/venti/arena0 -/9/port/bin/venti/fmtindex conf diff --git a/s6/venti/run/run b/s6/venti/run/run @@ -1,11 +0,0 @@ -#!/local/bin/execlineb -P -# write once read many (worm) storage server from plan 9 (p9p) - -fdmove -c 2 1 - -s6-setuidgid venti - -venti -s - -c ./data/conf - -a tcp!*!17034 - -h tcp!*!8080 diff --git a/s6/venti/type b/s6/venti/type @@ -0,0 +1 @@ +longrun diff --git a/pack/supervise/death_tally b/supervise/death_tally diff --git a/pack/supervise/death_tally b/supervise/lock diff --git a/supervise/status b/supervise/status Binary files differ.