dot

packages and services management
Log | Files | Refs | README

commit 64155e8945906f29c816061f2c47ad5e0c86cce9
parent 7f0559fb1b593c9be23b7a83f613c8eecf517306
Author: Josuah Demangeon <mail@josuah.net>
Date:   Wed, 15 Aug 2018 21:42:09 +0200

flatter structure

Diffstat:
Abin/.s6-rc-recompile.swp | 0
Abin/.s6-rc-start.swp | 0
Dbin/s6-rc-add | 7-------
Dbin/s6-rc-del | 6------
Mbin/s6-rc-recompile | 14++++----------
Mbin/s6-rc-start | 4++--
Apack/execline/2.5.0.1/build | 9+++++++++
Apack/execline/2.5.0.1/dep | 2++
Apack/execline/2.5.0.1/tar | 1+
Mpack/execline/cur | 4++--
Apack/libskarnet/2.7.0.0/build | 4++++
Apack/libskarnet/2.7.0.0/dep | 1+
Apack/libskarnet/2.7.0.0/tar | 1+
Dpack/openvpn/2.4.6/.build.swp | 0
Apack/s6/2.7.2.0/build | 11+++++++++++
Apack/s6/2.7.2.0/dep | 3+++
Apack/s6/2.7.2.0/tar | 1+
Mpack/s6/cur | 4++--
Rs6/backup/backup-log/consumer-for -> s6/backup-log/consumer-for | 0
Rs6/backup/backup-log/run -> s6/backup-log/run | 0
Rs6/backup/backup-log/type -> s6/backup-log/type | 0
Ds6/backup/backup/contents | 2--
Ds6/backup/backup/type | 1-
Rs6/backup/backup-run/dependencies -> s6/backup/dependencies | 0
Rs6/backup/backup-run/producer-for -> s6/backup/producer-for | 0
Rs6/backup/backup-run/run -> s6/backup/run | 0
Rs6/backup/backup-run/type -> s6/backup/type | 0
Rs6/btpd/btpd-log/consumer-for -> s6/btpd-log/consumer-for | 0
Rs6/btpd/btpd-log/run -> s6/btpd-log/run | 0
Rs6/btpd/btpd-log/type -> s6/btpd-log/type | 0
Ds6/btpd/btpd/contents | 2--
Ds6/btpd/btpd/type | 1-
Rs6/btpd/btpd-run/dependencies -> s6/btpd/dependencies | 0
Rs6/btpd/btpd-run/producer-for -> s6/btpd/producer-for | 0
Rs6/btpd/btpd-run/run -> s6/btpd/run | 0
Rs6/btpd/btpd-run/type -> s6/btpd/type | 0
Rs6/cherrymusic/cherrymusic-log/consumer-for -> s6/cherrymusic-log/consumer-for | 0
Rs6/cherrymusic/cherrymusic-log/run -> s6/cherrymusic-log/run | 0
Rs6/cherrymusic/cherrymusic-log/type -> s6/cherrymusic-log/type | 0
Ds6/cherrymusic/cherrymusic/contents | 2--
Ds6/cherrymusic/cherrymusic/type | 1-
Rs6/cherrymusic/cherrymusic-run/dependencies -> s6/cherrymusic/dependencies | 0
Rs6/cherrymusic/cherrymusic-run/producer-for -> s6/cherrymusic/producer-for | 0
Rs6/cherrymusic/cherrymusic-run/run -> s6/cherrymusic/run | 0
Rs6/cherrymusic/cherrymusic-run/type -> s6/cherrymusic/type | 0
Rs6/collectd/collectd-log/consumer-for -> s6/collectd-log/consumer-for | 0
Rs6/collectd/collectd-log/run -> s6/collectd-log/run | 0
Rs6/collectd/collectd-log/type -> s6/collectd-log/type | 0
Ds6/collectd/collectd/contents | 2--
Ds6/collectd/collectd/type | 1-
Rs6/collectd/collectd-run/data/conf -> s6/collectd/data/conf | 0
Rs6/collectd/collectd-run/dependencies -> s6/collectd/dependencies | 0
Rs6/collectd/collectd-run/producer-for -> s6/collectd/producer-for | 0
Rs6/collectd/collectd-run/run -> s6/collectd/run | 0
Rs6/collectd/collectd-run/type -> s6/collectd/type | 0
Rs6/djbdns-axfrdns/djbdns-axfrdns-log/consumer-for -> s6/djbdns-axfrdns-log/consumer-for | 0
Rs6/djbdns-axfrdns/djbdns-axfrdns-log/run -> s6/djbdns-axfrdns-log/run | 0
Rs6/djbdns-axfrdns/djbdns-axfrdns-log/type -> s6/djbdns-axfrdns-log/type | 0
Rs6/djbdns-axfrdns/djbdns-axfrdns-run/dependencies -> s6/djbdns-axfrdns/dependencies | 0
Ds6/djbdns-axfrdns/djbdns-axfrdns/contents | 3---
Ds6/djbdns-axfrdns/djbdns-axfrdns/type | 1-
Rs6/djbdns-axfrdns/djbdns-axfrdns-run/env/ROOT -> s6/djbdns-axfrdns/env/ROOT | 0
Rs6/djbdns-axfrdns/djbdns-axfrdns-run/producer-for -> s6/djbdns-axfrdns/producer-for | 0
Rs6/djbdns-axfrdns/djbdns-axfrdns-run/run -> s6/djbdns-axfrdns/run | 0
Rs6/djbdns-axfrdns/djbdns-axfrdns-run/type -> s6/djbdns-axfrdns/type | 0
Rs6/djbdns-dnscache/djbdns-dnscache-log/consumer-for -> s6/djbdns-dnscache-log/consumer-for | 0
Rs6/djbdns-dnscache/djbdns-dnscache-log/run -> s6/djbdns-dnscache-log/run | 0
Rs6/djbdns-dnscache/djbdns-dnscache-log/type -> s6/djbdns-dnscache-log/type | 0
Rs6/djbdns-dnscache/djbdns-dnscache-run/data/ip/127.0.0.1 -> s6/djbdns-dnscache/data/ip/127.0.0.1 | 0
Rs6/djbdns-dnscache/djbdns-dnscache-run/data/servers/@ -> s6/djbdns-dnscache/data/servers/@ | 0
Rs6/djbdns-dnscache/djbdns-dnscache-run/dependencies -> s6/djbdns-dnscache/dependencies | 0
Ds6/djbdns-dnscache/djbdns-dnscache/contents | 3---
Ds6/djbdns-dnscache/djbdns-dnscache/type | 1-
Rs6/djbdns-dnscache/djbdns-dnscache-run/env/CACHESIZE -> s6/djbdns-dnscache/env/CACHESIZE | 0
Rs6/djbdns-dnscache/djbdns-dnscache-run/env/DATALIMIT -> s6/djbdns-dnscache/env/DATALIMIT | 0
Rs6/djbdns-dnscache/djbdns-dnscache-run/env/IP -> s6/djbdns-dnscache/env/IP | 0
Rs6/djbdns-dnscache/djbdns-dnscache-run/env/IPSEND -> s6/djbdns-dnscache/env/IPSEND | 0
Rs6/djbdns-dnscache/djbdns-dnscache-run/env/ROOT -> s6/djbdns-dnscache/env/ROOT | 0
Rs6/djbdns-dnscache/djbdns-dnscache-run/producer-for -> s6/djbdns-dnscache/producer-for | 0
Rs6/djbdns-dnscache/djbdns-dnscache-run/run -> s6/djbdns-dnscache/run | 0
Rs6/djbdns-dnscache/djbdns-dnscache-run/type -> s6/djbdns-dnscache/type | 0
Rs6/djbdns-tinydns/djbdns-tinydns-log/consumer-for -> s6/djbdns-tinydns-log/consumer-for | 0
Rs6/djbdns-tinydns/djbdns-tinydns-log/run -> s6/djbdns-tinydns-log/run | 0
Rs6/djbdns-tinydns/djbdns-tinydns-log/type -> s6/djbdns-tinydns-log/type | 0
Rs6/djbdns-tinydns/djbdns-tinydns-run/data/Makefile -> s6/djbdns-tinydns/data/Makefile | 0
Rs6/djbdns-tinydns/djbdns-tinydns-run/data/add-alias -> s6/djbdns-tinydns/data/add-alias | 0
Rs6/djbdns-tinydns/djbdns-tinydns-run/data/add-childns -> s6/djbdns-tinydns/data/add-childns | 0
Rs6/djbdns-tinydns/djbdns-tinydns-run/data/add-host -> s6/djbdns-tinydns/data/add-host | 0
Rs6/djbdns-tinydns/djbdns-tinydns-run/data/add-mx -> s6/djbdns-tinydns/data/add-mx | 0
Rs6/djbdns-tinydns/djbdns-tinydns-run/data/add-ns -> s6/djbdns-tinydns/data/add-ns | 0
Rs6/djbdns-tinydns/djbdns-tinydns-run/data/data -> s6/djbdns-tinydns/data/data | 0
Rs6/djbdns-tinydns/djbdns-tinydns-run/dependencies -> s6/djbdns-tinydns/dependencies | 0
Ds6/djbdns-tinydns/djbdns-tinydns/contents | 2--
Ds6/djbdns-tinydns/djbdns-tinydns/type | 1-
Rs6/djbdns-tinydns/djbdns-tinydns-run/env/IP -> s6/djbdns-tinydns/env/IP | 0
Rs6/djbdns-tinydns/djbdns-tinydns-run/env/ROOT -> s6/djbdns-tinydns/env/ROOT | 0
Rs6/djbdns-tinydns/djbdns-tinydns-run/producer-for -> s6/djbdns-tinydns/producer-for | 0
Rs6/djbdns-tinydns/djbdns-tinydns-run/run -> s6/djbdns-tinydns/run | 0
Rs6/djbdns-tinydns/djbdns-tinydns-run/type -> s6/djbdns-tinydns/type | 0
Rs6/djbdns-walldns/djbdns-walldns-log/consumer-for -> s6/djbdns-walldns-log/consumer-for | 0
Rs6/djbdns-walldns/djbdns-walldns-log/run -> s6/djbdns-walldns-log/run | 0
Rs6/djbdns-walldns/djbdns-walldns-log/type -> s6/djbdns-walldns-log/type | 0
Rs6/djbdns-walldns/djbdns-walldns-run/dependencies -> s6/djbdns-walldns/dependencies | 0
Ds6/djbdns-walldns/djbdns-walldns/contents | 3---
Ds6/djbdns-walldns/djbdns-walldns/type | 1-
Rs6/djbdns-walldns/djbdns-walldns-run/env/IP -> s6/djbdns-walldns/env/IP | 0
Rs6/djbdns-walldns/djbdns-walldns-run/env/ROOT -> s6/djbdns-walldns/env/ROOT | 0
Rs6/djbdns-walldns/djbdns-walldns-run/producer-for -> s6/djbdns-walldns/producer-for | 0
Rs6/djbdns-walldns/djbdns-walldns-run/run -> s6/djbdns-walldns/run | 0
Rs6/djbdns-walldns/djbdns-walldns-run/type -> s6/djbdns-walldns/type | 0
Rs6/fossil/fossil-log/consumer-for -> s6/fossil-log/consumer-for | 0
Rs6/fossil/fossil-log/run -> s6/fossil-log/run | 0
Rs6/fossil/fossil-log/type -> s6/fossil-log/type | 0
Rs6/fossil/fossil-run/dependencies -> s6/fossil/dependencies | 0
Ds6/fossil/fossil/contents | 2--
Ds6/fossil/fossil/type | 1-
Rs6/fossil/fossil-run/producer-for -> s6/fossil/producer-for | 0
Rs6/fossil/fossil-run/run -> s6/fossil/run | 0
Rs6/fossil/fossil-run/type -> s6/fossil/type | 0
Rs6/ftpd/ftpd-log/consumer-for -> s6/ftpd-log/consumer-for | 0
Rs6/ftpd/ftpd-log/run -> s6/ftpd-log/run | 0
Rs6/ftpd/ftpd-log/type -> s6/ftpd-log/type | 0
Rs6/ftpd/ftpd-run/dependencies -> s6/ftpd/dependencies | 0
Ds6/ftpd/ftpd/contents | 2--
Ds6/ftpd/ftpd/type | 1-
Rs6/ftpd/ftpd-run/producer-for -> s6/ftpd/producer-for | 0
Rs6/ftpd/ftpd-run/run -> s6/ftpd/run | 0
Rs6/ftpd/ftpd-run/type -> s6/ftpd/type | 0
Rs6/geomyidae/geomyidae-log/consumer-for -> s6/geomyidae-log/consumer-for | 0
Rs6/geomyidae/geomyidae-log/run -> s6/geomyidae-log/run | 0
Rs6/geomyidae/geomyidae-log/type -> s6/geomyidae-log/type | 0
Rs6/geomyidae/geomyidae-run/dependencies -> s6/geomyidae/dependencies | 0
Rs6/geomyidae/geomyidae-run/env/BASE -> s6/geomyidae/env/BASE | 0
Rs6/geomyidae/geomyidae-run/env/HOST -> s6/geomyidae/env/HOST | 0
Rs6/geomyidae/geomyidae-run/env/PORT -> s6/geomyidae/env/PORT | 0
Ds6/geomyidae/geomyidae/contents | 2--
Ds6/geomyidae/geomyidae/type | 1-
Rs6/geomyidae/geomyidae-run/producer-for -> s6/geomyidae/producer-for | 0
Rs6/geomyidae/geomyidae-run/run -> s6/geomyidae/run | 0
Rs6/geomyidae/geomyidae-run/type -> s6/geomyidae/type | 0
Rs6/git-daemon/git-daemon-log/consumer-for -> s6/git-daemon-log/consumer-for | 0
Rs6/git-daemon/git-daemon-log/run -> s6/git-daemon-log/run | 0
Rs6/git-daemon/git-daemon-log/type -> s6/git-daemon-log/type | 0
Rs6/git-daemon/git-daemon-run/dependencies -> s6/git-daemon/dependencies | 0
Ds6/git-daemon/git-daemon/contents | 3---
Ds6/git-daemon/git-daemon/type | 1-
Rs6/git-daemon/git-daemon-run/producer-for -> s6/git-daemon/producer-for | 0
Rs6/git-daemon/git-daemon-run/run -> s6/git-daemon/run | 0
Rs6/git-daemon/git-daemon-run/type -> s6/git-daemon/type | 0
Rs6/git-mirror/git-mirror-log/consumer-for -> s6/git-mirror-log/consumer-for | 0
Rs6/git-mirror/git-mirror-log/run -> s6/git-mirror-log/run | 0
Rs6/git-mirror/git-mirror-log/type -> s6/git-mirror-log/type | 0
Rs6/git-mirror/git-mirror-run/data/mirror -> s6/git-mirror/data/mirror | 0
Rs6/git-mirror/git-mirror-run/dependencies -> s6/git-mirror/dependencies | 0
Ds6/git-mirror/git-mirror/contents | 3---
Ds6/git-mirror/git-mirror/type | 1-
Rs6/git-mirror/git-mirror-run/producer-for -> s6/git-mirror/producer-for | 0
Rs6/git-mirror/git-mirror-run/run -> s6/git-mirror/run | 0
Rs6/git-mirror/git-mirror-run/type -> s6/git-mirror/type | 0
Rs6/gproxy/gproxy-log/consumer-for -> s6/gproxy-log/consumer-for | 0
Rs6/gproxy/gproxy-log/run -> s6/gproxy-log/run | 0
Rs6/gproxy/gproxy-log/type -> s6/gproxy-log/type | 0
Rs6/gproxy/gproxy-run/data/gproxy -> s6/gproxy/data/gproxy | 0
Rs6/gproxy/gproxy-run/dependencies -> s6/gproxy/dependencies | 0
Ds6/gproxy/gproxy/contents | 2--
Ds6/gproxy/gproxy/type | 1-
Rs6/gproxy/gproxy-run/producer-for -> s6/gproxy/producer-for | 0
Rs6/gproxy/gproxy-run/run -> s6/gproxy/run | 0
Rs6/gproxy/gproxy-run/type -> s6/gproxy/type | 0
Rs6/httpd/httpd-log/consumer-for -> s6/httpd-log/consumer-for | 0
Rs6/httpd/httpd-log/run -> s6/httpd-log/run | 0
Rs6/httpd/httpd-log/type -> s6/httpd-log/type | 0
Rs6/httpd/httpd-run/dependencies -> s6/httpd/dependencies | 0
Ds6/httpd/httpd/contents | 2--
Ds6/httpd/httpd/type | 1-
Rs6/httpd/httpd-run/producer-for -> s6/httpd/producer-for | 0
Rs6/httpd/httpd-run/run -> s6/httpd/run | 0
Rs6/httpd/httpd-run/type -> s6/httpd/type | 0
Rs6/ii-tcp/ii-tcp-log/consumer-for -> s6/ii-tcp-log/consumer-for | 0
Rs6/ii-tcp/ii-tcp-log/run -> s6/ii-tcp-log/run | 0
Rs6/ii-tcp/ii-tcp-log/type -> s6/ii-tcp-log/type | 0
Rs6/ii-tcp/ii-tcp-run/dependencies -> s6/ii-tcp/dependencies | 0
Rs6/ii-tcp/ii-tcp-run/env/HOST -> s6/ii-tcp/env/HOST | 0
Rs6/ii-tcp/ii-tcp-run/env/NAME -> s6/ii-tcp/env/NAME | 0
Rs6/ii-tcp/ii-tcp-run/env/NICK -> s6/ii-tcp/env/NICK | 0
Rs6/ii-tcp/ii-tcp-run/env/PASS -> s6/ii-tcp/env/PASS | 0
Rs6/ii-tcp/ii-tcp-run/env/PORT -> s6/ii-tcp/env/PORT | 0
Rs6/ii-tcp/ii-tcp-run/env/USER -> s6/ii-tcp/env/USER | 0
Rs6/ii-tcp/ii-tcp-run/finish -> s6/ii-tcp/finish | 0
Ds6/ii-tcp/ii-tcp/contents | 3---
Ds6/ii-tcp/ii-tcp/type | 1-
Rs6/ii-tcp/ii-tcp-run/producer-for -> s6/ii-tcp/producer-for | 0
Rs6/ii-tcp/ii-tcp-run/run -> s6/ii-tcp/run | 0
Rs6/ii-tcp/ii-tcp-run/type -> s6/ii-tcp/type | 0
Rs6/ii-tls/ii-tls-log/consumer-for -> s6/ii-tls-log/consumer-for | 0
Rs6/ii-tls/ii-tls-log/run -> s6/ii-tls-log/run | 0
Rs6/ii-tls/ii-tls-log/type -> s6/ii-tls-log/type | 0
Rs6/ii-tls/ii-tls-run/data/.empty -> s6/ii-tls/data/.empty | 0
Rs6/ii-tls/ii-tls-run/dependencies -> s6/ii-tls/dependencies | 0
Rs6/ii-tls/ii-tls-run/env/CAFILE -> s6/ii-tls/env/CAFILE | 0
Rs6/ii-tls/ii-tls-run/env/HOST -> s6/ii-tls/env/HOST | 0
Rs6/ii-tls/ii-tls-run/env/NAME -> s6/ii-tls/env/NAME | 0
Rs6/ii-tls/ii-tls-run/env/NICK -> s6/ii-tls/env/NICK | 0
Rs6/ii-tls/ii-tls-run/env/PASS -> s6/ii-tls/env/PASS | 0
Rs6/ii-tls/ii-tls-run/env/PORT -> s6/ii-tls/env/PORT | 0
Rs6/ii-tls/ii-tls-run/env/USER -> s6/ii-tls/env/USER | 0
Rs6/ii-tls/ii-tls-run/finish -> s6/ii-tls/finish | 0
Ds6/ii-tls/ii-tls/contents | 3---
Ds6/ii-tls/ii-tls/type | 1-
Rs6/ii-tls/ii-tls-run/producer-for -> s6/ii-tls/producer-for | 0
Rs6/ii-tls/ii-tls-run/run -> s6/ii-tls/run | 0
Rs6/ii-tls/ii-tls-run/type -> s6/ii-tls/type | 0
Rs6/mpop/mpop-log/consumer-for -> s6/mpop-log/consumer-for | 0
Rs6/mpop/mpop-log/run -> s6/mpop-log/run | 0
Rs6/backup/backup-log/type -> s6/mpop-log/type | 0
As6/mpop/data/mpoprc | 15+++++++++++++++
As6/mpop/dependencies | 1+
Rs6/ii-tcp/ii-tcp-run/env/NICK -> s6/mpop/env/USER | 0
Ds6/mpop/mpop-log/type | 1-
Ds6/mpop/mpop-run/data/mpoprc | 15---------------
Ds6/mpop/mpop-run/dependencies | 1-
Ds6/mpop/mpop-run/env/USER | 1-
Ds6/mpop/mpop-run/producer-for | 1-
Ds6/mpop/mpop-run/run | 16----------------
Ds6/mpop/mpop-run/type | 1-
Ds6/mpop/mpop/contents | 2--
Ds6/mpop/mpop/type | 1-
As6/mpop/producer-for | 1+
As6/mpop/run | 16++++++++++++++++
Rs6/backup/backup-log/type -> s6/mpop/type | 0
As6/ngircd-log/consumer-for | 1+
As6/ngircd-log/run | 2++
Rs6/backup/backup-log/type -> s6/ngircd-log/type | 0
As6/ngircd/data/conf | 45+++++++++++++++++++++++++++++++++++++++++++++
As6/ngircd/data/motd | 37+++++++++++++++++++++++++++++++++++++
As6/ngircd/data/tls | 8++++++++
As6/ngircd/dependencies | 1+
Ds6/ngircd/ngircd-log/consumer-for | 1-
Ds6/ngircd/ngircd-log/run | 2--
Ds6/ngircd/ngircd-log/type | 1-
Ds6/ngircd/ngircd-run/data/conf | 45---------------------------------------------
Ds6/ngircd/ngircd-run/data/motd | 37-------------------------------------
Ds6/ngircd/ngircd-run/data/tls | 8--------
Ds6/ngircd/ngircd-run/dependencies | 1-
Ds6/ngircd/ngircd-run/producer-for | 1-
Ds6/ngircd/ngircd-run/run | 6------
Ds6/ngircd/ngircd-run/type | 1-
Ds6/ngircd/ngircd/contents | 2--
Ds6/ngircd/ngircd/type | 1-
As6/ngircd/producer-for | 1+
As6/ngircd/run | 6++++++
Rs6/backup/backup-log/type -> s6/ngircd/type | 0
As6/ntpclient-log/consumer-for | 1+
As6/ntpclient-log/run | 2++
Rs6/backup/backup-log/type -> s6/ntpclient-log/type | 0
As6/ntpclient/dependencies | 1+
As6/ntpclient/env/HOST | 1+
Ds6/ntpclient/ntpclient-log/consumer-for | 1-
Ds6/ntpclient/ntpclient-log/run | 2--
Ds6/ntpclient/ntpclient-log/type | 1-
Ds6/ntpclient/ntpclient-run/dependencies | 1-
Ds6/ntpclient/ntpclient-run/env/HOST | 1-
Ds6/ntpclient/ntpclient-run/producer-for | 1-
Ds6/ntpclient/ntpclient-run/run | 7-------
Ds6/ntpclient/ntpclient-run/type | 1-
Ds6/ntpclient/ntpclient/contents | 2--
Ds6/ntpclient/ntpclient/type | 1-
As6/ntpclient/producer-for | 1+
As6/ntpclient/run | 7+++++++
Rs6/backup/backup-log/type -> s6/ntpclient/type | 0
As6/opentracker-log/consumer-for | 1+
As6/opentracker-log/run | 2++
Rs6/backup/backup-log/type -> s6/opentracker-log/type | 0
As6/opentracker/dependencies | 1+
Ds6/opentracker/opentracker-log/consumer-for | 1-
Ds6/opentracker/opentracker-log/run | 2--
Ds6/opentracker/opentracker-log/type | 1-
Ds6/opentracker/opentracker-run/dependencies | 1-
Ds6/opentracker/opentracker-run/producer-for | 1-
Ds6/opentracker/opentracker-run/run | 6------
Ds6/opentracker/opentracker-run/type | 1-
Ds6/opentracker/opentracker/contents | 2--
Ds6/opentracker/opentracker/type | 1-
As6/opentracker/producer-for | 1+
As6/opentracker/run | 6++++++
Rs6/backup/backup-log/type -> s6/opentracker/type | 0
As6/plot-log/consumer-for | 1+
As6/plot-log/run | 2++
Rs6/backup/backup-log/type -> s6/plot-log/type | 0
As6/plot/data/plot | 62++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
As6/plot/dependencies | 1+
Ds6/plot/plot-log/consumer-for | 1-
Ds6/plot/plot-log/run | 2--
Ds6/plot/plot-log/type | 1-
Ds6/plot/plot-run/data/plot | 62--------------------------------------------------------------
Ds6/plot/plot-run/dependencies | 1-
Ds6/plot/plot-run/producer-for | 1-
Ds6/plot/plot-run/run | 6------
Ds6/plot/plot-run/type | 1-
Ds6/plot/plot/contents | 2--
Ds6/plot/plot/type | 1-
As6/plot/producer-for | 1+
As6/plot/run | 6++++++
Rs6/backup/backup-log/type -> s6/plot/type | 0
As6/qemu-tap-log/consumer-for | 1+
As6/qemu-tap-log/run | 2++
Rs6/backup/backup-log/type -> s6/qemu-tap-log/type | 0
As6/qemu-tap/dependencies | 1+
As6/qemu-tap/producer-for | 1+
Ds6/qemu-tap/qemu-tap-log/consumer-for | 1-
Ds6/qemu-tap/qemu-tap-log/run | 2--
Ds6/qemu-tap/qemu-tap-log/type | 1-
Ds6/qemu-tap/qemu-tap-run/dependencies | 1-
Ds6/qemu-tap/qemu-tap-run/producer-for | 1-
Ds6/qemu-tap/qemu-tap-run/run | 23-----------------------
Ds6/qemu-tap/qemu-tap-run/type | 1-
Ds6/qemu-tap/qemu-tap/contents | 3---
Ds6/qemu-tap/qemu-tap/type | 1-
As6/qemu-tap/run | 23+++++++++++++++++++++++
Rs6/backup/backup-log/type -> s6/qemu-tap/type | 0
As6/qemu-user-log/consumer-for | 1+
As6/qemu-user-log/run | 2++
Rs6/backup/backup-log/type -> s6/qemu-user-log/type | 0
As6/qemu-user/dependencies | 1+
Rs6/djbdns-dnscache/djbdns-dnscache-run/data/ip/127.0.0.1 -> s6/qemu-user/env/NAME | 0
As6/qemu-user/producer-for | 1+
Ds6/qemu-user/qemu-user-log/consumer-for | 1-
Ds6/qemu-user/qemu-user-log/run | 2--
Ds6/qemu-user/qemu-user-log/type | 1-
Ds6/qemu-user/qemu-user-run/dependencies | 1-
Ds6/qemu-user/qemu-user-run/env/NAME | 0
Ds6/qemu-user/qemu-user-run/producer-for | 1-
Ds6/qemu-user/qemu-user-run/run | 21---------------------
Ds6/qemu-user/qemu-user-run/type | 1-
Ds6/qemu-user/qemu-user/contents | 3---
Ds6/qemu-user/qemu-user/type | 1-
As6/qemu-user/run | 21+++++++++++++++++++++
Rs6/backup/backup-log/type -> s6/qemu-user/type | 0
As6/qmail-pop3d-log/consumer-for | 1+
As6/qmail-pop3d-log/run | 2++
Rs6/backup/backup-log/type -> s6/qmail-pop3d-log/type | 0
As6/qmail-pop3d/dependencies | 1+
As6/qmail-pop3d/producer-for | 1+
Ds6/qmail-pop3d/qmail-pop3d-log/consumer-for | 1-
Ms6/qmail-pop3d/qmail-pop3d-log/run | 4++--
Ds6/qmail-pop3d/qmail-pop3d-log/type | 1-
Ds6/qmail-pop3d/qmail-pop3d-run/dependencies | 1-
Ds6/qmail-pop3d/qmail-pop3d-run/producer-for | 1-
Ds6/qmail-pop3d/qmail-pop3d-run/qmail-pop3d-log/run | 2--
Ds6/qmail-pop3d/qmail-pop3d-run/qmail-pop3d/env/CERTFILE | 1-
Ds6/qmail-pop3d/qmail-pop3d-run/qmail-pop3d/env/HOST | 1-
Ds6/qmail-pop3d/qmail-pop3d-run/qmail-pop3d/env/KEYFILE | 1-
Ds6/qmail-pop3d/qmail-pop3d-run/qmail-pop3d/env/MAILDIR | 1-
Ds6/qmail-pop3d/qmail-pop3d-run/qmail-pop3d/run | 12------------
Ds6/qmail-pop3d/qmail-pop3d-run/type | 1-
Ds6/qmail-pop3d/qmail-pop3d/contents | 3---
As6/qmail-pop3d/qmail-pop3d/env/CERTFILE | 1+
Rs6/geomyidae/geomyidae-run/env/HOST -> s6/qmail-pop3d/qmail-pop3d/env/HOST | 0
As6/qmail-pop3d/qmail-pop3d/env/KEYFILE | 1+
As6/qmail-pop3d/qmail-pop3d/env/MAILDIR | 1+
As6/qmail-pop3d/qmail-pop3d/run | 12++++++++++++
Ds6/qmail-pop3d/qmail-pop3d/type | 1-
Rs6/backup/backup-log/type -> s6/qmail-pop3d/type | 0
As6/qmail-send-log/consumer-for | 1+
As6/qmail-send-log/run | 2++
Rs6/backup/backup-log/type -> s6/qmail-send-log/type | 0
As6/qmail-send/data/alias/.qmail-mail | 1+
As6/qmail-send/data/control/defaultdelivery | 1+
Rs6/geomyidae/geomyidae-run/env/HOST -> s6/qmail-send/data/control/defaultdomain | 0
Rs6/geomyidae/geomyidae-run/env/HOST -> s6/qmail-send/data/control/locals | 0
Rs6/geomyidae/geomyidae-run/env/HOST -> s6/qmail-send/data/control/me | 0
Rs6/geomyidae/geomyidae-run/env/HOST -> s6/qmail-send/data/control/plusdomain | 0
Rs6/geomyidae/geomyidae-run/env/HOST -> s6/qmail-send/data/control/rcpthosts | 0
As6/qmail-send/dependencies | 1+
As6/qmail-send/env/MAILDIR | 1+
As6/qmail-send/producer-for | 1+
As6/qmail-send/run | 8++++++++
Rs6/backup/backup-log/type -> s6/qmail-send/type | 0
As6/qmail-smtpd-log/consumer-for | 1+
As6/qmail-smtpd-log/run | 2++
Rs6/backup/backup-log/type -> s6/qmail-smtpd-log/type | 0
As6/qmail-smtpd/dependencies | 1+
As6/qmail-smtpd/producer-for | 1+
As6/qmail-smtpd/run | 20++++++++++++++++++++
As6/qmail-smtpd/tls | 8++++++++
Rs6/backup/backup-log/type -> s6/qmail-smtpd/type | 0
Ds6/qmail/qmail-send-log/consumer-for | 1-
Ds6/qmail/qmail-send-log/run | 2--
Ds6/qmail/qmail-send-log/type | 1-
Ds6/qmail/qmail-send-run/data/alias/.qmail-mail | 1-
Ds6/qmail/qmail-send-run/data/control/defaultdelivery | 1-
Ds6/qmail/qmail-send-run/data/control/defaultdomain | 1-
Ds6/qmail/qmail-send-run/data/control/locals | 1-
Ds6/qmail/qmail-send-run/data/control/me | 1-
Ds6/qmail/qmail-send-run/data/control/plusdomain | 1-
Ds6/qmail/qmail-send-run/data/control/rcpthosts | 1-
Ds6/qmail/qmail-send-run/dependencies | 1-
Ds6/qmail/qmail-send-run/env/MAILDIR | 1-
Ds6/qmail/qmail-send-run/producer-for | 1-
Ds6/qmail/qmail-send-run/run | 8--------
Ds6/qmail/qmail-send-run/type | 1-
Ds6/qmail/qmail-smtpd-log/consumer-for | 1-
Ds6/qmail/qmail-smtpd-log/run | 2--
Ds6/qmail/qmail-smtpd-log/type | 1-
Ds6/qmail/qmail-smtpd-run/dependencies | 1-
Ds6/qmail/qmail-smtpd-run/producer-for | 1-
Ds6/qmail/qmail-smtpd-run/run | 20--------------------
Ds6/qmail/qmail-smtpd-run/tls | 8--------
Ds6/qmail/qmail-smtpd-run/type | 1-
Ds6/qmail/qmail/contents | 4----
Ds6/qmail/qmail/type | 1-
As6/quark-log/consumer-for | 1+
As6/quark-log/run | 2++
Rs6/backup/backup-log/type -> s6/quark-log/type | 0
As6/quark-tor-log/consumer-for | 1+
As6/quark-tor-log/run | 2++
Rs6/backup/backup-log/type -> s6/quark-tor-log/type | 0
As6/quark-tor/dependencies | 1+
As6/quark-tor/producer-for | 1+
Ds6/quark-tor/quark-tor-log/consumer-for | 1-
Ds6/quark-tor/quark-tor-log/run | 2--
Ds6/quark-tor/quark-tor-log/type | 1-
Ds6/quark-tor/quark-tor-run/dependencies | 1-
Ds6/quark-tor/quark-tor-run/producer-for | 1-
Ds6/quark-tor/quark-tor-run/run | 17-----------------
Ds6/quark-tor/quark-tor-run/type | 1-
Ds6/quark-tor/quark-tor/contents | 3---
Ds6/quark-tor/quark-tor/type | 1-
As6/quark-tor/run | 17+++++++++++++++++
Rs6/backup/backup-log/type -> s6/quark-tor/type | 0
As6/quark/dependencies | 1+
As6/quark/producer-for | 1+
Ds6/quark/quark-log/consumer-for | 1-
Ds6/quark/quark-log/run | 2--
Ds6/quark/quark-log/type | 1-
Ds6/quark/quark-run/dependencies | 1-
Ds6/quark/quark-run/producer-for | 1-
Ds6/quark/quark-run/run | 14--------------
Ds6/quark/quark-run/type | 1-
Ds6/quark/quark/contents | 2--
Ds6/quark/quark/type | 1-
As6/quark/run | 14++++++++++++++
Rs6/backup/backup-log/type -> s6/quark/type | 0
As6/ratox-log/consumer-for | 1+
As6/ratox-log/run | 2++
Rs6/backup/backup-log/type -> s6/ratox-log/type | 0
As6/ratox/dependencies | 1+
As6/ratox/producer-for | 1+
Ds6/ratox/ratox-log/consumer-for | 1-
Ds6/ratox/ratox-log/run | 2--
Ds6/ratox/ratox-log/type | 1-
Ds6/ratox/ratox-run/dependencies | 1-
Ds6/ratox/ratox-run/producer-for | 1-
Ds6/ratox/ratox-run/run | 11-----------
Ds6/ratox/ratox-run/type | 1-
Ds6/ratox/ratox/contents | 2--
Ds6/ratox/ratox/type | 1-
As6/ratox/run | 11+++++++++++
Rs6/backup/backup-log/type -> s6/ratox/type | 0
As6/snooze-acme-client-log/consumer-for | 1+
As6/snooze-acme-client-log/run | 2++
Rs6/backup/backup-log/type -> s6/snooze-acme-client-log/type | 0
As6/snooze-acme-client/data/conf | 17+++++++++++++++++
As6/snooze-acme-client/dependencies | 1+
As6/snooze-acme-client/producer-for | 1+
As6/snooze-acme-client/run | 4++++
Ds6/snooze-acme-client/snooze-acme-client-log/consumer-for | 1-
Ds6/snooze-acme-client/snooze-acme-client-log/run | 2--
Ds6/snooze-acme-client/snooze-acme-client-log/type | 1-
Ds6/snooze-acme-client/snooze-acme-client-run/data/conf | 17-----------------
Ds6/snooze-acme-client/snooze-acme-client-run/dependencies | 1-
Ds6/snooze-acme-client/snooze-acme-client-run/producer-for | 1-
Ds6/snooze-acme-client/snooze-acme-client-run/run | 4----
Ds6/snooze-acme-client/snooze-acme-client-run/type | 1-
Ds6/snooze-acme-client/snooze-acme-client/contents | 3---
Ds6/snooze-acme-client/snooze-acme-client/type | 1-
Rs6/backup/backup-log/type -> s6/snooze-acme-client/type | 0
As6/snooze-tls-cert-log/consumer-for | 1+
As6/snooze-tls-cert-log/run | 2++
Rs6/backup/backup-log/type -> s6/snooze-tls-cert-log/type | 0
Rs6/djbdns-dnscache/djbdns-dnscache-run/data/ip/127.0.0.1 -> s6/snooze-tls-cert/data/... | 0
As6/snooze-tls-cert/dependencies | 1+
Rs6/geomyidae/geomyidae-run/env/HOST -> s6/snooze-tls-cert/env/HOST | 0
As6/snooze-tls-cert/producer-for | 1+
As6/snooze-tls-cert/run | 17+++++++++++++++++
Ds6/snooze-tls-cert/snooze-tls-cert-log/consumer-for | 1-
Ds6/snooze-tls-cert/snooze-tls-cert-log/run | 2--
Ds6/snooze-tls-cert/snooze-tls-cert-log/type | 1-
Ds6/snooze-tls-cert/snooze-tls-cert-run/data/... | 0
Ds6/snooze-tls-cert/snooze-tls-cert-run/dependencies | 1-
Ds6/snooze-tls-cert/snooze-tls-cert-run/env/HOST | 1-
Ds6/snooze-tls-cert/snooze-tls-cert-run/producer-for | 1-
Ds6/snooze-tls-cert/snooze-tls-cert-run/run | 17-----------------
Ds6/snooze-tls-cert/snooze-tls-cert-run/type | 1-
Ds6/snooze-tls-cert/snooze-tls-cert/contents | 3---
Ds6/snooze-tls-cert/snooze-tls-cert/type | 1-
Rs6/backup/backup-log/type -> s6/snooze-tls-cert/type | 0
As6/snooze-tls-dhparam-log/consumer-for | 1+
As6/snooze-tls-dhparam-log/run | 2++
Rs6/backup/backup-log/type -> s6/snooze-tls-dhparam-log/type | 0
As6/snooze-tls-dhparam/dependencies | 1+
As6/snooze-tls-dhparam/producer-for | 1+
As6/snooze-tls-dhparam/run | 6++++++
Ds6/snooze-tls-dhparam/snooze-tls-dhparam-log/consumer-for | 1-
Ds6/snooze-tls-dhparam/snooze-tls-dhparam-log/run | 2--
Ds6/snooze-tls-dhparam/snooze-tls-dhparam-log/type | 1-
Ds6/snooze-tls-dhparam/snooze-tls-dhparam-run/dependencies | 1-
Ds6/snooze-tls-dhparam/snooze-tls-dhparam-run/producer-for | 1-
Ds6/snooze-tls-dhparam/snooze-tls-dhparam-run/run | 6------
Ds6/snooze-tls-dhparam/snooze-tls-dhparam-run/type | 1-
Ds6/snooze-tls-dhparam/snooze-tls-dhparam/contents | 3---
Ds6/snooze-tls-dhparam/snooze-tls-dhparam/type | 1-
Rs6/backup/backup-log/type -> s6/snooze-tls-dhparam/type | 0
As6/ssh-fwd-log/consumer-for | 1+
As6/ssh-fwd-log/run | 2++
Rs6/backup/backup-log/type -> s6/ssh-fwd-log/type | 0
As6/ssh-fwd/dependencies | 1+
As6/ssh-fwd/producer-for | 1+
As6/ssh-fwd/run | 15+++++++++++++++
Ds6/ssh-fwd/ssh-fwd-log/consumer-for | 1-
Ds6/ssh-fwd/ssh-fwd-log/run | 2--
Ds6/ssh-fwd/ssh-fwd-log/type | 1-
Ds6/ssh-fwd/ssh-fwd-run/dependencies | 1-
Ds6/ssh-fwd/ssh-fwd-run/producer-for | 1-
Ds6/ssh-fwd/ssh-fwd-run/run | 15---------------
Ds6/ssh-fwd/ssh-fwd-run/type | 1-
Ds6/ssh-fwd/ssh-fwd/contents | 3---
Ds6/ssh-fwd/ssh-fwd/type | 1-
Rs6/backup/backup-log/type -> s6/ssh-fwd/type | 0
As6/tinc-log/consumer-for | 1+
As6/tinc-log/run | 2++
Rs6/backup/backup-log/type -> s6/tinc-log/type | 0
As6/tinc/data/conf.d/common.conf | 2++
As6/tinc/data/hosts/kroa | 13+++++++++++++
As6/tinc/data/hosts/nas | 13+++++++++++++
As6/tinc/data/hosts/pdmg | 12++++++++++++
As6/tinc/data/hosts/rpi | 13+++++++++++++
As6/tinc/data/hosts/t470s | 12++++++++++++
As6/tinc/data/tinc-up | 11+++++++++++
As6/tinc/dependencies | 1+
As6/tinc/producer-for | 1+
As6/tinc/run | 9+++++++++
Ds6/tinc/tinc-log/consumer-for | 1-
Ds6/tinc/tinc-log/run | 2--
Ds6/tinc/tinc-log/type | 1-
Ds6/tinc/tinc-run/data/conf.d/common.conf | 2--
Ds6/tinc/tinc-run/data/hosts/kroa | 13-------------
Ds6/tinc/tinc-run/data/hosts/nas | 13-------------
Ds6/tinc/tinc-run/data/hosts/pdmg | 12------------
Ds6/tinc/tinc-run/data/hosts/rpi | 13-------------
Ds6/tinc/tinc-run/data/hosts/t470s | 12------------
Ds6/tinc/tinc-run/data/tinc-up | 11-----------
Ds6/tinc/tinc-run/dependencies | 1-
Ds6/tinc/tinc-run/producer-for | 1-
Ds6/tinc/tinc-run/run | 9---------
Ds6/tinc/tinc-run/type | 1-
Ds6/tinc/tinc/contents | 2--
Ds6/tinc/tinc/type | 1-
Rs6/backup/backup-log/type -> s6/tinc/type | 0
As6/tinysshd-log/consumer-for | 1+
As6/tinysshd-log/run | 2++
Rs6/backup/backup-log/type -> s6/tinysshd-log/type | 0
As6/tinysshd/dependencies | 1+
As6/tinysshd/env/PORT | 1+
As6/tinysshd/producer-for | 1+
As6/tinysshd/run | 14++++++++++++++
Ds6/tinysshd/tinysshd-log/consumer-for | 1-
Ds6/tinysshd/tinysshd-log/run | 2--
Ds6/tinysshd/tinysshd-log/type | 1-
Ds6/tinysshd/tinysshd-run/dependencies | 1-
Ds6/tinysshd/tinysshd-run/env/PORT | 1-
Ds6/tinysshd/tinysshd-run/producer-for | 1-
Ds6/tinysshd/tinysshd-run/run | 14--------------
Ds6/tinysshd/tinysshd-run/type | 1-
Ds6/tinysshd/tinysshd/contents | 2--
Ds6/tinysshd/tinysshd/type | 1-
Rs6/backup/backup-log/type -> s6/tinysshd/type | 0
As6/tls-server-log/consumer-for | 1+
As6/tls-server-log/run | 2++
Rs6/backup/backup-log/type -> s6/tls-server-log/type | 0
As6/tls-server/dependencies | 1+
As6/tls-server/producer-for | 1+
As6/tls-server/run | 12++++++++++++
Ds6/tls-server/tls-server-log/consumer-for | 1-
Ds6/tls-server/tls-server-log/run | 2--
Ds6/tls-server/tls-server-log/type | 1-
Ds6/tls-server/tls-server-run/dependencies | 1-
Ds6/tls-server/tls-server-run/producer-for | 1-
Ds6/tls-server/tls-server-run/run | 12------------
Ds6/tls-server/tls-server-run/type | 1-
Ds6/tls-server/tls-server/contents | 3---
Ds6/tls-server/tls-server/type | 1-
Rs6/backup/backup-log/type -> s6/tls-server/type | 0
As6/tor-log/consumer-for | 1+
As6/tor-log/run | 2++
Rs6/backup/backup-log/type -> s6/tor-log/type | 0
As6/tor/data/conf | 26++++++++++++++++++++++++++
As6/tor/dependencies | 1+
As6/tor/producer-for | 1+
As6/tor/run | 6++++++
Ds6/tor/tor-log/consumer-for | 1-
Ds6/tor/tor-log/run | 2--
Ds6/tor/tor-log/type | 1-
Ds6/tor/tor-run/data/conf | 26--------------------------
Ds6/tor/tor-run/dependencies | 1-
Ds6/tor/tor-run/producer-for | 1-
Ds6/tor/tor-run/run | 6------
Ds6/tor/tor-run/type | 1-
Ds6/tor/tor/contents | 2--
Ds6/tor/tor/type | 1-
Rs6/backup/backup-log/type -> s6/tor/type | 0
As6/transmission-log/consumer-for | 1+
As6/transmission-log/run | 2++
Rs6/backup/backup-log/type -> s6/transmission-log/type | 0
As6/transmission/dependencies | 1+
Rs6/djbdns-dnscache/djbdns-dnscache-run/data/ip/127.0.0.1 -> s6/transmission/env/PASS | 0
As6/transmission/env/USER | 1+
As6/transmission/producer-for | 1+
As6/transmission/run | 10++++++++++
Ds6/transmission/transmission-log/consumer-for | 1-
Ds6/transmission/transmission-log/run | 2--
Ds6/transmission/transmission-log/type | 1-
Ds6/transmission/transmission-run/dependencies | 1-
Ds6/transmission/transmission-run/env/PASS | 0
Ds6/transmission/transmission-run/env/USER | 1-
Ds6/transmission/transmission-run/producer-for | 1-
Ds6/transmission/transmission-run/run | 10----------
Ds6/transmission/transmission-run/type | 1-
Ds6/transmission/transmission/contents | 2--
Ds6/transmission/transmission/type | 1-
Rs6/backup/backup-log/type -> s6/transmission/type | 0
As6/u9fs-log/consumer-for | 1+
As6/u9fs-log/run | 2++
Rs6/backup/backup-log/type -> s6/u9fs-log/type | 0
As6/u9fs-mount-log/consumer-for | 1+
As6/u9fs-mount-log/run | 2++
Rs6/backup/backup-log/type -> s6/u9fs-mount-log/type | 0
As6/u9fs-mount/dependencies | 1+
As6/u9fs-mount/down | 4++++
As6/u9fs-mount/producer-for | 1+
Rs6/backup/backup-log/type -> s6/u9fs-mount/type | 0
Ds6/u9fs-mount/u9fs-mount-log/consumer-for | 1-
Ds6/u9fs-mount/u9fs-mount-log/run | 2--
Ds6/u9fs-mount/u9fs-mount-log/type | 1-
Ds6/u9fs-mount/u9fs-mount-run/dependencies | 1-
Ds6/u9fs-mount/u9fs-mount-run/down | 4----
Ds6/u9fs-mount/u9fs-mount-run/producer-for | 1-
Ds6/u9fs-mount/u9fs-mount-run/type | 1-
Ds6/u9fs-mount/u9fs-mount-run/up | 5-----
Ds6/u9fs-mount/u9fs-mount/contents | 3---
Ds6/u9fs-mount/u9fs-mount/type | 1-
As6/u9fs-mount/up | 5+++++
As6/u9fs/dependencies | 1+
As6/u9fs/producer-for | 1+
As6/u9fs/run | 8++++++++
Rs6/backup/backup-log/type -> s6/u9fs/type | 0
Ds6/u9fs/u9fs-log/consumer-for | 1-
Ds6/u9fs/u9fs-log/run | 2--
Ds6/u9fs/u9fs-log/type | 1-
Ds6/u9fs/u9fs-run/dependencies | 1-
Ds6/u9fs/u9fs-run/producer-for | 1-
Ds6/u9fs/u9fs-run/run | 8--------
Ds6/u9fs/u9fs-run/type | 1-
Ds6/u9fs/u9fs/contents | 2--
Ds6/u9fs/u9fs/type | 1-
As6/venti-log/consumer-for | 1+
As6/venti-log/run | 2++
Rs6/backup/backup-log/type -> s6/venti-log/type | 0
As6/venti/data/conf | 8++++++++
As6/venti/data/fmt | 9+++++++++
As6/venti/dependencies | 1+
As6/venti/producer-for | 1+
As6/venti/run | 11+++++++++++
Rs6/backup/backup-log/type -> s6/venti/type | 0
Ds6/venti/venti-log/consumer-for | 1-
Ds6/venti/venti-log/run | 2--
Ds6/venti/venti-log/type | 1-
Ds6/venti/venti-run/data/conf | 8--------
Ds6/venti/venti-run/data/fmt | 9---------
Ds6/venti/venti-run/dependencies | 1-
Ds6/venti/venti-run/producer-for | 1-
Ds6/venti/venti-run/run | 11-----------
Ds6/venti/venti-run/type | 1-
Ds6/venti/venti/contents | 2--
Ds6/venti/venti/type | 1-
685 files changed, 775 insertions(+), 961 deletions(-)

diff --git a/bin/.s6-rc-recompile.swp b/bin/.s6-rc-recompile.swp Binary files differ. diff --git a/bin/.s6-rc-start.swp b/bin/.s6-rc-start.swp Binary files differ. diff --git a/bin/s6-rc-add b/bin/s6-rc-add @@ -1,7 +0,0 @@ -#!/usr/bin/env execlineb - -importas svc 1 -if { test -d /etc/s6-rc/$svc } -if { redirfd -a 1 /var/s6-rc/list echo $svc } -pipeline { grep -v "^ *$" /var/s6-rc/list } - sort -u -o /var/s6-rc/list diff --git a/bin/s6-rc-del b/bin/s6-rc-del @@ -1,6 +0,0 @@ -#!/usr/bin/env execlineb -# remove a service from the service list and update the compiled and live state - -importas svc 1 -foreground { redirfd -w 1 /var/s6-rc/list.grep grep -vFx $svc /var/s6-rc/list } -mv /var/s6-rc/list.grep /var/s6-rc/list diff --git a/bin/s6-rc-recompile b/bin/s6-rc-recompile @@ -1,14 +1,8 @@ #!/usr/bin/env execlineb -if { mkdir -p /var/s6-rc/... } cd /etc/s6-rc -backtick -n clock { s6-clock } -backtick list { cat /var/s6-rc/list } -multisubstitute { - importas clock clock - importas -s -d "\n" list list -} -if { backtick x { wc -w /var/s6-rc/list } } -if { s6-rc-compile /var/s6-rc/compiled-$clock /etc/s6-rc/$list } -if { ln -sf /var/s6-rc/compiled-$clock /var/s6-rc/.../compiled } +backtick -n t { s6-clock } +importas t t +if { s6-rc-compile /var/s6-rc/compiled-$t /etc/s6-rc/source } +if { ln -sf /var/s6-rc/compiled-$t /var/s6-rc/source/compiled } if { mv -f /var/s6-rc/.../compiled /var/s6-rc } diff --git a/bin/s6-rc-start b/bin/s6-rc-start @@ -2,11 +2,11 @@ if { rm -rf /var/s6-rc/scandir } if { mkdir -p /var/s6-rc/scandir } -echo pipeline { +pipeline { fdmove -c 3 1 pipeline { fdmove -c 2 1 s6-svscan -d 3 /var/s6-rc/scandir } s6-log t /var/log/s6-svscan } - foreground { sed "s,^,done-," } + foreground { sed q } if { s6-rc-recompile } s6-rc-init -l /var/s6-rc/live -c /var/s6-rc/compiled /var/s6-rc/scandir diff --git a/pack/execline/2.5.0.1/build b/pack/execline/2.5.0.1/build @@ -0,0 +1,9 @@ +#!/bin/sh -ex + +./configure \ + --prefix="$PREFIX" \ + --with-sysdeps=/opt/libskarnet/cur/lib/skalibs/sysdeps \ + --with-include=/opt/libskarnet/cur/include \ + --with-lib=/opt/libskarnet/cur/lib/skalibs + +gmake install diff --git a/pack/execline/2.5.0.1/dep b/pack/execline/2.5.0.1/dep @@ -0,0 +1,2 @@ +gmake/cur +libskarnet/cur diff --git a/pack/execline/2.5.0.1/tar b/pack/execline/2.5.0.1/tar @@ -0,0 +1 @@ +http://skarnet.org/software/execline/execline-2.5.0.1.tar.gz diff --git a/pack/execline/cur b/pack/execline/cur @@ -1 +1 @@ -2.5.0.0- \ No newline at end of file +2.5.0.1+ \ No newline at end of file diff --git a/pack/libskarnet/2.7.0.0/build b/pack/libskarnet/2.7.0.0/build @@ -0,0 +1,4 @@ +#!/bin/sh -ex + +./configure --prefix="$PREFIX" +gmake install diff --git a/pack/libskarnet/2.7.0.0/dep b/pack/libskarnet/2.7.0.0/dep @@ -0,0 +1 @@ +gmake/cur diff --git a/pack/libskarnet/2.7.0.0/tar b/pack/libskarnet/2.7.0.0/tar @@ -0,0 +1 @@ +http://skarnet.org/software/skalibs/skalibs-2.7.0.0.tar.gz diff --git a/pack/openvpn/2.4.6/.build.swp b/pack/openvpn/2.4.6/.build.swp Binary files differ. diff --git a/pack/s6/2.7.2.0/build b/pack/s6/2.7.2.0/build @@ -0,0 +1,11 @@ +#!/bin/sh -ex + +./configure \ + --prefix="$PREFIX" \ + --with-sysdeps=/opt/libskarnet/2.7.0.0/lib/skalibs/sysdeps \ + --with-include=/opt/libskarnet/2.7.0.0/include \ + --with-lib=/opt/libskarnet/2.7.0.0/lib/skalibs \ + --with-include=/opt/execline/2.5.0.1/include \ + --with-lib=/opt/execline/2.5.0.1/lib/execline + +gmake install diff --git a/pack/s6/2.7.2.0/dep b/pack/s6/2.7.2.0/dep @@ -0,0 +1,3 @@ +gmake/cur +execline/2.5.0.1 +libskarnet/2.7.0.0 diff --git a/pack/s6/2.7.2.0/tar b/pack/s6/2.7.2.0/tar @@ -0,0 +1 @@ +http://skarnet.org/software/s6/s6-2.7.2.0.tar.gz diff --git a/pack/s6/cur b/pack/s6/cur @@ -1 +1 @@ -2.7.1.1- \ No newline at end of file +2.7.2.0+ \ No newline at end of file diff --git a/s6/backup/backup-log/consumer-for b/s6/backup-log/consumer-for diff --git a/s6/backup/backup-log/run b/s6/backup-log/run diff --git a/s6/backup/backup-log/type b/s6/backup-log/type diff --git a/s6/backup/backup/contents b/s6/backup/backup/contents @@ -1,2 +0,0 @@ -backup-log -backup-run diff --git a/s6/backup/backup/type b/s6/backup/backup/type @@ -1 +0,0 @@ -bundle diff --git a/s6/backup/backup-run/dependencies b/s6/backup/dependencies diff --git a/s6/backup/backup-run/producer-for b/s6/backup/producer-for diff --git a/s6/backup/backup-run/run b/s6/backup/run diff --git a/s6/backup/backup-run/type b/s6/backup/type diff --git a/s6/btpd/btpd-log/consumer-for b/s6/btpd-log/consumer-for diff --git a/s6/btpd/btpd-log/run b/s6/btpd-log/run diff --git a/s6/btpd/btpd-log/type b/s6/btpd-log/type diff --git a/s6/btpd/btpd/contents b/s6/btpd/btpd/contents @@ -1,2 +0,0 @@ -btpd-log -btpd-run diff --git a/s6/btpd/btpd/type b/s6/btpd/btpd/type @@ -1 +0,0 @@ -bundle diff --git a/s6/btpd/btpd-run/dependencies b/s6/btpd/dependencies diff --git a/s6/btpd/btpd-run/producer-for b/s6/btpd/producer-for diff --git a/s6/btpd/btpd-run/run b/s6/btpd/run diff --git a/s6/btpd/btpd-run/type b/s6/btpd/type diff --git a/s6/cherrymusic/cherrymusic-log/consumer-for b/s6/cherrymusic-log/consumer-for diff --git a/s6/cherrymusic/cherrymusic-log/run b/s6/cherrymusic-log/run diff --git a/s6/cherrymusic/cherrymusic-log/type b/s6/cherrymusic-log/type diff --git a/s6/cherrymusic/cherrymusic/contents b/s6/cherrymusic/cherrymusic/contents @@ -1,2 +0,0 @@ -cherrymusic-log -cherrymusic-run diff --git a/s6/cherrymusic/cherrymusic/type b/s6/cherrymusic/cherrymusic/type @@ -1 +0,0 @@ -bundle diff --git a/s6/cherrymusic/cherrymusic-run/dependencies b/s6/cherrymusic/dependencies diff --git a/s6/cherrymusic/cherrymusic-run/producer-for b/s6/cherrymusic/producer-for diff --git a/s6/cherrymusic/cherrymusic-run/run b/s6/cherrymusic/run diff --git a/s6/cherrymusic/cherrymusic-run/type b/s6/cherrymusic/type diff --git a/s6/collectd/collectd-log/consumer-for b/s6/collectd-log/consumer-for diff --git a/s6/collectd/collectd-log/run b/s6/collectd-log/run diff --git a/s6/collectd/collectd-log/type b/s6/collectd-log/type diff --git a/s6/collectd/collectd/contents b/s6/collectd/collectd/contents @@ -1,2 +0,0 @@ -collectd-log -collectd-run diff --git a/s6/collectd/collectd/type b/s6/collectd/collectd/type @@ -1 +0,0 @@ -bundle diff --git a/s6/collectd/collectd-run/data/conf b/s6/collectd/data/conf diff --git a/s6/collectd/collectd-run/dependencies b/s6/collectd/dependencies diff --git a/s6/collectd/collectd-run/producer-for b/s6/collectd/producer-for diff --git a/s6/collectd/collectd-run/run b/s6/collectd/run diff --git a/s6/collectd/collectd-run/type b/s6/collectd/type diff --git a/s6/djbdns-axfrdns/djbdns-axfrdns-log/consumer-for b/s6/djbdns-axfrdns-log/consumer-for diff --git a/s6/djbdns-axfrdns/djbdns-axfrdns-log/run b/s6/djbdns-axfrdns-log/run diff --git a/s6/djbdns-axfrdns/djbdns-axfrdns-log/type b/s6/djbdns-axfrdns-log/type diff --git a/s6/djbdns-axfrdns/djbdns-axfrdns-run/dependencies b/s6/djbdns-axfrdns/dependencies diff --git a/s6/djbdns-axfrdns/djbdns-axfrdns/contents b/s6/djbdns-axfrdns/djbdns-axfrdns/contents @@ -1,3 +0,0 @@ -djbdns-axfrdns -djbdns-axfrdns-log -djbdns-axfrdns-run diff --git a/s6/djbdns-axfrdns/djbdns-axfrdns/type b/s6/djbdns-axfrdns/djbdns-axfrdns/type @@ -1 +0,0 @@ -bundle diff --git a/s6/djbdns-axfrdns/djbdns-axfrdns-run/env/ROOT b/s6/djbdns-axfrdns/env/ROOT diff --git a/s6/djbdns-axfrdns/djbdns-axfrdns-run/producer-for b/s6/djbdns-axfrdns/producer-for diff --git a/s6/djbdns-axfrdns/djbdns-axfrdns-run/run b/s6/djbdns-axfrdns/run diff --git a/s6/djbdns-axfrdns/djbdns-axfrdns-run/type b/s6/djbdns-axfrdns/type diff --git a/s6/djbdns-dnscache/djbdns-dnscache-log/consumer-for b/s6/djbdns-dnscache-log/consumer-for diff --git a/s6/djbdns-dnscache/djbdns-dnscache-log/run b/s6/djbdns-dnscache-log/run diff --git a/s6/djbdns-dnscache/djbdns-dnscache-log/type b/s6/djbdns-dnscache-log/type diff --git a/s6/djbdns-dnscache/djbdns-dnscache-run/data/ip/127.0.0.1 b/s6/djbdns-dnscache/data/ip/127.0.0.1 diff --git a/s6/djbdns-dnscache/djbdns-dnscache-run/data/servers/@ b/s6/djbdns-dnscache/data/servers/@ diff --git a/s6/djbdns-dnscache/djbdns-dnscache-run/dependencies b/s6/djbdns-dnscache/dependencies diff --git a/s6/djbdns-dnscache/djbdns-dnscache/contents b/s6/djbdns-dnscache/djbdns-dnscache/contents @@ -1,3 +0,0 @@ -djbdns-dnscache -djbdns-dnscache-log -djbdns-dnscache-run diff --git a/s6/djbdns-dnscache/djbdns-dnscache/type b/s6/djbdns-dnscache/djbdns-dnscache/type @@ -1 +0,0 @@ -bundle diff --git a/s6/djbdns-dnscache/djbdns-dnscache-run/env/CACHESIZE b/s6/djbdns-dnscache/env/CACHESIZE diff --git a/s6/djbdns-dnscache/djbdns-dnscache-run/env/DATALIMIT b/s6/djbdns-dnscache/env/DATALIMIT diff --git a/s6/djbdns-dnscache/djbdns-dnscache-run/env/IP b/s6/djbdns-dnscache/env/IP diff --git a/s6/djbdns-dnscache/djbdns-dnscache-run/env/IPSEND b/s6/djbdns-dnscache/env/IPSEND diff --git a/s6/djbdns-dnscache/djbdns-dnscache-run/env/ROOT b/s6/djbdns-dnscache/env/ROOT diff --git a/s6/djbdns-dnscache/djbdns-dnscache-run/producer-for b/s6/djbdns-dnscache/producer-for diff --git a/s6/djbdns-dnscache/djbdns-dnscache-run/run b/s6/djbdns-dnscache/run diff --git a/s6/djbdns-dnscache/djbdns-dnscache-run/type b/s6/djbdns-dnscache/type diff --git a/s6/djbdns-tinydns/djbdns-tinydns-log/consumer-for b/s6/djbdns-tinydns-log/consumer-for diff --git a/s6/djbdns-tinydns/djbdns-tinydns-log/run b/s6/djbdns-tinydns-log/run diff --git a/s6/djbdns-tinydns/djbdns-tinydns-log/type b/s6/djbdns-tinydns-log/type diff --git a/s6/djbdns-tinydns/djbdns-tinydns-run/data/Makefile b/s6/djbdns-tinydns/data/Makefile diff --git a/s6/djbdns-tinydns/djbdns-tinydns-run/data/add-alias b/s6/djbdns-tinydns/data/add-alias diff --git a/s6/djbdns-tinydns/djbdns-tinydns-run/data/add-childns b/s6/djbdns-tinydns/data/add-childns diff --git a/s6/djbdns-tinydns/djbdns-tinydns-run/data/add-host b/s6/djbdns-tinydns/data/add-host diff --git a/s6/djbdns-tinydns/djbdns-tinydns-run/data/add-mx b/s6/djbdns-tinydns/data/add-mx diff --git a/s6/djbdns-tinydns/djbdns-tinydns-run/data/add-ns b/s6/djbdns-tinydns/data/add-ns diff --git a/s6/djbdns-tinydns/djbdns-tinydns-run/data/data b/s6/djbdns-tinydns/data/data diff --git a/s6/djbdns-tinydns/djbdns-tinydns-run/dependencies b/s6/djbdns-tinydns/dependencies diff --git a/s6/djbdns-tinydns/djbdns-tinydns/contents b/s6/djbdns-tinydns/djbdns-tinydns/contents @@ -1,2 +0,0 @@ -djbdns-tinydns-log -djbdns-tinydns-run diff --git a/s6/djbdns-tinydns/djbdns-tinydns/type b/s6/djbdns-tinydns/djbdns-tinydns/type @@ -1 +0,0 @@ -bundle diff --git a/s6/djbdns-tinydns/djbdns-tinydns-run/env/IP b/s6/djbdns-tinydns/env/IP diff --git a/s6/djbdns-tinydns/djbdns-tinydns-run/env/ROOT b/s6/djbdns-tinydns/env/ROOT diff --git a/s6/djbdns-tinydns/djbdns-tinydns-run/producer-for b/s6/djbdns-tinydns/producer-for diff --git a/s6/djbdns-tinydns/djbdns-tinydns-run/run b/s6/djbdns-tinydns/run diff --git a/s6/djbdns-tinydns/djbdns-tinydns-run/type b/s6/djbdns-tinydns/type diff --git a/s6/djbdns-walldns/djbdns-walldns-log/consumer-for b/s6/djbdns-walldns-log/consumer-for diff --git a/s6/djbdns-walldns/djbdns-walldns-log/run b/s6/djbdns-walldns-log/run diff --git a/s6/djbdns-walldns/djbdns-walldns-log/type b/s6/djbdns-walldns-log/type diff --git a/s6/djbdns-walldns/djbdns-walldns-run/dependencies b/s6/djbdns-walldns/dependencies diff --git a/s6/djbdns-walldns/djbdns-walldns/contents b/s6/djbdns-walldns/djbdns-walldns/contents @@ -1,3 +0,0 @@ -djbdns-walldns -djbdns-walldns-log -djbdns-walldns-run diff --git a/s6/djbdns-walldns/djbdns-walldns/type b/s6/djbdns-walldns/djbdns-walldns/type @@ -1 +0,0 @@ -bundle diff --git a/s6/djbdns-walldns/djbdns-walldns-run/env/IP b/s6/djbdns-walldns/env/IP diff --git a/s6/djbdns-walldns/djbdns-walldns-run/env/ROOT b/s6/djbdns-walldns/env/ROOT diff --git a/s6/djbdns-walldns/djbdns-walldns-run/producer-for b/s6/djbdns-walldns/producer-for diff --git a/s6/djbdns-walldns/djbdns-walldns-run/run b/s6/djbdns-walldns/run diff --git a/s6/djbdns-walldns/djbdns-walldns-run/type b/s6/djbdns-walldns/type diff --git a/s6/fossil/fossil-log/consumer-for b/s6/fossil-log/consumer-for diff --git a/s6/fossil/fossil-log/run b/s6/fossil-log/run diff --git a/s6/fossil/fossil-log/type b/s6/fossil-log/type diff --git a/s6/fossil/fossil-run/dependencies b/s6/fossil/dependencies diff --git a/s6/fossil/fossil/contents b/s6/fossil/fossil/contents @@ -1,2 +0,0 @@ -fossil-log -fossil-run diff --git a/s6/fossil/fossil/type b/s6/fossil/fossil/type @@ -1 +0,0 @@ -bundle diff --git a/s6/fossil/fossil-run/producer-for b/s6/fossil/producer-for diff --git a/s6/fossil/fossil-run/run b/s6/fossil/run diff --git a/s6/fossil/fossil-run/type b/s6/fossil/type diff --git a/s6/ftpd/ftpd-log/consumer-for b/s6/ftpd-log/consumer-for diff --git a/s6/ftpd/ftpd-log/run b/s6/ftpd-log/run diff --git a/s6/ftpd/ftpd-log/type b/s6/ftpd-log/type diff --git a/s6/ftpd/ftpd-run/dependencies b/s6/ftpd/dependencies diff --git a/s6/ftpd/ftpd/contents b/s6/ftpd/ftpd/contents @@ -1,2 +0,0 @@ -ftpd-log -ftpd-run diff --git a/s6/ftpd/ftpd/type b/s6/ftpd/ftpd/type @@ -1 +0,0 @@ -bundle diff --git a/s6/ftpd/ftpd-run/producer-for b/s6/ftpd/producer-for diff --git a/s6/ftpd/ftpd-run/run b/s6/ftpd/run diff --git a/s6/ftpd/ftpd-run/type b/s6/ftpd/type diff --git a/s6/geomyidae/geomyidae-log/consumer-for b/s6/geomyidae-log/consumer-for diff --git a/s6/geomyidae/geomyidae-log/run b/s6/geomyidae-log/run diff --git a/s6/geomyidae/geomyidae-log/type b/s6/geomyidae-log/type diff --git a/s6/geomyidae/geomyidae-run/dependencies b/s6/geomyidae/dependencies diff --git a/s6/geomyidae/geomyidae-run/env/BASE b/s6/geomyidae/env/BASE diff --git a/s6/geomyidae/geomyidae-run/env/HOST b/s6/geomyidae/env/HOST diff --git a/s6/geomyidae/geomyidae-run/env/PORT b/s6/geomyidae/env/PORT diff --git a/s6/geomyidae/geomyidae/contents b/s6/geomyidae/geomyidae/contents @@ -1,2 +0,0 @@ -geomyidae-log -geomyidae-run diff --git a/s6/geomyidae/geomyidae/type b/s6/geomyidae/geomyidae/type @@ -1 +0,0 @@ -bundle diff --git a/s6/geomyidae/geomyidae-run/producer-for b/s6/geomyidae/producer-for diff --git a/s6/geomyidae/geomyidae-run/run b/s6/geomyidae/run diff --git a/s6/geomyidae/geomyidae-run/type b/s6/geomyidae/type diff --git a/s6/git-daemon/git-daemon-log/consumer-for b/s6/git-daemon-log/consumer-for diff --git a/s6/git-daemon/git-daemon-log/run b/s6/git-daemon-log/run diff --git a/s6/git-daemon/git-daemon-log/type b/s6/git-daemon-log/type diff --git a/s6/git-daemon/git-daemon-run/dependencies b/s6/git-daemon/dependencies diff --git a/s6/git-daemon/git-daemon/contents b/s6/git-daemon/git-daemon/contents @@ -1,3 +0,0 @@ -git-daemon -git-daemon-log -git-daemon-run diff --git a/s6/git-daemon/git-daemon/type b/s6/git-daemon/git-daemon/type @@ -1 +0,0 @@ -bundle diff --git a/s6/git-daemon/git-daemon-run/producer-for b/s6/git-daemon/producer-for diff --git a/s6/git-daemon/git-daemon-run/run b/s6/git-daemon/run diff --git a/s6/git-daemon/git-daemon-run/type b/s6/git-daemon/type diff --git a/s6/git-mirror/git-mirror-log/consumer-for b/s6/git-mirror-log/consumer-for diff --git a/s6/git-mirror/git-mirror-log/run b/s6/git-mirror-log/run diff --git a/s6/git-mirror/git-mirror-log/type b/s6/git-mirror-log/type diff --git a/s6/git-mirror/git-mirror-run/data/mirror b/s6/git-mirror/data/mirror diff --git a/s6/git-mirror/git-mirror-run/dependencies b/s6/git-mirror/dependencies diff --git a/s6/git-mirror/git-mirror/contents b/s6/git-mirror/git-mirror/contents @@ -1,3 +0,0 @@ -git-mirror -git-mirror-log -git-mirror-run diff --git a/s6/git-mirror/git-mirror/type b/s6/git-mirror/git-mirror/type @@ -1 +0,0 @@ -bundle diff --git a/s6/git-mirror/git-mirror-run/producer-for b/s6/git-mirror/producer-for diff --git a/s6/git-mirror/git-mirror-run/run b/s6/git-mirror/run diff --git a/s6/git-mirror/git-mirror-run/type b/s6/git-mirror/type diff --git a/s6/gproxy/gproxy-log/consumer-for b/s6/gproxy-log/consumer-for diff --git a/s6/gproxy/gproxy-log/run b/s6/gproxy-log/run diff --git a/s6/gproxy/gproxy-log/type b/s6/gproxy-log/type diff --git a/s6/gproxy/gproxy-run/data/gproxy b/s6/gproxy/data/gproxy diff --git a/s6/gproxy/gproxy-run/dependencies b/s6/gproxy/dependencies diff --git a/s6/gproxy/gproxy/contents b/s6/gproxy/gproxy/contents @@ -1,2 +0,0 @@ -gproxy-log -gproxy-run diff --git a/s6/gproxy/gproxy/type b/s6/gproxy/gproxy/type @@ -1 +0,0 @@ -bundle diff --git a/s6/gproxy/gproxy-run/producer-for b/s6/gproxy/producer-for diff --git a/s6/gproxy/gproxy-run/run b/s6/gproxy/run diff --git a/s6/gproxy/gproxy-run/type b/s6/gproxy/type diff --git a/s6/httpd/httpd-log/consumer-for b/s6/httpd-log/consumer-for diff --git a/s6/httpd/httpd-log/run b/s6/httpd-log/run diff --git a/s6/httpd/httpd-log/type b/s6/httpd-log/type diff --git a/s6/httpd/httpd-run/dependencies b/s6/httpd/dependencies diff --git a/s6/httpd/httpd/contents b/s6/httpd/httpd/contents @@ -1,2 +0,0 @@ -httpd-log -httpd-run diff --git a/s6/httpd/httpd/type b/s6/httpd/httpd/type @@ -1 +0,0 @@ -bundle diff --git a/s6/httpd/httpd-run/producer-for b/s6/httpd/producer-for diff --git a/s6/httpd/httpd-run/run b/s6/httpd/run diff --git a/s6/httpd/httpd-run/type b/s6/httpd/type diff --git a/s6/ii-tcp/ii-tcp-log/consumer-for b/s6/ii-tcp-log/consumer-for diff --git a/s6/ii-tcp/ii-tcp-log/run b/s6/ii-tcp-log/run diff --git a/s6/ii-tcp/ii-tcp-log/type b/s6/ii-tcp-log/type diff --git a/s6/ii-tcp/ii-tcp-run/dependencies b/s6/ii-tcp/dependencies diff --git a/s6/ii-tcp/ii-tcp-run/env/HOST b/s6/ii-tcp/env/HOST diff --git a/s6/ii-tcp/ii-tcp-run/env/NAME b/s6/ii-tcp/env/NAME diff --git a/s6/ii-tcp/ii-tcp-run/env/NICK b/s6/ii-tcp/env/NICK diff --git a/s6/ii-tcp/ii-tcp-run/env/PASS b/s6/ii-tcp/env/PASS diff --git a/s6/ii-tcp/ii-tcp-run/env/PORT b/s6/ii-tcp/env/PORT diff --git a/s6/ii-tcp/ii-tcp-run/env/USER b/s6/ii-tcp/env/USER diff --git a/s6/ii-tcp/ii-tcp-run/finish b/s6/ii-tcp/finish diff --git a/s6/ii-tcp/ii-tcp/contents b/s6/ii-tcp/ii-tcp/contents @@ -1,3 +0,0 @@ -ii-tcp -ii-tcp-log -ii-tcp-run diff --git a/s6/ii-tcp/ii-tcp/type b/s6/ii-tcp/ii-tcp/type @@ -1 +0,0 @@ -bundle diff --git a/s6/ii-tcp/ii-tcp-run/producer-for b/s6/ii-tcp/producer-for diff --git a/s6/ii-tcp/ii-tcp-run/run b/s6/ii-tcp/run diff --git a/s6/ii-tcp/ii-tcp-run/type b/s6/ii-tcp/type diff --git a/s6/ii-tls/ii-tls-log/consumer-for b/s6/ii-tls-log/consumer-for diff --git a/s6/ii-tls/ii-tls-log/run b/s6/ii-tls-log/run diff --git a/s6/ii-tls/ii-tls-log/type b/s6/ii-tls-log/type diff --git a/s6/ii-tls/ii-tls-run/data/.empty b/s6/ii-tls/data/.empty diff --git a/s6/ii-tls/ii-tls-run/dependencies b/s6/ii-tls/dependencies diff --git a/s6/ii-tls/ii-tls-run/env/CAFILE b/s6/ii-tls/env/CAFILE diff --git a/s6/ii-tls/ii-tls-run/env/HOST b/s6/ii-tls/env/HOST diff --git a/s6/ii-tls/ii-tls-run/env/NAME b/s6/ii-tls/env/NAME diff --git a/s6/ii-tls/ii-tls-run/env/NICK b/s6/ii-tls/env/NICK diff --git a/s6/ii-tls/ii-tls-run/env/PASS b/s6/ii-tls/env/PASS diff --git a/s6/ii-tls/ii-tls-run/env/PORT b/s6/ii-tls/env/PORT diff --git a/s6/ii-tls/ii-tls-run/env/USER b/s6/ii-tls/env/USER diff --git a/s6/ii-tls/ii-tls-run/finish b/s6/ii-tls/finish diff --git a/s6/ii-tls/ii-tls/contents b/s6/ii-tls/ii-tls/contents @@ -1,3 +0,0 @@ -ii-tls -ii-tls-log -ii-tls-run diff --git a/s6/ii-tls/ii-tls/type b/s6/ii-tls/ii-tls/type @@ -1 +0,0 @@ -bundle diff --git a/s6/ii-tls/ii-tls-run/producer-for b/s6/ii-tls/producer-for diff --git a/s6/ii-tls/ii-tls-run/run b/s6/ii-tls/run diff --git a/s6/ii-tls/ii-tls-run/type b/s6/ii-tls/type diff --git a/s6/mpop/mpop-log/consumer-for b/s6/mpop-log/consumer-for diff --git a/s6/mpop/mpop-log/run b/s6/mpop-log/run diff --git a/s6/backup/backup-log/type b/s6/mpop-log/type diff --git a/s6/mpop/data/mpoprc b/s6/mpop/data/mpoprc @@ -0,0 +1,15 @@ +defaults +tls on +tls_certcheck off +tls_starttls off +uidls_file ~/mail/%U + +account mail@josuah.net +host mail.gandi.net +user mail@josuah.net +auth user +passwordeval "enchive -a$((3600*12)) extract /mnt/key/vault/mpop /dev/stdout" +delivery maildir ~/mail/INBOX +keep on + +account default : mail@josuah.net diff --git a/s6/mpop/dependencies b/s6/mpop/dependencies @@ -0,0 +1 @@ +mpop-log diff --git a/s6/ii-tcp/ii-tcp-run/env/NICK b/s6/mpop/env/USER diff --git a/s6/mpop/mpop-log/type b/s6/mpop/mpop-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/mpop/mpop-run/data/mpoprc b/s6/mpop/mpop-run/data/mpoprc @@ -1,15 +0,0 @@ -defaults -tls on -tls_certcheck off -tls_starttls off -uidls_file ~/mail/%U - -account mail@josuah.net -host mail.gandi.net -user mail@josuah.net -auth user -passwordeval "enchive -a$((3600*12)) extract /mnt/key/vault/mpop /dev/stdout" -delivery maildir ~/mail/INBOX -keep on - -account default : mail@josuah.net diff --git a/s6/mpop/mpop-run/dependencies b/s6/mpop/mpop-run/dependencies @@ -1 +0,0 @@ -mpop-log diff --git a/s6/mpop/mpop-run/env/USER b/s6/mpop/mpop-run/env/USER @@ -1 +0,0 @@ -josuah diff --git a/s6/mpop/mpop-run/producer-for b/s6/mpop/mpop-run/producer-for @@ -1 +0,0 @@ -mpop-log diff --git a/s6/mpop/mpop-run/run b/s6/mpop/mpop-run/run @@ -1,16 +0,0 @@ -#!/local/bin/execlineb -P -# update pop mail using mpop - -fdmove -c 2 1 - -s6-envdir env -importas USER USER - -redirfd -r 0 ./data/mpoprc # it might not be readable as ${USER} -s6-setuidgid $USER - -backtick -n HOME { homeof $USER } -importas HOME HOME -cd $HOME - -snooze -M /5 -H * mpop -C /dev/stdin diff --git a/s6/mpop/mpop-run/type b/s6/mpop/mpop-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/mpop/mpop/contents b/s6/mpop/mpop/contents @@ -1,2 +0,0 @@ -mpop-log -mpop-run diff --git a/s6/mpop/mpop/type b/s6/mpop/mpop/type @@ -1 +0,0 @@ -bundle diff --git a/s6/mpop/producer-for b/s6/mpop/producer-for @@ -0,0 +1 @@ +mpop-log diff --git a/s6/mpop/run b/s6/mpop/run @@ -0,0 +1,16 @@ +#!/local/bin/execlineb -P +# update pop mail using mpop + +fdmove -c 2 1 + +s6-envdir env +importas USER USER + +redirfd -r 0 ./data/mpoprc # it might not be readable as ${USER} +s6-setuidgid $USER + +backtick -n HOME { homeof $USER } +importas HOME HOME +cd $HOME + +snooze -M /5 -H * mpop -C /dev/stdin diff --git a/s6/backup/backup-log/type b/s6/mpop/type diff --git a/s6/ngircd-log/consumer-for b/s6/ngircd-log/consumer-for @@ -0,0 +1 @@ +ngircd-run 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-run diff --git a/s6/backup/backup-log/type b/s6/ngircd-log/type diff --git a/s6/ngircd/data/conf b/s6/ngircd/data/conf @@ -0,0 +1,45 @@ +[Global] + Name = XXX + AdminInfo1 = josuah + AdminInfo2 = XXX + AdminEMail = mail@josuah.net + Info = XXX + MotdFile = motd + Network = XXX + Ports = 6697 + +[Limits] + MaxConnections = 128 + MaxConnectionsIP = 20 + MaxJoins = 50 + MaxNickLength = 10 + PingTimeout = 120 + PongTimeout = 120 + +[Options] + AllowedChannelTypes = #&+ + AllowRemoteOper = yes + CloakHost = %x%x + CloakHostSalt = XXX + DefaultUserModes = iC + DNS = no + Ident = no + MorePrivacy = yes + OperCanUseMode = yes + OperChanPAutoOp = yes + +[SSL] + Ports = 6697 + CertFile = pem + DHFile = dhp + KeyFile = key + KeyFilePassword = XXX + CipherList = AES+RSA + +[Operator] + Name = josuah + Password = XXX + Mask = josuah!XXX + +[Server] + XXX diff --git a/s6/ngircd/data/motd b/s6/ngircd/data/motd @@ -0,0 +1,37 @@ +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ +@ This server is not ready yet, visit https://cyberia.uptime.party/ @ +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + + __,--- + ,-' / + / , , /_ _ __ . ___ + / / / / \ ,'_| /' / ,' / + \__\ /_ /__,'_\__ / __ /__\__/___ __ _ + \/ + ____/ + +Listening on ports: 6697 (TLS) +irc.cyberia.systems + +Welcome to Cyberia +We're stoked you are here +Love Lain or be lame + +Rules: + - No spamming or flooding + - No clones or malicious bots + - No takeovers + - No distribution of child pornography + - Do not harass other users + - Clients must respond to VERSION requests + + We reserve the right to remove your access to this server and network + at any time at our opers discretion. + +First steps: + - Find an existing IRC channel on this network: /list + - Join an IRC channel or create your own: /join <#channel> + +Getting help: + - For helpdesk on using IRC: /join #help + - For network issues, status and server operator queries: /join #noc diff --git a/s6/ngircd/data/tls b/s6/ngircd/data/tls @@ -0,0 +1,8 @@ +#!/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/ngircd/dependencies b/s6/ngircd/dependencies @@ -0,0 +1 @@ +ngircd-log diff --git a/s6/ngircd/ngircd-log/consumer-for b/s6/ngircd/ngircd-log/consumer-for @@ -1 +0,0 @@ -ngircd-run diff --git a/s6/ngircd/ngircd-log/run b/s6/ngircd/ngircd-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/ngircd-run diff --git a/s6/ngircd/ngircd-log/type b/s6/ngircd/ngircd-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/ngircd/ngircd-run/data/conf b/s6/ngircd/ngircd-run/data/conf @@ -1,45 +0,0 @@ -[Global] - Name = XXX - AdminInfo1 = josuah - AdminInfo2 = XXX - AdminEMail = mail@josuah.net - Info = XXX - MotdFile = motd - Network = XXX - Ports = 6697 - -[Limits] - MaxConnections = 128 - MaxConnectionsIP = 20 - MaxJoins = 50 - MaxNickLength = 10 - PingTimeout = 120 - PongTimeout = 120 - -[Options] - AllowedChannelTypes = #&+ - AllowRemoteOper = yes - CloakHost = %x%x - CloakHostSalt = XXX - DefaultUserModes = iC - DNS = no - Ident = no - MorePrivacy = yes - OperCanUseMode = yes - OperChanPAutoOp = yes - -[SSL] - Ports = 6697 - CertFile = pem - DHFile = dhp - KeyFile = key - KeyFilePassword = XXX - CipherList = AES+RSA - -[Operator] - Name = josuah - Password = XXX - Mask = josuah!XXX - -[Server] - XXX diff --git a/s6/ngircd/ngircd-run/data/motd b/s6/ngircd/ngircd-run/data/motd @@ -1,37 +0,0 @@ -@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -@ This server is not ready yet, visit https://cyberia.uptime.party/ @ -@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ - - __,--- - ,-' / - / , , /_ _ __ . ___ - / / / / \ ,'_| /' / ,' / - \__\ /_ /__,'_\__ / __ /__\__/___ __ _ - \/ - ____/ - -Listening on ports: 6697 (TLS) -irc.cyberia.systems - -Welcome to Cyberia -We're stoked you are here -Love Lain or be lame - -Rules: - - No spamming or flooding - - No clones or malicious bots - - No takeovers - - No distribution of child pornography - - Do not harass other users - - Clients must respond to VERSION requests - - We reserve the right to remove your access to this server and network - at any time at our opers discretion. - -First steps: - - Find an existing IRC channel on this network: /list - - Join an IRC channel or create your own: /join <#channel> - -Getting help: - - For helpdesk on using IRC: /join #help - - For network issues, status and server operator queries: /join #noc diff --git a/s6/ngircd/ngircd-run/data/tls b/s6/ngircd/ngircd-run/data/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/ngircd/ngircd-run/dependencies b/s6/ngircd/ngircd-run/dependencies @@ -1 +0,0 @@ -ngircd-log diff --git a/s6/ngircd/ngircd-run/producer-for b/s6/ngircd/ngircd-run/producer-for @@ -1 +0,0 @@ -ngircd-log diff --git a/s6/ngircd/ngircd-run/run b/s6/ngircd/ngircd-run/run @@ -1,6 +0,0 @@ -#!/local/bin/execlineb -# Internet Relay Chat (IRC) daemon with TLS support (see ./tls) - -fdmove -c 2 1 - -ngircd -n -f ./data/conf diff --git a/s6/ngircd/ngircd-run/type b/s6/ngircd/ngircd-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/ngircd/ngircd/contents b/s6/ngircd/ngircd/contents @@ -1,2 +0,0 @@ -ngircd-log -ngircd-run diff --git a/s6/ngircd/ngircd/type b/s6/ngircd/ngircd/type @@ -1 +0,0 @@ -bundle diff --git a/s6/ngircd/producer-for b/s6/ngircd/producer-for @@ -0,0 +1 @@ +ngircd-log diff --git a/s6/ngircd/run b/s6/ngircd/run @@ -0,0 +1,6 @@ +#!/local/bin/execlineb +# Internet Relay Chat (IRC) daemon with TLS support (see ./tls) + +fdmove -c 2 1 + +ngircd -n -f ./data/conf diff --git a/s6/backup/backup-log/type b/s6/ngircd/type diff --git a/s6/ntpclient-log/consumer-for b/s6/ntpclient-log/consumer-for @@ -0,0 +1 @@ +ntpclient-run 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-run diff --git a/s6/backup/backup-log/type b/s6/ntpclient-log/type diff --git a/s6/ntpclient/dependencies b/s6/ntpclient/dependencies @@ -0,0 +1 @@ +ntpclient-log diff --git a/s6/ntpclient/env/HOST b/s6/ntpclient/env/HOST @@ -0,0 +1 @@ +pool.ntp.org diff --git a/s6/ntpclient/ntpclient-log/consumer-for b/s6/ntpclient/ntpclient-log/consumer-for @@ -1 +0,0 @@ -ntpclient-run diff --git a/s6/ntpclient/ntpclient-log/run b/s6/ntpclient/ntpclient-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/ntpclient-run diff --git a/s6/ntpclient/ntpclient-log/type b/s6/ntpclient/ntpclient-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/ntpclient/ntpclient-run/dependencies b/s6/ntpclient/ntpclient-run/dependencies @@ -1 +0,0 @@ -ntpclient-log diff --git a/s6/ntpclient/ntpclient-run/env/HOST b/s6/ntpclient/ntpclient-run/env/HOST @@ -1 +0,0 @@ -pool.ntp.org diff --git a/s6/ntpclient/ntpclient-run/producer-for b/s6/ntpclient/ntpclient-run/producer-for @@ -1 +0,0 @@ -ntpclient-log diff --git a/s6/ntpclient/ntpclient-run/run b/s6/ntpclient/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/ntpclient-run/type b/s6/ntpclient/ntpclient-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/ntpclient/ntpclient/contents b/s6/ntpclient/ntpclient/contents @@ -1,2 +0,0 @@ -ntpclient-log -ntpclient-run diff --git a/s6/ntpclient/ntpclient/type b/s6/ntpclient/ntpclient/type @@ -1 +0,0 @@ -bundle diff --git a/s6/ntpclient/producer-for b/s6/ntpclient/producer-for @@ -0,0 +1 @@ +ntpclient-log diff --git a/s6/ntpclient/run b/s6/ntpclient/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/backup/backup-log/type b/s6/ntpclient/type diff --git a/s6/opentracker-log/consumer-for b/s6/opentracker-log/consumer-for @@ -0,0 +1 @@ +opentracker-run 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-run diff --git a/s6/backup/backup-log/type b/s6/opentracker-log/type diff --git a/s6/opentracker/dependencies b/s6/opentracker/dependencies @@ -0,0 +1 @@ +opentracker-log diff --git a/s6/opentracker/opentracker-log/consumer-for b/s6/opentracker/opentracker-log/consumer-for @@ -1 +0,0 @@ -opentracker-run diff --git a/s6/opentracker/opentracker-log/run b/s6/opentracker/opentracker-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/opentracker-run diff --git a/s6/opentracker/opentracker-log/type b/s6/opentracker/opentracker-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/opentracker/opentracker-run/dependencies b/s6/opentracker/opentracker-run/dependencies @@ -1 +0,0 @@ -opentracker-log diff --git a/s6/opentracker/opentracker-run/producer-for b/s6/opentracker/opentracker-run/producer-for @@ -1 +0,0 @@ -opentracker-log diff --git a/s6/opentracker/opentracker-run/run b/s6/opentracker/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/opentracker-run/type b/s6/opentracker/opentracker-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/opentracker/opentracker/contents b/s6/opentracker/opentracker/contents @@ -1,2 +0,0 @@ -opentracker-log -opentracker-run diff --git a/s6/opentracker/opentracker/type b/s6/opentracker/opentracker/type @@ -1 +0,0 @@ -bundle diff --git a/s6/opentracker/producer-for b/s6/opentracker/producer-for @@ -0,0 +1 @@ +opentracker-log diff --git a/s6/opentracker/run b/s6/opentracker/run @@ -0,0 +1,6 @@ +#!/local/bin/execlineb +# torrent tracker server + +fdmove -c 2 1 + +opentracker -d /home/tracker diff --git a/s6/backup/backup-log/type b/s6/opentracker/type diff --git a/s6/plot-log/consumer-for b/s6/plot-log/consumer-for @@ -0,0 +1 @@ +plot-run 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-run diff --git a/s6/backup/backup-log/type b/s6/plot-log/type diff --git a/s6/plot/data/plot b/s6/plot/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/dependencies b/s6/plot/dependencies @@ -0,0 +1 @@ +plot-log diff --git a/s6/plot/plot-log/consumer-for b/s6/plot/plot-log/consumer-for @@ -1 +0,0 @@ -plot-run diff --git a/s6/plot/plot-log/run b/s6/plot/plot-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/plot-run diff --git a/s6/plot/plot-log/type b/s6/plot/plot-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/plot/plot-run/data/plot b/s6/plot/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/plot-run/dependencies b/s6/plot/plot-run/dependencies @@ -1 +0,0 @@ -plot-log diff --git a/s6/plot/plot-run/producer-for b/s6/plot/plot-run/producer-for @@ -1 +0,0 @@ -plot-log diff --git a/s6/plot/plot-run/run b/s6/plot/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/plot-run/type b/s6/plot/plot-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/plot/plot/contents b/s6/plot/plot/contents @@ -1,2 +0,0 @@ -plot-log -plot-run diff --git a/s6/plot/plot/type b/s6/plot/plot/type @@ -1 +0,0 @@ -bundle diff --git a/s6/plot/producer-for b/s6/plot/producer-for @@ -0,0 +1 @@ +plot-log diff --git a/s6/plot/run b/s6/plot/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/backup/backup-log/type b/s6/plot/type diff --git a/s6/qemu-tap-log/consumer-for b/s6/qemu-tap-log/consumer-for @@ -0,0 +1 @@ +qemu-tap-run 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-run diff --git a/s6/backup/backup-log/type b/s6/qemu-tap-log/type diff --git a/s6/qemu-tap/dependencies b/s6/qemu-tap/dependencies @@ -0,0 +1 @@ +qemu-tap-log diff --git a/s6/qemu-tap/producer-for b/s6/qemu-tap/producer-for @@ -0,0 +1 @@ +qemu-tap-log diff --git a/s6/qemu-tap/qemu-tap-log/consumer-for b/s6/qemu-tap/qemu-tap-log/consumer-for @@ -1 +0,0 @@ -qemu-tap-run diff --git a/s6/qemu-tap/qemu-tap-log/run b/s6/qemu-tap/qemu-tap-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/qemu-tap-run diff --git a/s6/qemu-tap/qemu-tap-log/type b/s6/qemu-tap/qemu-tap-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/qemu-tap/qemu-tap-run/dependencies b/s6/qemu-tap/qemu-tap-run/dependencies @@ -1 +0,0 @@ -qemu-tap-log diff --git a/s6/qemu-tap/qemu-tap-run/producer-for b/s6/qemu-tap/qemu-tap-run/producer-for @@ -1 +0,0 @@ -qemu-tap-log diff --git a/s6/qemu-tap/qemu-tap-run/run b/s6/qemu-tap/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/qemu-tap-run/type b/s6/qemu-tap/qemu-tap-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/qemu-tap/qemu-tap/contents b/s6/qemu-tap/qemu-tap/contents @@ -1,3 +0,0 @@ -qemu-tap -qemu-tap-log -qemu-tap-run diff --git a/s6/qemu-tap/qemu-tap/type b/s6/qemu-tap/qemu-tap/type @@ -1 +0,0 @@ -bundle diff --git a/s6/qemu-tap/run b/s6/qemu-tap/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/backup/backup-log/type b/s6/qemu-tap/type diff --git a/s6/qemu-user-log/consumer-for b/s6/qemu-user-log/consumer-for @@ -0,0 +1 @@ +qemu-user-run 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-run diff --git a/s6/backup/backup-log/type b/s6/qemu-user-log/type diff --git a/s6/qemu-user/dependencies b/s6/qemu-user/dependencies @@ -0,0 +1 @@ +qemu-user-log diff --git a/s6/djbdns-dnscache/djbdns-dnscache-run/data/ip/127.0.0.1 b/s6/qemu-user/env/NAME diff --git a/s6/qemu-user/producer-for b/s6/qemu-user/producer-for @@ -0,0 +1 @@ +qemu-user-log diff --git a/s6/qemu-user/qemu-user-log/consumer-for b/s6/qemu-user/qemu-user-log/consumer-for @@ -1 +0,0 @@ -qemu-user-run diff --git a/s6/qemu-user/qemu-user-log/run b/s6/qemu-user/qemu-user-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/qemu-user-run diff --git a/s6/qemu-user/qemu-user-log/type b/s6/qemu-user/qemu-user-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/qemu-user/qemu-user-run/dependencies b/s6/qemu-user/qemu-user-run/dependencies @@ -1 +0,0 @@ -qemu-user-log diff --git a/s6/qemu-user/qemu-user-run/env/NAME b/s6/qemu-user/qemu-user-run/env/NAME diff --git a/s6/qemu-user/qemu-user-run/producer-for b/s6/qemu-user/qemu-user-run/producer-for @@ -1 +0,0 @@ -qemu-user-log diff --git a/s6/qemu-user/qemu-user-run/run b/s6/qemu-user/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/qemu-user-run/type b/s6/qemu-user/qemu-user-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/qemu-user/qemu-user/contents b/s6/qemu-user/qemu-user/contents @@ -1,3 +0,0 @@ -qemu-user -qemu-user-log -qemu-user-run diff --git a/s6/qemu-user/qemu-user/type b/s6/qemu-user/qemu-user/type @@ -1 +0,0 @@ -bundle diff --git a/s6/qemu-user/run b/s6/qemu-user/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/backup/backup-log/type b/s6/qemu-user/type diff --git a/s6/qmail-pop3d-log/consumer-for b/s6/qmail-pop3d-log/consumer-for @@ -0,0 +1 @@ +qmail-pop3d-run 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-run diff --git a/s6/backup/backup-log/type b/s6/qmail-pop3d-log/type diff --git a/s6/qmail-pop3d/dependencies b/s6/qmail-pop3d/dependencies @@ -0,0 +1 @@ +qmail-pop3d-log diff --git a/s6/qmail-pop3d/producer-for b/s6/qmail-pop3d/producer-for @@ -0,0 +1 @@ +qmail-pop3d-log diff --git a/s6/qmail-pop3d/qmail-pop3d-log/consumer-for b/s6/qmail-pop3d/qmail-pop3d-log/consumer-for @@ -1 +0,0 @@ -qmail-pop3d-run diff --git a/s6/qmail-pop3d/qmail-pop3d-log/run b/s6/qmail-pop3d/qmail-pop3d-log/run @@ -1,2 +1,2 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/qmail-pop3d-run +#!/local/bin/execlineb -P +s6-log T /var/log/qmail-pop3d/ diff --git a/s6/qmail-pop3d/qmail-pop3d-log/type b/s6/qmail-pop3d/qmail-pop3d-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/qmail-pop3d/qmail-pop3d-run/dependencies b/s6/qmail-pop3d/qmail-pop3d-run/dependencies @@ -1 +0,0 @@ -qmail-pop3d-log diff --git a/s6/qmail-pop3d/qmail-pop3d-run/producer-for b/s6/qmail-pop3d/qmail-pop3d-run/producer-for @@ -1 +0,0 @@ -qmail-pop3d-log diff --git a/s6/qmail-pop3d/qmail-pop3d-run/qmail-pop3d-log/run b/s6/qmail-pop3d/qmail-pop3d-run/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-run/qmail-pop3d/env/CERTFILE b/s6/qmail-pop3d/qmail-pop3d-run/qmail-pop3d/env/CERTFILE @@ -1 +0,0 @@ -/var/s6/snooze-tls-cert/data/pem diff --git a/s6/qmail-pop3d/qmail-pop3d-run/qmail-pop3d/env/HOST b/s6/qmail-pop3d/qmail-pop3d-run/qmail-pop3d/env/HOST @@ -1 +0,0 @@ -josuah.net diff --git a/s6/qmail-pop3d/qmail-pop3d-run/qmail-pop3d/env/KEYFILE b/s6/qmail-pop3d/qmail-pop3d-run/qmail-pop3d/env/KEYFILE @@ -1 +0,0 @@ -/var/s6/snooze-tls-cert/data/key diff --git a/s6/qmail-pop3d/qmail-pop3d-run/qmail-pop3d/env/MAILDIR b/s6/qmail-pop3d/qmail-pop3d-run/qmail-pop3d/env/MAILDIR @@ -1 +0,0 @@ -./mail/INBOX/ diff --git a/s6/qmail-pop3d/qmail-pop3d-run/qmail-pop3d/run b/s6/qmail-pop3d/qmail-pop3d-run/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-pop3d/qmail-pop3d-run/type b/s6/qmail-pop3d/qmail-pop3d-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/qmail-pop3d/qmail-pop3d/contents b/s6/qmail-pop3d/qmail-pop3d/contents @@ -1,3 +0,0 @@ -qmail-pop3d -qmail-pop3d-log -qmail-pop3d-run diff --git a/s6/qmail-pop3d/qmail-pop3d/env/CERTFILE b/s6/qmail-pop3d/qmail-pop3d/env/CERTFILE @@ -0,0 +1 @@ +/var/s6/snooze-tls-cert/data/pem diff --git a/s6/geomyidae/geomyidae-run/env/HOST b/s6/qmail-pop3d/qmail-pop3d/env/HOST diff --git a/s6/qmail-pop3d/qmail-pop3d/env/KEYFILE b/s6/qmail-pop3d/qmail-pop3d/env/KEYFILE @@ -0,0 +1 @@ +/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 @@ -0,0 +1 @@ +./mail/INBOX/ diff --git a/s6/qmail-pop3d/qmail-pop3d/run b/s6/qmail-pop3d/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/qmail-pop3d/type b/s6/qmail-pop3d/qmail-pop3d/type @@ -1 +0,0 @@ -bundle diff --git a/s6/backup/backup-log/type b/s6/qmail-pop3d/type diff --git a/s6/qmail-send-log/consumer-for b/s6/qmail-send-log/consumer-for @@ -0,0 +1 @@ +qmail-send-run 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-run diff --git a/s6/backup/backup-log/type b/s6/qmail-send-log/type diff --git a/s6/qmail-send/data/alias/.qmail-mail b/s6/qmail-send/data/alias/.qmail-mail @@ -0,0 +1 @@ +&josuah diff --git a/s6/qmail-send/data/control/defaultdelivery b/s6/qmail-send/data/control/defaultdelivery @@ -0,0 +1 @@ +./mail/INBOX/ diff --git a/s6/geomyidae/geomyidae-run/env/HOST b/s6/qmail-send/data/control/defaultdomain diff --git a/s6/geomyidae/geomyidae-run/env/HOST b/s6/qmail-send/data/control/locals diff --git a/s6/geomyidae/geomyidae-run/env/HOST b/s6/qmail-send/data/control/me diff --git a/s6/geomyidae/geomyidae-run/env/HOST b/s6/qmail-send/data/control/plusdomain diff --git a/s6/geomyidae/geomyidae-run/env/HOST b/s6/qmail-send/data/control/rcpthosts diff --git a/s6/qmail-send/dependencies b/s6/qmail-send/dependencies @@ -0,0 +1 @@ +qmail-send-log diff --git a/s6/qmail-send/env/MAILDIR b/s6/qmail-send/env/MAILDIR @@ -0,0 +1 @@ +./mail/INBOX/ diff --git a/s6/qmail-send/producer-for b/s6/qmail-send/producer-for @@ -0,0 +1 @@ +qmail-send-log diff --git a/s6/qmail-send/run b/s6/qmail-send/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/backup/backup-log/type b/s6/qmail-send/type diff --git a/s6/qmail-smtpd-log/consumer-for b/s6/qmail-smtpd-log/consumer-for @@ -0,0 +1 @@ +qmail-smtpd-run 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-run diff --git a/s6/backup/backup-log/type b/s6/qmail-smtpd-log/type diff --git a/s6/qmail-smtpd/dependencies b/s6/qmail-smtpd/dependencies @@ -0,0 +1 @@ +qmail-smtpd-log diff --git a/s6/qmail-smtpd/producer-for b/s6/qmail-smtpd/producer-for @@ -0,0 +1 @@ +qmail-smtpd-log diff --git a/s6/qmail-smtpd/run b/s6/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/qmail-smtpd/tls b/s6/qmail-smtpd/tls @@ -0,0 +1,8 @@ +#!/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/backup/backup-log/type b/s6/qmail-smtpd/type diff --git a/s6/qmail/qmail-send-log/consumer-for b/s6/qmail/qmail-send-log/consumer-for @@ -1 +0,0 @@ -qmail-send-run diff --git a/s6/qmail/qmail-send-log/run b/s6/qmail/qmail-send-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/qmail-send-run diff --git a/s6/qmail/qmail-send-log/type b/s6/qmail/qmail-send-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/qmail/qmail-send-run/data/alias/.qmail-mail b/s6/qmail/qmail-send-run/data/alias/.qmail-mail @@ -1 +0,0 @@ -&josuah diff --git a/s6/qmail/qmail-send-run/data/control/defaultdelivery b/s6/qmail/qmail-send-run/data/control/defaultdelivery @@ -1 +0,0 @@ -./mail/INBOX/ diff --git a/s6/qmail/qmail-send-run/data/control/defaultdomain b/s6/qmail/qmail-send-run/data/control/defaultdomain @@ -1 +0,0 @@ -josuah.net diff --git a/s6/qmail/qmail-send-run/data/control/locals b/s6/qmail/qmail-send-run/data/control/locals @@ -1 +0,0 @@ -josuah.net diff --git a/s6/qmail/qmail-send-run/data/control/me b/s6/qmail/qmail-send-run/data/control/me @@ -1 +0,0 @@ -josuah.net diff --git a/s6/qmail/qmail-send-run/data/control/plusdomain b/s6/qmail/qmail-send-run/data/control/plusdomain @@ -1 +0,0 @@ -josuah.net diff --git a/s6/qmail/qmail-send-run/data/control/rcpthosts b/s6/qmail/qmail-send-run/data/control/rcpthosts @@ -1 +0,0 @@ -josuah.net diff --git a/s6/qmail/qmail-send-run/dependencies b/s6/qmail/qmail-send-run/dependencies @@ -1 +0,0 @@ -qmail-send-log diff --git a/s6/qmail/qmail-send-run/env/MAILDIR b/s6/qmail/qmail-send-run/env/MAILDIR @@ -1 +0,0 @@ -./mail/INBOX/ diff --git a/s6/qmail/qmail-send-run/producer-for b/s6/qmail/qmail-send-run/producer-for @@ -1 +0,0 @@ -qmail-send-log diff --git a/s6/qmail/qmail-send-run/run b/s6/qmail/qmail-send-run/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/qmail-send-run/type b/s6/qmail/qmail-send-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/qmail/qmail-smtpd-log/consumer-for b/s6/qmail/qmail-smtpd-log/consumer-for @@ -1 +0,0 @@ -qmail-smtpd-run diff --git a/s6/qmail/qmail-smtpd-log/run b/s6/qmail/qmail-smtpd-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/qmail-smtpd-run diff --git a/s6/qmail/qmail-smtpd-log/type b/s6/qmail/qmail-smtpd-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/qmail/qmail-smtpd-run/dependencies b/s6/qmail/qmail-smtpd-run/dependencies @@ -1 +0,0 @@ -qmail-smtpd-log diff --git a/s6/qmail/qmail-smtpd-run/producer-for b/s6/qmail/qmail-smtpd-run/producer-for @@ -1 +0,0 @@ -qmail-smtpd-log diff --git a/s6/qmail/qmail-smtpd-run/run b/s6/qmail/qmail-smtpd-run/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/qmail-smtpd-run/tls b/s6/qmail/qmail-smtpd-run/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/qmail-smtpd-run/type b/s6/qmail/qmail-smtpd-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/qmail/qmail/contents b/s6/qmail/qmail/contents @@ -1,4 +0,0 @@ -qmail-send-log -qmail-send-run -qmail-smtpd-log -qmail-smtpd-run diff --git a/s6/qmail/qmail/type b/s6/qmail/qmail/type @@ -1 +0,0 @@ -bundle diff --git a/s6/quark-log/consumer-for b/s6/quark-log/consumer-for @@ -0,0 +1 @@ +quark-run 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-run diff --git a/s6/backup/backup-log/type b/s6/quark-log/type diff --git a/s6/quark-tor-log/consumer-for b/s6/quark-tor-log/consumer-for @@ -0,0 +1 @@ +quark-tor-run 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-run diff --git a/s6/backup/backup-log/type b/s6/quark-tor-log/type diff --git a/s6/quark-tor/dependencies b/s6/quark-tor/dependencies @@ -0,0 +1 @@ +quark-tor-log diff --git a/s6/quark-tor/producer-for b/s6/quark-tor/producer-for @@ -0,0 +1 @@ +quark-tor-log diff --git a/s6/quark-tor/quark-tor-log/consumer-for b/s6/quark-tor/quark-tor-log/consumer-for @@ -1 +0,0 @@ -quark-tor-run diff --git a/s6/quark-tor/quark-tor-log/run b/s6/quark-tor/quark-tor-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/quark-tor-run diff --git a/s6/quark-tor/quark-tor-log/type b/s6/quark-tor/quark-tor-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/quark-tor/quark-tor-run/dependencies b/s6/quark-tor/quark-tor-run/dependencies @@ -1 +0,0 @@ -quark-tor-log diff --git a/s6/quark-tor/quark-tor-run/producer-for b/s6/quark-tor/quark-tor-run/producer-for @@ -1 +0,0 @@ -quark-tor-log diff --git a/s6/quark-tor/quark-tor-run/run b/s6/quark-tor/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/quark-tor-run/type b/s6/quark-tor/quark-tor-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/quark-tor/quark-tor/contents b/s6/quark-tor/quark-tor/contents @@ -1,3 +0,0 @@ -quark-tor -quark-tor-log -quark-tor-run diff --git a/s6/quark-tor/quark-tor/type b/s6/quark-tor/quark-tor/type @@ -1 +0,0 @@ -bundle diff --git a/s6/quark-tor/run b/s6/quark-tor/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/backup/backup-log/type b/s6/quark-tor/type diff --git a/s6/quark/dependencies b/s6/quark/dependencies @@ -0,0 +1 @@ +quark-log diff --git a/s6/quark/producer-for b/s6/quark/producer-for @@ -0,0 +1 @@ +quark-log diff --git a/s6/quark/quark-log/consumer-for b/s6/quark/quark-log/consumer-for @@ -1 +0,0 @@ -quark-run diff --git a/s6/quark/quark-log/run b/s6/quark/quark-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/quark-run diff --git a/s6/quark/quark-log/type b/s6/quark/quark-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/quark/quark-run/dependencies b/s6/quark/quark-run/dependencies @@ -1 +0,0 @@ -quark-log diff --git a/s6/quark/quark-run/producer-for b/s6/quark/quark-run/producer-for @@ -1 +0,0 @@ -quark-log diff --git a/s6/quark/quark-run/run b/s6/quark/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/quark-run/type b/s6/quark/quark-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/quark/quark/contents b/s6/quark/quark/contents @@ -1,2 +0,0 @@ -quark-log -quark-run diff --git a/s6/quark/quark/type b/s6/quark/quark/type @@ -1 +0,0 @@ -bundle diff --git a/s6/quark/run b/s6/quark/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/backup/backup-log/type b/s6/quark/type diff --git a/s6/ratox-log/consumer-for b/s6/ratox-log/consumer-for @@ -0,0 +1 @@ +ratox-run 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-run diff --git a/s6/backup/backup-log/type b/s6/ratox-log/type diff --git a/s6/ratox/dependencies b/s6/ratox/dependencies @@ -0,0 +1 @@ +ratox-log diff --git a/s6/ratox/producer-for b/s6/ratox/producer-for @@ -0,0 +1 @@ +ratox-log diff --git a/s6/ratox/ratox-log/consumer-for b/s6/ratox/ratox-log/consumer-for @@ -1 +0,0 @@ -ratox-run diff --git a/s6/ratox/ratox-log/run b/s6/ratox/ratox-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/ratox-run diff --git a/s6/ratox/ratox-log/type b/s6/ratox/ratox-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/ratox/ratox-run/dependencies b/s6/ratox/ratox-run/dependencies @@ -1 +0,0 @@ -ratox-log diff --git a/s6/ratox/ratox-run/producer-for b/s6/ratox/ratox-run/producer-for @@ -1 +0,0 @@ -ratox-log diff --git a/s6/ratox/ratox-run/run b/s6/ratox/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/ratox-run/type b/s6/ratox/ratox-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/ratox/ratox/contents b/s6/ratox/ratox/contents @@ -1,2 +0,0 @@ -ratox-log -ratox-run diff --git a/s6/ratox/ratox/type b/s6/ratox/ratox/type @@ -1 +0,0 @@ -bundle diff --git a/s6/ratox/run b/s6/ratox/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/backup/backup-log/type b/s6/ratox/type diff --git a/s6/snooze-acme-client-log/consumer-for b/s6/snooze-acme-client-log/consumer-for @@ -0,0 +1 @@ +snooze-acme-client-run 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-run diff --git a/s6/backup/backup-log/type b/s6/snooze-acme-client-log/type diff --git a/s6/snooze-acme-client/data/conf b/s6/snooze-acme-client/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/dependencies b/s6/snooze-acme-client/dependencies @@ -0,0 +1 @@ +snooze-acme-client-log diff --git a/s6/snooze-acme-client/producer-for b/s6/snooze-acme-client/producer-for @@ -0,0 +1 @@ +snooze-acme-client-log diff --git a/s6/snooze-acme-client/run b/s6/snooze-acme-client/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/snooze-acme-client-log/consumer-for b/s6/snooze-acme-client/snooze-acme-client-log/consumer-for @@ -1 +0,0 @@ -snooze-acme-client-run diff --git a/s6/snooze-acme-client/snooze-acme-client-log/run b/s6/snooze-acme-client/snooze-acme-client-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/snooze-acme-client-run diff --git a/s6/snooze-acme-client/snooze-acme-client-log/type b/s6/snooze-acme-client/snooze-acme-client-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/snooze-acme-client/snooze-acme-client-run/data/conf b/s6/snooze-acme-client/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/snooze-acme-client-run/dependencies b/s6/snooze-acme-client/snooze-acme-client-run/dependencies @@ -1 +0,0 @@ -snooze-acme-client-log diff --git a/s6/snooze-acme-client/snooze-acme-client-run/producer-for b/s6/snooze-acme-client/snooze-acme-client-run/producer-for @@ -1 +0,0 @@ -snooze-acme-client-log diff --git a/s6/snooze-acme-client/snooze-acme-client-run/run b/s6/snooze-acme-client/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/snooze-acme-client-run/type b/s6/snooze-acme-client/snooze-acme-client-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/snooze-acme-client/snooze-acme-client/contents b/s6/snooze-acme-client/snooze-acme-client/contents @@ -1,3 +0,0 @@ -snooze-acme-client -snooze-acme-client-log -snooze-acme-client-run diff --git a/s6/snooze-acme-client/snooze-acme-client/type b/s6/snooze-acme-client/snooze-acme-client/type @@ -1 +0,0 @@ -bundle diff --git a/s6/backup/backup-log/type b/s6/snooze-acme-client/type diff --git a/s6/snooze-tls-cert-log/consumer-for b/s6/snooze-tls-cert-log/consumer-for @@ -0,0 +1 @@ +snooze-tls-cert-run 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-run diff --git a/s6/backup/backup-log/type b/s6/snooze-tls-cert-log/type diff --git a/s6/djbdns-dnscache/djbdns-dnscache-run/data/ip/127.0.0.1 b/s6/snooze-tls-cert/data/... diff --git a/s6/snooze-tls-cert/dependencies b/s6/snooze-tls-cert/dependencies @@ -0,0 +1 @@ +snooze-tls-cert-log diff --git a/s6/geomyidae/geomyidae-run/env/HOST b/s6/snooze-tls-cert/env/HOST diff --git a/s6/snooze-tls-cert/producer-for b/s6/snooze-tls-cert/producer-for @@ -0,0 +1 @@ +snooze-tls-cert-log diff --git a/s6/snooze-tls-cert/run b/s6/snooze-tls-cert/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/snooze-tls-cert-log/consumer-for b/s6/snooze-tls-cert/snooze-tls-cert-log/consumer-for @@ -1 +0,0 @@ -snooze-tls-cert-run diff --git a/s6/snooze-tls-cert/snooze-tls-cert-log/run b/s6/snooze-tls-cert/snooze-tls-cert-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/snooze-tls-cert-run diff --git a/s6/snooze-tls-cert/snooze-tls-cert-log/type b/s6/snooze-tls-cert/snooze-tls-cert-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/snooze-tls-cert/snooze-tls-cert-run/data/... b/s6/snooze-tls-cert/snooze-tls-cert-run/data/... diff --git a/s6/snooze-tls-cert/snooze-tls-cert-run/dependencies b/s6/snooze-tls-cert/snooze-tls-cert-run/dependencies @@ -1 +0,0 @@ -snooze-tls-cert-log diff --git a/s6/snooze-tls-cert/snooze-tls-cert-run/env/HOST b/s6/snooze-tls-cert/snooze-tls-cert-run/env/HOST @@ -1 +0,0 @@ -josuah.net diff --git a/s6/snooze-tls-cert/snooze-tls-cert-run/producer-for b/s6/snooze-tls-cert/snooze-tls-cert-run/producer-for @@ -1 +0,0 @@ -snooze-tls-cert-log diff --git a/s6/snooze-tls-cert/snooze-tls-cert-run/run b/s6/snooze-tls-cert/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/snooze-tls-cert-run/type b/s6/snooze-tls-cert/snooze-tls-cert-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/snooze-tls-cert/snooze-tls-cert/contents b/s6/snooze-tls-cert/snooze-tls-cert/contents @@ -1,3 +0,0 @@ -snooze-tls-cert -snooze-tls-cert-log -snooze-tls-cert-run diff --git a/s6/snooze-tls-cert/snooze-tls-cert/type b/s6/snooze-tls-cert/snooze-tls-cert/type @@ -1 +0,0 @@ -bundle diff --git a/s6/backup/backup-log/type b/s6/snooze-tls-cert/type diff --git a/s6/snooze-tls-dhparam-log/consumer-for b/s6/snooze-tls-dhparam-log/consumer-for @@ -0,0 +1 @@ +snooze-tls-dhparam-run 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-run diff --git a/s6/backup/backup-log/type b/s6/snooze-tls-dhparam-log/type diff --git a/s6/snooze-tls-dhparam/dependencies b/s6/snooze-tls-dhparam/dependencies @@ -0,0 +1 @@ +snooze-tls-dhparam-log diff --git a/s6/snooze-tls-dhparam/producer-for b/s6/snooze-tls-dhparam/producer-for @@ -0,0 +1 @@ +snooze-tls-dhparam-log diff --git a/s6/snooze-tls-dhparam/run b/s6/snooze-tls-dhparam/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/snooze-tls-dhparam-log/consumer-for b/s6/snooze-tls-dhparam/snooze-tls-dhparam-log/consumer-for @@ -1 +0,0 @@ -snooze-tls-dhparam-run diff --git a/s6/snooze-tls-dhparam/snooze-tls-dhparam-log/run b/s6/snooze-tls-dhparam/snooze-tls-dhparam-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/snooze-tls-dhparam-run diff --git a/s6/snooze-tls-dhparam/snooze-tls-dhparam-log/type b/s6/snooze-tls-dhparam/snooze-tls-dhparam-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/snooze-tls-dhparam/snooze-tls-dhparam-run/dependencies b/s6/snooze-tls-dhparam/snooze-tls-dhparam-run/dependencies @@ -1 +0,0 @@ -snooze-tls-dhparam-log diff --git a/s6/snooze-tls-dhparam/snooze-tls-dhparam-run/producer-for b/s6/snooze-tls-dhparam/snooze-tls-dhparam-run/producer-for @@ -1 +0,0 @@ -snooze-tls-dhparam-log diff --git a/s6/snooze-tls-dhparam/snooze-tls-dhparam-run/run b/s6/snooze-tls-dhparam/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/snooze-tls-dhparam-run/type b/s6/snooze-tls-dhparam/snooze-tls-dhparam-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/snooze-tls-dhparam/snooze-tls-dhparam/contents b/s6/snooze-tls-dhparam/snooze-tls-dhparam/contents @@ -1,3 +0,0 @@ -snooze-tls-dhparam -snooze-tls-dhparam-log -snooze-tls-dhparam-run diff --git a/s6/snooze-tls-dhparam/snooze-tls-dhparam/type b/s6/snooze-tls-dhparam/snooze-tls-dhparam/type @@ -1 +0,0 @@ -bundle diff --git a/s6/backup/backup-log/type b/s6/snooze-tls-dhparam/type diff --git a/s6/ssh-fwd-log/consumer-for b/s6/ssh-fwd-log/consumer-for @@ -0,0 +1 @@ +ssh-fwd-run 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-run diff --git a/s6/backup/backup-log/type b/s6/ssh-fwd-log/type diff --git a/s6/ssh-fwd/dependencies b/s6/ssh-fwd/dependencies @@ -0,0 +1 @@ +ssh-fwd-log diff --git a/s6/ssh-fwd/producer-for b/s6/ssh-fwd/producer-for @@ -0,0 +1 @@ +ssh-fwd-log diff --git a/s6/ssh-fwd/run b/s6/ssh-fwd/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/ssh-fwd-log/consumer-for b/s6/ssh-fwd/ssh-fwd-log/consumer-for @@ -1 +0,0 @@ -ssh-fwd-run diff --git a/s6/ssh-fwd/ssh-fwd-log/run b/s6/ssh-fwd/ssh-fwd-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/ssh-fwd-run diff --git a/s6/ssh-fwd/ssh-fwd-log/type b/s6/ssh-fwd/ssh-fwd-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/ssh-fwd/ssh-fwd-run/dependencies b/s6/ssh-fwd/ssh-fwd-run/dependencies @@ -1 +0,0 @@ -ssh-fwd-log diff --git a/s6/ssh-fwd/ssh-fwd-run/producer-for b/s6/ssh-fwd/ssh-fwd-run/producer-for @@ -1 +0,0 @@ -ssh-fwd-log diff --git a/s6/ssh-fwd/ssh-fwd-run/run b/s6/ssh-fwd/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/ssh-fwd-run/type b/s6/ssh-fwd/ssh-fwd-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/ssh-fwd/ssh-fwd/contents b/s6/ssh-fwd/ssh-fwd/contents @@ -1,3 +0,0 @@ -ssh-fwd -ssh-fwd-log -ssh-fwd-run diff --git a/s6/ssh-fwd/ssh-fwd/type b/s6/ssh-fwd/ssh-fwd/type @@ -1 +0,0 @@ -bundle diff --git a/s6/backup/backup-log/type b/s6/ssh-fwd/type diff --git a/s6/tinc-log/consumer-for b/s6/tinc-log/consumer-for @@ -0,0 +1 @@ +tinc-run 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-run diff --git a/s6/backup/backup-log/type b/s6/tinc-log/type diff --git a/s6/tinc/data/conf.d/common.conf b/s6/tinc/data/conf.d/common.conf @@ -0,0 +1,2 @@ +DeviceStandby = no +PingTimeout = 15 diff --git a/s6/tinc/data/hosts/kroa b/s6/tinc/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/data/hosts/nas b/s6/tinc/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/data/hosts/pdmg b/s6/tinc/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/data/hosts/rpi b/s6/tinc/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/data/hosts/t470s b/s6/tinc/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/data/tinc-up b/s6/tinc/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/dependencies b/s6/tinc/dependencies @@ -0,0 +1 @@ +tinc-log diff --git a/s6/tinc/producer-for b/s6/tinc/producer-for @@ -0,0 +1 @@ +tinc-log diff --git a/s6/tinc/run b/s6/tinc/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/tinc-log/consumer-for b/s6/tinc/tinc-log/consumer-for @@ -1 +0,0 @@ -tinc-run diff --git a/s6/tinc/tinc-log/run b/s6/tinc/tinc-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/tinc-run diff --git a/s6/tinc/tinc-log/type b/s6/tinc/tinc-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/tinc/tinc-run/data/conf.d/common.conf b/s6/tinc/tinc-run/data/conf.d/common.conf @@ -1,2 +0,0 @@ -DeviceStandby = no -PingTimeout = 15 diff --git a/s6/tinc/tinc-run/data/hosts/kroa b/s6/tinc/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/tinc-run/data/hosts/nas b/s6/tinc/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/tinc-run/data/hosts/pdmg b/s6/tinc/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/tinc-run/data/hosts/rpi b/s6/tinc/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/tinc-run/data/hosts/t470s b/s6/tinc/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/tinc-run/data/tinc-up b/s6/tinc/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/tinc-run/dependencies b/s6/tinc/tinc-run/dependencies @@ -1 +0,0 @@ -tinc-log diff --git a/s6/tinc/tinc-run/producer-for b/s6/tinc/tinc-run/producer-for @@ -1 +0,0 @@ -tinc-log diff --git a/s6/tinc/tinc-run/run b/s6/tinc/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/tinc-run/type b/s6/tinc/tinc-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/tinc/tinc/contents b/s6/tinc/tinc/contents @@ -1,2 +0,0 @@ -tinc-log -tinc-run diff --git a/s6/tinc/tinc/type b/s6/tinc/tinc/type @@ -1 +0,0 @@ -bundle diff --git a/s6/backup/backup-log/type b/s6/tinc/type diff --git a/s6/tinysshd-log/consumer-for b/s6/tinysshd-log/consumer-for @@ -0,0 +1 @@ +tinysshd-run 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-run diff --git a/s6/backup/backup-log/type b/s6/tinysshd-log/type diff --git a/s6/tinysshd/dependencies b/s6/tinysshd/dependencies @@ -0,0 +1 @@ +tinysshd-log diff --git a/s6/tinysshd/env/PORT b/s6/tinysshd/env/PORT @@ -0,0 +1 @@ +22 diff --git a/s6/tinysshd/producer-for b/s6/tinysshd/producer-for @@ -0,0 +1 @@ +tinysshd-log diff --git a/s6/tinysshd/run b/s6/tinysshd/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/tinysshd-log/consumer-for b/s6/tinysshd/tinysshd-log/consumer-for @@ -1 +0,0 @@ -tinysshd-run diff --git a/s6/tinysshd/tinysshd-log/run b/s6/tinysshd/tinysshd-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/tinysshd-run diff --git a/s6/tinysshd/tinysshd-log/type b/s6/tinysshd/tinysshd-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/tinysshd/tinysshd-run/dependencies b/s6/tinysshd/tinysshd-run/dependencies @@ -1 +0,0 @@ -tinysshd-log diff --git a/s6/tinysshd/tinysshd-run/env/PORT b/s6/tinysshd/tinysshd-run/env/PORT @@ -1 +0,0 @@ -22 diff --git a/s6/tinysshd/tinysshd-run/producer-for b/s6/tinysshd/tinysshd-run/producer-for @@ -1 +0,0 @@ -tinysshd-log diff --git a/s6/tinysshd/tinysshd-run/run b/s6/tinysshd/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/tinysshd-run/type b/s6/tinysshd/tinysshd-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/tinysshd/tinysshd/contents b/s6/tinysshd/tinysshd/contents @@ -1,2 +0,0 @@ -tinysshd-log -tinysshd-run diff --git a/s6/tinysshd/tinysshd/type b/s6/tinysshd/tinysshd/type @@ -1 +0,0 @@ -bundle diff --git a/s6/backup/backup-log/type b/s6/tinysshd/type diff --git a/s6/tls-server-log/consumer-for b/s6/tls-server-log/consumer-for @@ -0,0 +1 @@ +tls-server-run 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-run diff --git a/s6/backup/backup-log/type b/s6/tls-server-log/type diff --git a/s6/tls-server/dependencies b/s6/tls-server/dependencies @@ -0,0 +1 @@ +tls-server-log diff --git a/s6/tls-server/producer-for b/s6/tls-server/producer-for @@ -0,0 +1 @@ +tls-server-log diff --git a/s6/tls-server/run b/s6/tls-server/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/tls-server-log/consumer-for b/s6/tls-server/tls-server-log/consumer-for @@ -1 +0,0 @@ -tls-server-run diff --git a/s6/tls-server/tls-server-log/run b/s6/tls-server/tls-server-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/tls-server-run diff --git a/s6/tls-server/tls-server-log/type b/s6/tls-server/tls-server-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/tls-server/tls-server-run/dependencies b/s6/tls-server/tls-server-run/dependencies @@ -1 +0,0 @@ -tls-server-log diff --git a/s6/tls-server/tls-server-run/producer-for b/s6/tls-server/tls-server-run/producer-for @@ -1 +0,0 @@ -tls-server-log diff --git a/s6/tls-server/tls-server-run/run b/s6/tls-server/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/tls-server-run/type b/s6/tls-server/tls-server-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/tls-server/tls-server/contents b/s6/tls-server/tls-server/contents @@ -1,3 +0,0 @@ -tls-server -tls-server-log -tls-server-run diff --git a/s6/tls-server/tls-server/type b/s6/tls-server/tls-server/type @@ -1 +0,0 @@ -bundle diff --git a/s6/backup/backup-log/type b/s6/tls-server/type diff --git a/s6/tor-log/consumer-for b/s6/tor-log/consumer-for @@ -0,0 +1 @@ +tor-run 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-run diff --git a/s6/backup/backup-log/type b/s6/tor-log/type diff --git a/s6/tor/data/conf b/s6/tor/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/dependencies b/s6/tor/dependencies @@ -0,0 +1 @@ +tor-log diff --git a/s6/tor/producer-for b/s6/tor/producer-for @@ -0,0 +1 @@ +tor-log diff --git a/s6/tor/run b/s6/tor/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/tor-log/consumer-for b/s6/tor/tor-log/consumer-for @@ -1 +0,0 @@ -tor-run diff --git a/s6/tor/tor-log/run b/s6/tor/tor-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/tor-run diff --git a/s6/tor/tor-log/type b/s6/tor/tor-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/tor/tor-run/data/conf b/s6/tor/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/tor-run/dependencies b/s6/tor/tor-run/dependencies @@ -1 +0,0 @@ -tor-log diff --git a/s6/tor/tor-run/producer-for b/s6/tor/tor-run/producer-for @@ -1 +0,0 @@ -tor-log diff --git a/s6/tor/tor-run/run b/s6/tor/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/tor-run/type b/s6/tor/tor-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/tor/tor/contents b/s6/tor/tor/contents @@ -1,2 +0,0 @@ -tor-log -tor-run diff --git a/s6/tor/tor/type b/s6/tor/tor/type @@ -1 +0,0 @@ -bundle diff --git a/s6/backup/backup-log/type b/s6/tor/type diff --git a/s6/transmission-log/consumer-for b/s6/transmission-log/consumer-for @@ -0,0 +1 @@ +transmission-run 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-run diff --git a/s6/backup/backup-log/type b/s6/transmission-log/type diff --git a/s6/transmission/dependencies b/s6/transmission/dependencies @@ -0,0 +1 @@ +transmission-log diff --git a/s6/djbdns-dnscache/djbdns-dnscache-run/data/ip/127.0.0.1 b/s6/transmission/env/PASS diff --git a/s6/transmission/env/USER b/s6/transmission/env/USER @@ -0,0 +1 @@ +torrent diff --git a/s6/transmission/producer-for b/s6/transmission/producer-for @@ -0,0 +1 @@ +transmission-log diff --git a/s6/transmission/run b/s6/transmission/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/transmission-log/consumer-for b/s6/transmission/transmission-log/consumer-for @@ -1 +0,0 @@ -transmission-run diff --git a/s6/transmission/transmission-log/run b/s6/transmission/transmission-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/transmission-run diff --git a/s6/transmission/transmission-log/type b/s6/transmission/transmission-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/transmission/transmission-run/dependencies b/s6/transmission/transmission-run/dependencies @@ -1 +0,0 @@ -transmission-log diff --git a/s6/transmission/transmission-run/env/PASS b/s6/transmission/transmission-run/env/PASS diff --git a/s6/transmission/transmission-run/env/USER b/s6/transmission/transmission-run/env/USER @@ -1 +0,0 @@ -torrent diff --git a/s6/transmission/transmission-run/producer-for b/s6/transmission/transmission-run/producer-for @@ -1 +0,0 @@ -transmission-log diff --git a/s6/transmission/transmission-run/run b/s6/transmission/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/transmission-run/type b/s6/transmission/transmission-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/transmission/transmission/contents b/s6/transmission/transmission/contents @@ -1,2 +0,0 @@ -transmission-log -transmission-run diff --git a/s6/transmission/transmission/type b/s6/transmission/transmission/type @@ -1 +0,0 @@ -bundle diff --git a/s6/backup/backup-log/type b/s6/transmission/type diff --git a/s6/u9fs-log/consumer-for b/s6/u9fs-log/consumer-for @@ -0,0 +1 @@ +u9fs-run 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-run diff --git a/s6/backup/backup-log/type b/s6/u9fs-log/type diff --git a/s6/u9fs-mount-log/consumer-for b/s6/u9fs-mount-log/consumer-for @@ -0,0 +1 @@ +u9fs-mount-run 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-run diff --git a/s6/backup/backup-log/type b/s6/u9fs-mount-log/type diff --git a/s6/u9fs-mount/dependencies b/s6/u9fs-mount/dependencies @@ -0,0 +1 @@ +u9fs-mount-log diff --git a/s6/u9fs-mount/down b/s6/u9fs-mount/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/producer-for b/s6/u9fs-mount/producer-for @@ -0,0 +1 @@ +u9fs-mount-log diff --git a/s6/backup/backup-log/type b/s6/u9fs-mount/type diff --git a/s6/u9fs-mount/u9fs-mount-log/consumer-for b/s6/u9fs-mount/u9fs-mount-log/consumer-for @@ -1 +0,0 @@ -u9fs-mount-run diff --git a/s6/u9fs-mount/u9fs-mount-log/run b/s6/u9fs-mount/u9fs-mount-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/u9fs-mount-run diff --git a/s6/u9fs-mount/u9fs-mount-log/type b/s6/u9fs-mount/u9fs-mount-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/u9fs-mount/u9fs-mount-run/dependencies b/s6/u9fs-mount/u9fs-mount-run/dependencies @@ -1 +0,0 @@ -u9fs-mount-log diff --git a/s6/u9fs-mount/u9fs-mount-run/down b/s6/u9fs-mount/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/u9fs-mount-run/producer-for b/s6/u9fs-mount/u9fs-mount-run/producer-for @@ -1 +0,0 @@ -u9fs-mount-log diff --git a/s6/u9fs-mount/u9fs-mount-run/type b/s6/u9fs-mount/u9fs-mount-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/u9fs-mount/u9fs-mount-run/up b/s6/u9fs-mount/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/u9fs-mount/contents b/s6/u9fs-mount/u9fs-mount/contents @@ -1,3 +0,0 @@ -u9fs-mount -u9fs-mount-log -u9fs-mount-run diff --git a/s6/u9fs-mount/u9fs-mount/type b/s6/u9fs-mount/u9fs-mount/type @@ -1 +0,0 @@ -bundle diff --git a/s6/u9fs-mount/up b/s6/u9fs-mount/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/dependencies b/s6/u9fs/dependencies @@ -0,0 +1 @@ +u9fs-log diff --git a/s6/u9fs/producer-for b/s6/u9fs/producer-for @@ -0,0 +1 @@ +u9fs-log diff --git a/s6/u9fs/run b/s6/u9fs/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/backup/backup-log/type b/s6/u9fs/type diff --git a/s6/u9fs/u9fs-log/consumer-for b/s6/u9fs/u9fs-log/consumer-for @@ -1 +0,0 @@ -u9fs-run diff --git a/s6/u9fs/u9fs-log/run b/s6/u9fs/u9fs-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/u9fs-run diff --git a/s6/u9fs/u9fs-log/type b/s6/u9fs/u9fs-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/u9fs/u9fs-run/dependencies b/s6/u9fs/u9fs-run/dependencies @@ -1 +0,0 @@ -u9fs-log diff --git a/s6/u9fs/u9fs-run/producer-for b/s6/u9fs/u9fs-run/producer-for @@ -1 +0,0 @@ -u9fs-log diff --git a/s6/u9fs/u9fs-run/run b/s6/u9fs/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/u9fs-run/type b/s6/u9fs/u9fs-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/u9fs/u9fs/contents b/s6/u9fs/u9fs/contents @@ -1,2 +0,0 @@ -u9fs-log -u9fs-run diff --git a/s6/u9fs/u9fs/type b/s6/u9fs/u9fs/type @@ -1 +0,0 @@ -bundle diff --git a/s6/venti-log/consumer-for b/s6/venti-log/consumer-for @@ -0,0 +1 @@ +venti-run 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-run diff --git a/s6/backup/backup-log/type b/s6/venti-log/type diff --git a/s6/venti/data/conf b/s6/venti/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/data/fmt b/s6/venti/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/dependencies b/s6/venti/dependencies @@ -0,0 +1 @@ +venti-log diff --git a/s6/venti/producer-for b/s6/venti/producer-for @@ -0,0 +1 @@ +venti-log diff --git a/s6/venti/run b/s6/venti/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/backup/backup-log/type b/s6/venti/type diff --git a/s6/venti/venti-log/consumer-for b/s6/venti/venti-log/consumer-for @@ -1 +0,0 @@ -venti-run diff --git a/s6/venti/venti-log/run b/s6/venti/venti-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/venti-run diff --git a/s6/venti/venti-log/type b/s6/venti/venti-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/venti/venti-run/data/conf b/s6/venti/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/venti-run/data/fmt b/s6/venti/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/venti-run/dependencies b/s6/venti/venti-run/dependencies @@ -1 +0,0 @@ -venti-log diff --git a/s6/venti/venti-run/producer-for b/s6/venti/venti-run/producer-for @@ -1 +0,0 @@ -venti-log diff --git a/s6/venti/venti-run/run b/s6/venti/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/venti-run/type b/s6/venti/venti-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/venti/venti/contents b/s6/venti/venti/contents @@ -1,2 +0,0 @@ -venti-log -venti-run diff --git a/s6/venti/venti/type b/s6/venti/venti/type @@ -1 +0,0 @@ -bundle