dot

packages and services management
Log | Files | Refs | README

commit 7b40d44681009e81222c4d342e325f7daed7b8d6
parent 02282570d66e0fad6fc0782c4b5bfe8c4ce41947
Author: Josuah Demangeon <mail@josuah.net>
Date:   Wed,  7 Nov 2018 22:31:05 +0100

:D I am so happy!

Diffstat:
Mprofile.d/ssh.sh | 2+-
Ds6/acme-client-log/consumer-for | 1-
Ds6/acme-client-log/pipeline-name | 1-
Ds6/acme-client-log/run | 2--
Ds6/acme-client-log/snooze-acme-client-log/consumer-for | 1-
Ds6/acme-client-log/snooze-acme-client-log/pipeline-name | 1-
Ds6/acme-client-log/snooze-acme-client-log/run | 2--
Ds6/acme-client-snooze/producer-for | 1-
Ds6/acme-client-snooze/run | 25-------------------------
Rs6/acme-client-snooze/data/conf -> s6/acme-client/josuah.net/data/conf | 0
Rs6/acme-client-snooze/env/AGREEMENT_URL -> s6/acme-client/josuah.net/env/AGREEMENT_URL | 0
Rs6/acme-client-snooze/env/DOMAIN -> s6/acme-client/josuah.net/env/DOMAIN | 0
Rs6/acme-client-snooze/env/SSLDIR -> s6/acme-client/josuah.net/env/SSLDIR | 0
Rs6/acme-client-snooze/env/WWDIR -> s6/acme-client/josuah.net/env/WWDIR | 0
Rs6/acme-client-log/snooze-acme-client-log/type -> s6/acme-client/josuah.net/type | 0
As6/acme-client/x/run | 25+++++++++++++++++++++++++
Ds6/anvil-snooze/job | 8--------
Ds6/axfrdns-log/consumer-for | 1-
Ds6/axfrdns-log/pipeline-name | 1-
Ds6/axfrdns-log/run | 2--
Ds6/axfrdns-run/producer-for | 1-
Ds6/axfrdns-run/run | 9---------
Rs6/axfrdns-run/env/ROOT -> s6/axfrdns-tcp/x/env/ROOT | 0
As6/axfrdns-tcp/x/run | 11+++++++++++
Rs6/acme-client-log/type -> s6/axfrdns-tcp/x/type | 0
Ds6/bird-log/consumer-for | 1-
Ds6/bird-log/pipeline-name | 1-
Ds6/bird-log/run | 2--
Ds6/bird-run/producer-for | 1-
Rs6/bird-run/run -> s6/bird/x/run | 0
Rs6/acme-client-snooze/type -> s6/bird/x/type | 0
Ds6/cherrymusic-log/consumer-for | 1-
Ds6/cherrymusic-log/pipeline-name | 1-
Ds6/cherrymusic-log/run | 2--
Ds6/cherrymusic-run/producer-for | 1-
Rs6/cherrymusic-run/run -> s6/cherrymusic/x/run | 0
Rs6/anvil-snooze/type -> s6/cherrymusic/x/type | 0
Ds6/collectd-log/consumer-for | 1-
Ds6/collectd-log/pipeline-name | 1-
Ds6/collectd-log/run | 2--
Ds6/collectd-run/producer-for | 1-
Ds6/collectd-run/run | 4----
Rs6/collectd-run/data/conf -> s6/collectd/x/data/conf | 0
As6/collectd/x/run | 4++++
Rs6/axfrdns-log/type -> s6/collectd/x/type | 0
Ds6/curvevpn-client/env/SERVER | 2--
Ds6/curvevpn-client/producer-for | 1-
Ds6/curvevpn-client/run | 11-----------
Rs6/curvevpn-client/data/Makefile -> s6/curvevpn-client/x/data/Makefile | 0
Rs6/curvevpn-client/env/EXT -> s6/curvevpn-client/x/env/EXT | 0
Rs6/curvevpn-client/env/IP -> s6/curvevpn-client/x/env/IP | 0
Rs6/curvevpn-client/env/NAME -> s6/curvevpn-client/x/env/NAME | 0
Rs6/curvevpn-client/env/PORT -> s6/curvevpn-client/x/env/PORT | 0
Rs6/curvevpn-client/env/PUBKEY -> s6/curvevpn-client/x/env/PUBKEY | 0
Rs6/curvevpn-client/env/ROOT -> s6/curvevpn-client/x/env/ROOT | 0
As6/curvevpn-client/x/env/SERVER | 2++
As6/curvevpn-client/x/run | 11+++++++++++
Rs6/axfrdns-run/type -> s6/curvevpn-client/x/type | 0
Ds6/curvevpn-log/consumer-for | 2--
Ds6/curvevpn-log/pipeline-name | 1-
Ds6/curvevpn-log/run | 2--
Ds6/curvevpn-server/producer-for | 1-
Ds6/curvevpn-server/run | 15---------------
Rs6/curvevpn-server/data/Makefile -> s6/curvevpn-server/x/data/Makefile | 0
Rs6/curvevpn-server/data/data -> s6/curvevpn-server/x/data/data | 0
Rs6/curvevpn-server/data/data.cdb -> s6/curvevpn-server/x/data/data.cdb | 0
Rs6/curvevpn-server/env/EXT -> s6/curvevpn-server/x/env/EXT | 0
Rs6/curvevpn-server/env/IP -> s6/curvevpn-server/x/env/IP | 0
Rs6/curvevpn-server/env/NAME -> s6/curvevpn-server/x/env/NAME | 0
Rs6/curvevpn-server/env/PORT -> s6/curvevpn-server/x/env/PORT | 0
Rs6/curvevpn-server/env/ROOT -> s6/curvevpn-server/x/env/ROOT | 0
Rs6/curvevpn-server/make-key -> s6/curvevpn-server/x/make-key | 0
As6/curvevpn-server/x/run | 15+++++++++++++++
Rs6/bird-log/type -> s6/curvevpn-server/x/type | 0
Ds6/dnscache-log/consumer-for | 1-
Ds6/dnscache-log/pipeline-name | 1-
Ds6/dnscache-log/run | 2--
Ds6/dnscache-run/producer-for | 1-
Ds6/dnscache-run/run | 11-----------
Rs6/anvil-snooze/run -> s6/dnscache/x/data/ip/127.0.0.1 | 0
Rs6/dnscache-run/data/ip/127.0.0.1 -> s6/dnscache/x/data/servers/@ | 0
Rs6/dnscache-run/env/CACHESIZE -> s6/dnscache/x/env/CACHESIZE | 0
Rs6/dnscache-run/env/DATALIMIT -> s6/dnscache/x/env/DATALIMIT | 0
Rs6/dnscache-run/env/IP -> s6/dnscache/x/env/IP | 0
Rs6/dnscache-run/env/IPSEND -> s6/dnscache/x/env/IPSEND | 0
Rs6/dnscache-run/env/ROOT -> s6/dnscache/x/env/ROOT | 0
As6/dnscache/x/run | 11+++++++++++
Rs6/bird-run/type -> s6/dnscache/x/type | 0
Ds6/ffingerd-log/consumer-for | 1-
Ds6/ffingerd-log/pipeline-name | 1-
Ds6/ffingerd-log/run | 2--
Ds6/ffingerd-tcp/producer-for | 1-
Rs6/ffingerd-tcp/run -> s6/ffingerd-tcp/x/run | 0
Rs6/cherrymusic-log/type -> s6/ffingerd-tcp/x/type | 0
Ds6/fossil-log/consumer-for | 1-
Ds6/fossil-log/pipeline-name | 1-
Ds6/fossil-log/run | 2--
Ds6/fossil-run/producer-for | 1-
Ds6/fossil-run/run | 9---------
As6/fossil/x/run | 13+++++++++++++
Rs6/cherrymusic-run/type -> s6/fossil/x/type | 0
Ds6/ftpd-log/consumer-for | 1-
Ds6/ftpd-log/pipeline-name | 1-
Ds6/ftpd-log/run | 2--
Ds6/ftpd-tcp/run | 9---------
Rs6/ftpd-tcp/env/IP -> s6/ftpd/x/env/IP | 0
As6/ftpd/x/run | 10++++++++++
Ds6/geomyidae-log/consumer-for | 1-
Ds6/geomyidae-log/pipeline-name | 1-
Ds6/geomyidae-log/run | 2--
Ds6/geomyidae-tcp/producer-for | 1-
Ds6/geomyidae-tcp/run | 9---------
Rs6/geomyidae-tcp/env/BASE -> s6/geomyidae/x/env/BASE | 0
Rs6/geomyidae-tcp/env/HOST -> s6/geomyidae/x/env/HOST | 0
Rs6/geomyidae-tcp/env/PORT -> s6/geomyidae/x/env/PORT | 0
As6/geomyidae/x/run | 9+++++++++
Rs6/collectd-log/type -> s6/geomyidae/x/type | 0
Ds6/git-daemon-log/consumer-for | 1-
Ds6/git-daemon-log/pipeline-name | 1-
Ds6/git-daemon-log/run | 2--
Ds6/git-daemon-tcp/producer-for | 1-
Rs6/git-daemon-tcp/run -> s6/git-daemon/x/run | 0
Rs6/collectd-run/type -> s6/git-daemon/x/type | 0
Ds6/git-mirror-log/pipeline-name | 1-
Rs6/git-mirror-snooze/data/mirror -> s6/git-mirror/snooze/data/mirror | 0
Rs6/git-mirror-snooze/env/GIT -> s6/git-mirror/snooze/env/GIT | 0
Rs6/git-mirror-snooze/run -> s6/git-mirror/snooze/run | 0
Ds6/httpd-log/consumer-for | 1-
Ds6/httpd-log/pipeline-name | 1-
Ds6/httpd-log/run | 2--
Ds6/httpd-run/producer-for | 1-
Rs6/httpd-run/run -> s6/httpd/x/run | 0
Rs6/curvevpn-client/type -> s6/httpd/x/type | 0
Ds6/httpfile-log/consumer-for | 2--
Ds6/httpfile-log/pipeline-name | 1-
Ds6/httpfile-log/run | 2--
Ds6/httpfile-tcp/producer-for | 1-
Rs6/httpfile-tcp/data/Makefile -> s6/httpfile-tcp/x/data/Makefile | 0
Rs6/httpfile-tcp/env/ACCESSFILE -> s6/httpfile-tcp/x/env/ACCESSFILE | 0
Rs6/httpfile-tcp/env/ROOT -> s6/httpfile-tcp/x/env/ROOT | 0
Rs6/httpfile-tcp/run -> s6/httpfile-tcp/x/run | 0
Rs6/curvevpn-log/type -> s6/httpfile-tcp/x/type | 0
Rs6/httpfile-tls/env/CERTFILE -> s6/httpfile-tls/josuah.net/env/CERTFILE | 0
Rs6/httpfile-tls/env/KEYFILE -> s6/httpfile-tls/josuah.net/env/KEYFILE | 0
Ds6/httpfile-tls/producer-for | 1-
Rs6/httpfile-tls/data/Makefile -> s6/httpfile-tls/x/data/Makefile | 0
Rs6/httpfile-tls/env/ACCESSFILE -> s6/httpfile-tls/x/env/ACCESSFILE | 0
Rs6/httpfile-tls/env/CERTFILE -> s6/httpfile-tls/x/env/CERTFILE | 0
Rs6/httpfile-tls/env/KEYFILE -> s6/httpfile-tls/x/env/KEYFILE | 0
Rs6/httpfile-tls/env/ROOT -> s6/httpfile-tls/x/env/ROOT | 0
Rs6/httpfile-tls/run -> s6/httpfile-tls/x/run | 0
Rs6/curvevpn-server/type -> s6/httpfile-tls/x/type | 0
Ds6/ii-log/consumer-for | 2--
Ds6/ii-log/pipeline-name | 1-
Ds6/ii-log/run | 2--
Ds6/ii-tcp/producer-for | 1-
Rs6/ii-tcp/run -> s6/ii-tcp/x/run | 0
Ds6/ii-tls/env/CAFILE | 1-
Ds6/ii-tls/env/PORT | 1-
Ds6/ii-tls/finish | 2--
As6/ii-tls/irc.cyberia.is/env/HOST | 1+
Rs6/dnscache-run/data/servers/@ -> s6/ii-tls/irc.cyberia.is/env/NAME | 0
Rs6/ii-tcp/env/NICK -> s6/ii-tls/irc.cyberia.is/env/NICK | 0
Rs6/ii-tcp/env/NAME -> s6/ii-tls/irc.cyberia.is/env/PASS | 0
Rs6/ii-tcp/env/USER -> s6/ii-tls/irc.cyberia.is/env/USER | 0
Rs6/ii-tcp/env/HOST -> s6/ii-tls/irc.freenode.net/env/HOST | 0
Rs6/ii-tcp/env/PASS -> s6/ii-tls/irc.freenode.net/env/NAME | 0
Rs6/ii-tls/env/NICK -> s6/ii-tls/irc.freenode.net/env/NICK | 0
Rs6/ii-tls/data/.empty -> s6/ii-tls/irc.freenode.net/env/PASS | 0
Rs6/ii-tls/env/USER -> s6/ii-tls/irc.freenode.net/env/USER | 0
As6/ii-tls/irc.oftc.net/env/HOST | 1+
Rs6/ii-tls/env/NAME -> s6/ii-tls/irc.oftc.net/env/NAME | 0
Rs6/mpop-run/env/USER -> s6/ii-tls/irc.oftc.net/env/NICK | 0
Rs6/ii-tls/env/PASS -> s6/ii-tls/irc.oftc.net/env/PASS | 0
Rs6/ii-tcp/env/NICK -> s6/ii-tls/irc.oftc.net/env/USER | 0
Ds6/ii-tls/producer-for | 1-
As6/ii-tls/x/env/CAFILE | 1+
Rs6/ii-tls/env/HOST -> s6/ii-tls/x/env/HOST | 0
Rs6/anvil-snooze/run -> s6/ii-tls/x/env/NAME | 0
Rs6/anvil-snooze/run -> s6/ii-tls/x/env/NICK | 0
Rs6/anvil-snooze/run -> s6/ii-tls/x/env/PASS | 0
Rs6/ii-tcp/env/PORT -> s6/ii-tls/x/env/PORT | 0
Rs6/anvil-snooze/run -> s6/ii-tls/x/env/USER | 0
Rs6/ii-tcp/finish -> s6/ii-tls/x/finish | 0
Rs6/ii-tls/run -> s6/ii-tls/x/run | 0
Rs6/dnscache-log/type -> s6/ii-tls/x/type | 0
Ds6/mpop-log/consumer-for | 1-
Ds6/mpop-log/pipeline-name | 1-
Ds6/mpop-log/run | 2--
Ds6/mpop-log/type | 1-
Ds6/mpop-run/producer-for | 1-
Ds6/mpop-run/run | 14--------------
Ds6/mpop-run/type | 1-
Rs6/mpop-run/data/mpoprc -> s6/mpop/x/data/mpoprc | 0
Rs6/ii-tcp/env/NICK -> s6/mpop/x/env/USER | 0
As6/mpop/x/run | 13+++++++++++++
Rs6/dnscache-run/type -> s6/mpop/x/type | 0
Ds6/ngircd-log/consumer-for | 1-
Ds6/ngircd-log/pipeline-name | 1-
Ds6/ngircd-log/run | 2--
Ds6/ngircd-log/type | 1-
Ds6/ngircd-tls/producer-for | 1-
Ds6/ngircd-tls/type | 1-
Rs6/ngircd-tls/data/conf -> s6/ngircd-tls/x/data/conf | 0
Rs6/ngircd-tls/data/motd -> s6/ngircd-tls/x/data/motd | 0
Rs6/ngircd-tls/run -> s6/ngircd-tls/x/run | 0
Rs6/ffingerd-log/type -> s6/ngircd-tls/x/type | 0
Ds6/ntpclient-log/consumer-for | 1-
Ds6/ntpclient-log/pipeline-name | 1-
Ds6/ntpclient-log/run | 2--
Ds6/ntpclient-log/type | 1-
Ds6/ntpclient-run/env/HOST | 1-
Ds6/ntpclient-run/producer-for | 1-
Ds6/ntpclient-run/run | 7-------
Ds6/ntpclient-run/type | 1-
As6/ntpclient/x/env/HOST | 1+
As6/ntpclient/x/run | 7+++++++
Rs6/ffingerd-tcp/type -> s6/ntpclient/x/type | 0
Ds6/ok-all/contents | 2--
Ds6/ok-all/type | 1-
Ds6/ok-laptop/type | 1-
Ds6/ok-server/contents | 8--------
Ds6/ok-server/type | 1-
As6/ok/laptop/type | 1+
As6/ok/minimal/contents | 2++
As6/ok/minimal/type | 1+
As6/ok/server/contents | 8++++++++
As6/ok/server/type | 1+
Ds6/opentracker-log/consumer-for | 1-
Ds6/opentracker-log/pipeline-name | 1-
Ds6/opentracker-log/run | 2--
Ds6/opentracker-log/type | 1-
Ds6/opentracker-run/producer-for | 1-
Ds6/opentracker-run/run | 4----
Ds6/opentracker-run/type | 1-
As6/opentracker/x/run | 4++++
Rs6/fossil-log/type -> s6/opentracker/x/type | 0
Ds6/publicfile/ftpd-run/producer-for | 1-
Ds6/publicfile/ftpd-run/run | 7-------
Ds6/publicfile/ftpd-run/type | 1-
Ds6/qemu-tap-log/consumer-for | 1-
Ds6/qemu-tap-log/pipeline-name | 1-
Ds6/qemu-tap-log/run | 2--
Ds6/qemu-tap-log/type | 1-
Ds6/qemu-tap-run/producer-for | 1-
Ds6/qemu-tap-run/run | 23-----------------------
Ds6/qemu-tap-run/type | 1-
As6/qemu-tap/x/run | 23+++++++++++++++++++++++
Rs6/fossil-run/type -> s6/qemu-tap/x/type | 0
Ds6/qemu-user-log/consumer-for | 1-
Ds6/qemu-user-log/pipeline-name | 1-
Ds6/qemu-user-log/run | 2--
Ds6/qemu-user-log/type | 1-
Ds6/qemu-user-run/env/NAME | 0
Ds6/qemu-user-run/producer-for | 1-
Ds6/qemu-user-run/run | 21---------------------
Ds6/qemu-user-run/type | 1-
Rs6/anvil-snooze/run -> s6/qemu-user/x/env/NAME | 0
As6/qemu-user/x/run | 21+++++++++++++++++++++
Rs6/ftpd-log/type -> s6/qemu-user/x/type | 0
Ds6/qmail-log/consumer-for | 4----
Ds6/qmail-log/pipeline-name | 1-
Ds6/qmail-log/run | 2--
Ds6/qmail-log/type | 1-
Ds6/qmail-pop3d/producer-for | 1-
Ds6/qmail-pop3d/run | 9---------
As6/qmail-pop3d/x/run | 9+++++++++
Ds6/qmail-send/env/MAILDIR | 1-
Ds6/qmail-send/producer-for | 1-
Ds6/qmail-send/run | 7-------
Ds6/qmail-send/type | 1-
As6/qmail-send/x/env/MAILDIR | 1+
As6/qmail-send/x/run | 7+++++++
Rs6/geomyidae-log/type -> s6/qmail-send/x/type | 0
Ds6/qmail-tcp/producer-for | 1-
Ds6/qmail-tcp/run | 7-------
As6/qmail-tcp/x/run | 11+++++++++++
Ds6/qmail-tls/env/CERTFILE | 1-
Ds6/qmail-tls/env/KEYFILE | 1-
Rs6/httpfile-tls/env/CERTFILE -> s6/qmail-tls/josuah.net/env/CERTFILE | 0
Rs6/httpfile-tls/env/KEYFILE -> s6/qmail-tls/josuah.net/env/KEYFILE | 0
Ds6/qmail-tls/producer-for | 1-
Ds6/qmail-tls/run | 10----------
Ds6/qmail-tls/type | 1-
Rs6/anvil-snooze/run -> s6/qmail-tls/x/env/CERTFILE | 0
Rs6/anvil-snooze/run -> s6/qmail-tls/x/env/KEYFILE | 0
As6/qmail-tls/x/run | 10++++++++++
Rs6/geomyidae-tcp/type -> s6/qmail-tls/x/type | 0
Ds6/quark-log/consumer-for | 2--
Ds6/quark-log/pipeline-name | 1-
Ds6/quark-log/run | 2--
Ds6/quark-log/type | 1-
Ds6/quark-tcp/producer-for | 1-
Ds6/quark-tcp/run | 13-------------
Ds6/quark-tcp/type | 1-
Ds6/quark-tor/producer-for | 1-
Ds6/quark-tor/run | 16----------------
Ds6/quark-tor/type | 1-
Ds6/ratox-log/consumer-for | 1-
Ds6/ratox-log/pipeline-name | 1-
Ds6/ratox-log/run | 2--
Ds6/ratox-log/type | 1-
Ds6/ratox-tcp/producer-for | 1-
Ds6/ratox-tcp/run | 6------
Ds6/ratox-tcp/type | 1-
As6/ratox/x/run | 6++++++
Rs6/git-daemon-log/type -> s6/ratox/x/type | 0
Ds6/s6-logger/run | 8--------
As6/s6-logger/x/run | 8++++++++
Ds6/ssh-agent-josuah-unix/env/USER | 1-
Ds6/ssh-agent-josuah-unix/producer-for | 1-
Ds6/ssh-agent-josuah-unix/run | 9---------
Ds6/ssh-agent-josuah-unix/type | 1-
Ds6/ssh-agent-log/consumer-for | 2--
Ds6/ssh-agent-log/pipeline-name | 1-
Ds6/ssh-agent-log/run | 2--
Ds6/ssh-agent-log/type | 1-
Ds6/ssh-agent-root-unix/env/USER | 1-
Ds6/ssh-agent-root-unix/producer-for | 1-
Ds6/ssh-agent-root-unix/run | 9---------
Ds6/ssh-agent-root-unix/type | 1-
Rs6/ii-tcp/env/NICK -> s6/ssh-agent/josuah/env/USER | 0
As6/ssh-agent/root/env/USER | 1+
Rs6/anvil-snooze/run -> s6/ssh-agent/x/env/USER | 0
As6/ssh-agent/x/run | 9+++++++++
Rs6/git-daemon-tcp/type -> s6/ssh-agent/x/type | 0
Ds6/tinc-log/consumer-for | 1-
Ds6/tinc-log/pipeline-name | 1-
Ds6/tinc-log/run | 2--
Ds6/tinc-log/type | 1-
Ds6/tinc-run/data/conf.d/common.conf | 2--
Ds6/tinc-run/data/hosts/kroa | 13-------------
Ds6/tinc-run/data/hosts/nas | 13-------------
Ds6/tinc-run/data/hosts/pdmg | 12------------
Ds6/tinc-run/data/hosts/rpi | 13-------------
Ds6/tinc-run/data/hosts/t470s | 12------------
Ds6/tinc-run/data/tinc-up | 11-----------
Ds6/tinc-run/producer-for | 1-
Ds6/tinc-run/run | 7-------
Ds6/tinc-run/type | 1-
As6/tinc/josuah.net/data/hosts/kroa | 13+++++++++++++
As6/tinc/josuah.net/data/hosts/nas | 13+++++++++++++
As6/tinc/josuah.net/data/hosts/pdmg | 12++++++++++++
As6/tinc/josuah.net/data/hosts/rpi | 13+++++++++++++
As6/tinc/josuah.net/data/hosts/t470s | 12++++++++++++
As6/tinc/x/data/conf.d/common.conf | 2++
As6/tinc/x/data/tinc-up | 11+++++++++++
As6/tinc/x/run | 7+++++++
Rs6/httpd-log/type -> s6/tinc/x/type | 0
Ds6/tinydns-log/consumer-for | 1-
Ds6/tinydns-log/pipeline-name | 1-
Ds6/tinydns-log/run | 2--
Ds6/tinydns-log/type | 1-
Ds6/tinydns-run/data/Makefile | 2--
Ds6/tinydns-run/data/add-alias | 2--
Ds6/tinydns-run/data/add-childns | 2--
Ds6/tinydns-run/data/add-host | 2--
Ds6/tinydns-run/data/add-mx | 2--
Ds6/tinydns-run/data/add-ns | 2--
Ds6/tinydns-run/env/IP | 1-
Ds6/tinydns-run/env/ROOT | 1-
Ds6/tinydns-run/producer-for | 1-
Ds6/tinydns-run/run | 7-------
Ds6/tinydns-run/type | 1-
As6/tinydns/x/data/Makefile | 2++
As6/tinydns/x/data/add-alias | 2++
As6/tinydns/x/data/add-childns | 2++
As6/tinydns/x/data/add-host | 2++
As6/tinydns/x/data/add-mx | 2++
As6/tinydns/x/data/add-ns | 2++
Rs6/curvevpn-server/env/IP -> s6/tinydns/x/env/IP | 0
Rs6/axfrdns-run/env/ROOT -> s6/tinydns/x/env/ROOT | 0
As6/tinydns/x/run | 7+++++++
Rs6/httpd-run/type -> s6/tinydns/x/type | 0
Ds6/tinysshd-log/consumer-for | 1-
Ds6/tinysshd-log/pipeline-name | 1-
Ds6/tinysshd-log/run | 2--
Ds6/tinysshd-log/type | 1-
Ds6/tinysshd-tcp/data/... | 0
Ds6/tinysshd-tcp/env/PORT | 1-
Ds6/tinysshd-tcp/producer-for | 1-
Ds6/tinysshd-tcp/run | 11-----------
Ds6/tinysshd-tcp/type | 1-
Rs6/anvil-snooze/run -> s6/tinysshd/x/data/... | 0
As6/tinysshd/x/env/PORT | 1+
As6/tinysshd/x/run | 11+++++++++++
Rs6/httpfile-log/type -> s6/tinysshd/x/type | 0
Ds6/tor-log/consumer-for | 1-
Ds6/tor-log/pipeline-name | 1-
Ds6/tor-log/run | 2--
Ds6/tor-log/type | 1-
Ds6/tor-run/data/conf | 26--------------------------
Ds6/tor-run/producer-for | 1-
Ds6/tor-run/run | 4----
Ds6/tor-run/type | 1-
As6/tor/x/data/conf | 26++++++++++++++++++++++++++
As6/tor/x/run | 4++++
Rs6/httpfile-tcp/type -> s6/tor/x/type | 0
Ds6/transmission-log/consumer-for | 1-
Ds6/transmission-log/pipeline-name | 1-
Ds6/transmission-log/run | 2--
Ds6/transmission-log/type | 1-
Ds6/transmission-run/producer-for | 1-
Ds6/transmission-run/run | 4----
Ds6/transmission-run/type | 1-
As6/transmission/x/run | 4++++
Ds6/u9fs-log/consumer-for | 1-
Ds6/u9fs-log/pipeline-name | 1-
Ds6/u9fs-log/run | 2--
Ds6/u9fs-log/type | 1-
Ds6/u9fs-mount-log/consumer-for | 1-
Ds6/u9fs-mount-log/pipeline-name | 1-
Ds6/u9fs-mount-log/run | 2--
Ds6/u9fs-mount-log/type | 1-
Ds6/u9fs-mount-run/down | 4----
Ds6/u9fs-mount-run/producer-for | 1-
Ds6/u9fs-mount-run/type | 1-
Ds6/u9fs-mount-run/up | 5-----
As6/u9fs-mount/x/run/down | 4++++
As6/u9fs-mount/x/run/producer-for | 1+
Rs6/httpfile-tls/type -> s6/u9fs-mount/x/run/type | 0
As6/u9fs-mount/x/run/up | 5+++++
Ds6/u9fs-run/producer-for | 1-
Ds6/u9fs-run/run | 6------
Ds6/u9fs-run/type | 1-
As6/u9fs-ssh/x/run | 6++++++
Rs6/ii-log/type -> s6/u9fs-ssh/x/type | 0
Ds6/venti-log/consumer-for | 1-
Ds6/venti-log/pipeline-name | 1-
Ds6/venti-log/run | 2--
Ds6/venti-log/type | 1-
Ds6/venti-run/data/conf | 8--------
Ds6/venti-run/data/fmt | 9---------
Ds6/venti-run/producer-for | 1-
Ds6/venti-run/run | 9---------
Ds6/venti-run/type | 1-
As6/venti/x/data/conf | 8++++++++
As6/venti/x/data/fmt | 9+++++++++
As6/venti/x/run | 9+++++++++
Rs6/ii-tcp/type -> s6/venti/x/type | 0
Ds6/walldns-log/consumer-for | 1-
Ds6/walldns-log/pipeline-name | 1-
Ds6/walldns-log/run | 2--
Ds6/walldns-log/type | 1-
Ds6/walldns-run/env/IP | 1-
Ds6/walldns-run/env/ROOT | 1-
Ds6/walldns-run/producer-for | 1-
Ds6/walldns-run/run | 5-----
Ds6/walldns-run/type | 1-
Rs6/curvevpn-server/env/IP -> s6/walldns/x/env/IP | 0
Rs6/axfrdns-run/env/ROOT -> s6/walldns/x/env/ROOT | 0
As6/walldns/x/run | 5+++++
Rs6/ii-tls/type -> s6/walldns/x/type | 0
453 files changed, 454 insertions(+), 737 deletions(-)

diff --git a/profile.d/ssh.sh b/profile.d/ssh.sh @@ -1 +1 @@ -export SSH_AUTH_SOCK=$HOME/.ssh/sock +export SSH_AUTH_SOCK=$HOME/.ssh/auth.sock diff --git a/s6/acme-client-log/consumer-for b/s6/acme-client-log/consumer-for @@ -1 +0,0 @@ -acme-client-snooze diff --git a/s6/acme-client-log/pipeline-name b/s6/acme-client-log/pipeline-name @@ -1 +0,0 @@ -acme-client diff --git a/s6/acme-client-log/run b/s6/acme-client-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/acme-client diff --git a/s6/acme-client-log/snooze-acme-client-log/consumer-for b/s6/acme-client-log/snooze-acme-client-log/consumer-for @@ -1 +0,0 @@ -snooze-acme-client-run diff --git a/s6/acme-client-log/snooze-acme-client-log/pipeline-name b/s6/acme-client-log/snooze-acme-client-log/pipeline-name @@ -1 +0,0 @@ -snooze-acme-client diff --git a/s6/acme-client-log/snooze-acme-client-log/run b/s6/acme-client-log/snooze-acme-client-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -s6-log t /var/log/snooze-acme-client diff --git a/s6/acme-client-snooze/producer-for b/s6/acme-client-snooze/producer-for @@ -1 +0,0 @@ -acme-client-log diff --git a/s6/acme-client-snooze/run b/s6/acme-client-snooze/run @@ -1,25 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 1 -s6-envdir env multisubstitute { - importas -n AGREEMENT_URL AGREEMENT_URL - importas -n WWWDIR WWWDIR - importas -n SSLDIR SSLDIR - importas -n DOMAIN DOMAIN -} - -# It uses ":well-known" instead of ".well-known" because httpfile(1) -# translates ':' to '.'. - -if { mkdir -p ${WWWDIR}/${DOMAIN}/:well-known/acme-challenge } -if { mkdir -p ${SSLDIR}/${DOMAIN} } -if { mkdir -p ${SSLDIR}/private } -if { chmod 700 ${SSLDIR}/private } - -snooze -d1 -acme-client -vnN - -a $AGREEMENT_URL - -C ${WWWDIR}/${DOMAIN}/:well-known/acme-challenge - -c ${SSLDIR}/${DOMAIN} - -k ${SSLDIR}/${DOMAIN}/privkey.pem - -f ${SSLDIR}/private/privkey.pem - $DOMAIN diff --git a/s6/acme-client-snooze/data/conf b/s6/acme-client/josuah.net/data/conf diff --git a/s6/acme-client-snooze/env/AGREEMENT_URL b/s6/acme-client/josuah.net/env/AGREEMENT_URL diff --git a/s6/acme-client-snooze/env/DOMAIN b/s6/acme-client/josuah.net/env/DOMAIN diff --git a/s6/acme-client-snooze/env/SSLDIR b/s6/acme-client/josuah.net/env/SSLDIR diff --git a/s6/acme-client-snooze/env/WWDIR b/s6/acme-client/josuah.net/env/WWDIR diff --git a/s6/acme-client-log/snooze-acme-client-log/type b/s6/acme-client/josuah.net/type diff --git a/s6/acme-client/x/run b/s6/acme-client/x/run @@ -0,0 +1,25 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env multisubstitute { + importas -n AGREEMENT_URL AGREEMENT_URL + importas -n WWWDIR WWWDIR + importas -n SSLDIR SSLDIR + importas -n DOMAIN DOMAIN +} + +# It uses ":well-known" instead of ".well-known" because httpfile(1) +# translates ':' to '.'. + +if { mkdir -p ${WWWDIR}/${DOMAIN}/:well-known/acme-challenge } +if { mkdir -p ${SSLDIR}/${DOMAIN} } +if { mkdir -p ${SSLDIR}/private } +if { chmod 700 ${SSLDIR}/private } + +snooze -d1 +acme-client -vnN + -a $AGREEMENT_URL + -C ${WWWDIR}/${DOMAIN}/:well-known/acme-challenge + -c ${SSLDIR}/${DOMAIN} + -k ${SSLDIR}/${DOMAIN}/privkey.pem + -f ${SSLDIR}/private/privkey.pem + $DOMAIN diff --git a/s6/anvil-snooze/job b/s6/anvil-snooze/job @@ -1,8 +0,0 @@ -#!/bin/sh -e - -cd "$ANVIL/def" -for pack in * -do - output=$(anvil add "$pack") && status=ok || status=fail - printf '%-60s %s\n' "$output" "$status" -done diff --git a/s6/axfrdns-log/consumer-for b/s6/axfrdns-log/consumer-for @@ -1 +0,0 @@ -axfrdns-run diff --git a/s6/axfrdns-log/pipeline-name b/s6/axfrdns-log/pipeline-name @@ -1 +0,0 @@ -axfrdns diff --git a/s6/axfrdns-log/run b/s6/axfrdns-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/axfrdns diff --git a/s6/axfrdns-run/producer-for b/s6/axfrdns-run/producer-for @@ -1 +0,0 @@ -axfrdns-log diff --git a/s6/axfrdns-run/run b/s6/axfrdns-run/run @@ -1,9 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 1 -s6-envdir env - -s6-envuidgid dns -s6-softliimt 300000 - -s6-tcpserver -vDRHl0 0.0.0.0 53 -axrfdns diff --git a/s6/axfrdns-run/env/ROOT b/s6/axfrdns-tcp/x/env/ROOT diff --git a/s6/axfrdns-tcp/x/run b/s6/axfrdns-tcp/x/run @@ -0,0 +1,11 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env multisubstitute { + importas USER USER +} + +s6-envuidgid $USER +s6-softliimt 300000 + +s6-tcpserver -vDRHl0 0.0.0.0 53 +axrfdns diff --git a/s6/acme-client-log/type b/s6/axfrdns-tcp/x/type diff --git a/s6/bird-log/consumer-for b/s6/bird-log/consumer-for @@ -1 +0,0 @@ -bird-run diff --git a/s6/bird-log/pipeline-name b/s6/bird-log/pipeline-name @@ -1 +0,0 @@ -bird diff --git a/s6/bird-log/run b/s6/bird-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/bird diff --git a/s6/bird-run/producer-for b/s6/bird-run/producer-for @@ -1 +0,0 @@ -bird-log diff --git a/s6/bird-run/run b/s6/bird/x/run diff --git a/s6/acme-client-snooze/type b/s6/bird/x/type diff --git a/s6/cherrymusic-log/consumer-for b/s6/cherrymusic-log/consumer-for @@ -1 +0,0 @@ -cherrymusic-run diff --git a/s6/cherrymusic-log/pipeline-name b/s6/cherrymusic-log/pipeline-name @@ -1 +0,0 @@ -cherrymusic diff --git a/s6/cherrymusic-log/run b/s6/cherrymusic-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/cherrymusic diff --git a/s6/cherrymusic-run/producer-for b/s6/cherrymusic-run/producer-for @@ -1 +0,0 @@ -cherrymusic-log diff --git a/s6/cherrymusic-run/run b/s6/cherrymusic/x/run diff --git a/s6/anvil-snooze/type b/s6/cherrymusic/x/type diff --git a/s6/collectd-log/consumer-for b/s6/collectd-log/consumer-for @@ -1 +0,0 @@ -collectd-run diff --git a/s6/collectd-log/pipeline-name b/s6/collectd-log/pipeline-name @@ -1 +0,0 @@ -collectd diff --git a/s6/collectd-log/run b/s6/collectd-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/collectd diff --git a/s6/collectd-run/producer-for b/s6/collectd-run/producer-for @@ -1 +0,0 @@ -collectd-log diff --git a/s6/collectd-run/run b/s6/collectd-run/run @@ -1,4 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 - -collectd -f -C data/conf diff --git a/s6/collectd-run/data/conf b/s6/collectd/x/data/conf diff --git a/s6/collectd/x/run b/s6/collectd/x/run @@ -0,0 +1,4 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 + +collectd -f -C /etc/collectd/conf diff --git a/s6/axfrdns-log/type b/s6/collectd/x/type diff --git a/s6/curvevpn-client/env/SERVER b/s6/curvevpn-client/env/SERVER @@ -1 +0,0 @@ -IP- \ No newline at end of file diff --git a/s6/curvevpn-client/producer-for b/s6/curvevpn-client/producer-for @@ -1 +0,0 @@ -curvevpn-log diff --git a/s6/curvevpn-client/run b/s6/curvevpn-client/run @@ -1,11 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 1 -s6-envdir env multisubstitute { - importas NAME NAME - importas PUBKEY PUBKEY - importas IP IP - importas PORT PORT - importas EXT EXT -} - -curvevpn-client $NAME $PUBKEY $IP $PORT $EXT curvevpn diff --git a/s6/curvevpn-client/data/Makefile b/s6/curvevpn-client/x/data/Makefile diff --git a/s6/curvevpn-client/env/EXT b/s6/curvevpn-client/x/env/EXT diff --git a/s6/curvevpn-client/env/IP b/s6/curvevpn-client/x/env/IP diff --git a/s6/curvevpn-client/env/NAME b/s6/curvevpn-client/x/env/NAME diff --git a/s6/curvevpn-client/env/PORT b/s6/curvevpn-client/x/env/PORT diff --git a/s6/curvevpn-client/env/PUBKEY b/s6/curvevpn-client/x/env/PUBKEY diff --git a/s6/curvevpn-client/env/ROOT b/s6/curvevpn-client/x/env/ROOT diff --git a/s6/curvevpn-client/x/env/SERVER b/s6/curvevpn-client/x/env/SERVER @@ -0,0 +1 @@ +IP+ \ No newline at end of file diff --git a/s6/curvevpn-client/x/run b/s6/curvevpn-client/x/run @@ -0,0 +1,11 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env multisubstitute { + importas NAME NAME + importas PUBKEY PUBKEY + importas IP IP + importas PORT PORT + importas EXT EXT +} + +curvevpn-client $NAME $PUBKEY $IP $PORT $EXT curvevpn diff --git a/s6/axfrdns-run/type b/s6/curvevpn-client/x/type diff --git a/s6/curvevpn-log/consumer-for b/s6/curvevpn-log/consumer-for @@ -1,2 +0,0 @@ -curvevpn-server -curvevpn-client diff --git a/s6/curvevpn-log/pipeline-name b/s6/curvevpn-log/pipeline-name @@ -1 +0,0 @@ -curvevpn diff --git a/s6/curvevpn-log/run b/s6/curvevpn-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/curvevpn diff --git a/s6/curvevpn-server/producer-for b/s6/curvevpn-server/producer-for @@ -1 +0,0 @@ -curvevpn-log diff --git a/s6/curvevpn-server/run b/s6/curvevpn-server/run @@ -1,15 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 1 -s6-envdir env multisubstitute { - importas NAME NAME - importas IP IP - importas PORT PORT - importas ROOT ROOT - importas EXT EXT -} - -cd $ROOT -if { rm -f lock/???????????????????????????????????????????????????????????????? } -curvevpn-server $NAME data/key $IP $PORT $EXT -curvevpn-message -curvevpn -s ................................................................ diff --git a/s6/curvevpn-server/data/Makefile b/s6/curvevpn-server/x/data/Makefile diff --git a/s6/curvevpn-server/data/data b/s6/curvevpn-server/x/data/data diff --git a/s6/curvevpn-server/data/data.cdb b/s6/curvevpn-server/x/data/data.cdb Binary files differ. diff --git a/s6/curvevpn-server/env/EXT b/s6/curvevpn-server/x/env/EXT diff --git a/s6/curvevpn-server/env/IP b/s6/curvevpn-server/x/env/IP diff --git a/s6/curvevpn-server/env/NAME b/s6/curvevpn-server/x/env/NAME diff --git a/s6/curvevpn-server/env/PORT b/s6/curvevpn-server/x/env/PORT diff --git a/s6/curvevpn-server/env/ROOT b/s6/curvevpn-server/x/env/ROOT diff --git a/s6/curvevpn-server/make-key b/s6/curvevpn-server/x/make-key diff --git a/s6/curvevpn-server/x/run b/s6/curvevpn-server/x/run @@ -0,0 +1,15 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env multisubstitute { + importas NAME NAME + importas IP IP + importas PORT PORT + importas ROOT ROOT + importas EXT EXT +} + +cd $ROOT +if { rm -f lock/???????????????????????????????????????????????????????????????? } +curvevpn-server $NAME data/key $IP $PORT $EXT +curvevpn-message +curvevpn -s ................................................................ diff --git a/s6/bird-log/type b/s6/curvevpn-server/x/type diff --git a/s6/dnscache-log/consumer-for b/s6/dnscache-log/consumer-for @@ -1 +0,0 @@ -dnscache-run diff --git a/s6/dnscache-log/pipeline-name b/s6/dnscache-log/pipeline-name @@ -1 +0,0 @@ -dnscache diff --git a/s6/dnscache-log/run b/s6/dnscache-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/dnscache diff --git a/s6/dnscache-run/producer-for b/s6/dnscache-run/producer-for @@ -1 +0,0 @@ -dnscache-log diff --git a/s6/dnscache-run/run b/s6/dnscache-run/run @@ -1,11 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 1 -s6-envdir env { - importas DATALIMIT DATALIMIT -} - -s6-envguid dns -s6-softlimit -o 250 -d $DATALIMIT - -pipeline { dd 'if=/dev/random' } -dnscache diff --git a/s6/anvil-snooze/run b/s6/dnscache/x/data/ip/127.0.0.1 diff --git a/s6/dnscache-run/data/ip/127.0.0.1 b/s6/dnscache/x/data/servers/@ diff --git a/s6/dnscache-run/env/CACHESIZE b/s6/dnscache/x/env/CACHESIZE diff --git a/s6/dnscache-run/env/DATALIMIT b/s6/dnscache/x/env/DATALIMIT diff --git a/s6/dnscache-run/env/IP b/s6/dnscache/x/env/IP diff --git a/s6/dnscache-run/env/IPSEND b/s6/dnscache/x/env/IPSEND diff --git a/s6/dnscache-run/env/ROOT b/s6/dnscache/x/env/ROOT diff --git a/s6/dnscache/x/run b/s6/dnscache/x/run @@ -0,0 +1,11 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env { + importas DATALIMIT DATALIMIT +} + +s6-envguid dns +s6-softlimit -o 250 -d $DATALIMIT + +pipeline { dd 'if=/dev/random' } +dnscache diff --git a/s6/bird-run/type b/s6/dnscache/x/type diff --git a/s6/ffingerd-log/consumer-for b/s6/ffingerd-log/consumer-for @@ -1 +0,0 @@ -ffingerd-tcp diff --git a/s6/ffingerd-log/pipeline-name b/s6/ffingerd-log/pipeline-name @@ -1 +0,0 @@ -ffingerd diff --git a/s6/ffingerd-log/run b/s6/ffingerd-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/ffingerd diff --git a/s6/ffingerd-tcp/producer-for b/s6/ffingerd-tcp/producer-for @@ -1 +0,0 @@ -ffingerd-log diff --git a/s6/ffingerd-tcp/run b/s6/ffingerd-tcp/x/run diff --git a/s6/cherrymusic-log/type b/s6/ffingerd-tcp/x/type diff --git a/s6/fossil-log/consumer-for b/s6/fossil-log/consumer-for @@ -1 +0,0 @@ -fossil-run diff --git a/s6/fossil-log/pipeline-name b/s6/fossil-log/pipeline-name @@ -1 +0,0 @@ -fossil diff --git a/s6/fossil-log/run b/s6/fossil-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/fossil diff --git a/s6/fossil-run/producer-for b/s6/fossil-run/producer-for @@ -1 +0,0 @@ -fossil-log diff --git a/s6/fossil-run/run b/s6/fossil-run/run @@ -1,9 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 - -foreground { mkdir -p /home/venti } - -fossil -s - -c conf - -a tcp!*!17034 - -h tcp!*!8080 diff --git a/s6/fossil/x/run b/s6/fossil/x/run @@ -0,0 +1,13 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env multisubstitute { + importas VENTI VENTI +} + +if { mkdir -p $VENTI } +/var/venti + +fossil -s + -c /etc/fossil/conf + -a tcp!*!17034 + -h tcp!*!8080 diff --git a/s6/cherrymusic-run/type b/s6/fossil/x/type diff --git a/s6/ftpd-log/consumer-for b/s6/ftpd-log/consumer-for @@ -1 +0,0 @@ -ftpd-tcp diff --git a/s6/ftpd-log/pipeline-name b/s6/ftpd-log/pipeline-name @@ -1 +0,0 @@ -ftpd diff --git a/s6/ftpd-log/run b/s6/ftpd-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/ftpd diff --git a/s6/ftpd-tcp/run b/s6/ftpd-tcp/run @@ -1,9 +0,0 @@ -#!/local/bin/execlineb -P -fdmove -c 1 -s6-envdir env multisubstitute { - importas IP IP -} - -s6-envuidgid www -s6-tcpserver -vD -b50 -c100 $IP 21 -ftpd /var/www/ diff --git a/s6/ftpd-tcp/env/IP b/s6/ftpd/x/env/IP diff --git a/s6/ftpd/x/run b/s6/ftpd/x/run @@ -0,0 +1,10 @@ +#!/local/bin/execlineb -P +fdmove -c 2 1 +s6-envdir env multisubstitute { + importas HOST HOST + importas PORT PORT +} + +s6-envuidgid www +s6-tcpserver -vD -b50 -c100 $HOST $PORT +ftpd /var/www/ diff --git a/s6/geomyidae-log/consumer-for b/s6/geomyidae-log/consumer-for @@ -1 +0,0 @@ -geomyidae-run diff --git a/s6/geomyidae-log/pipeline-name b/s6/geomyidae-log/pipeline-name @@ -1 +0,0 @@ -geomyidae diff --git a/s6/geomyidae-log/run b/s6/geomyidae-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/geomyidae diff --git a/s6/geomyidae-tcp/producer-for b/s6/geomyidae-tcp/producer-for @@ -1 +0,0 @@ -geomyidae-log diff --git a/s6/geomyidae-tcp/run b/s6/geomyidae-tcp/run @@ -1,9 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 1 -s6-envdir env multisubstitute { - importas HOST HOST - importas PORT PORT - importas BASE BASE -} - -geomyidae -d -b $BASE -h $HOST -p $PORT diff --git a/s6/geomyidae-tcp/env/BASE b/s6/geomyidae/x/env/BASE diff --git a/s6/geomyidae-tcp/env/HOST b/s6/geomyidae/x/env/HOST diff --git a/s6/geomyidae-tcp/env/PORT b/s6/geomyidae/x/env/PORT diff --git a/s6/geomyidae/x/run b/s6/geomyidae/x/run @@ -0,0 +1,9 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env multisubstitute { + importas HOST HOST + importas PORT PORT + importas BASE BASE +} + +geomyidae -d -b $BASE -h $HOST -p $PORT diff --git a/s6/collectd-log/type b/s6/geomyidae/x/type diff --git a/s6/git-daemon-log/consumer-for b/s6/git-daemon-log/consumer-for @@ -1 +0,0 @@ -git-daemon-tcp diff --git a/s6/git-daemon-log/pipeline-name b/s6/git-daemon-log/pipeline-name @@ -1 +0,0 @@ -git-daemon diff --git a/s6/git-daemon-log/run b/s6/git-daemon-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/git-daemon diff --git a/s6/git-daemon-tcp/producer-for b/s6/git-daemon-tcp/producer-for @@ -1 +0,0 @@ -git-daemon-log diff --git a/s6/git-daemon-tcp/run b/s6/git-daemon/x/run diff --git a/s6/collectd-run/type b/s6/git-daemon/x/type diff --git a/s6/git-mirror-log/pipeline-name b/s6/git-mirror-log/pipeline-name @@ -1 +0,0 @@ -git-mirror diff --git a/s6/git-mirror-snooze/data/mirror b/s6/git-mirror/snooze/data/mirror diff --git a/s6/git-mirror-snooze/env/GIT b/s6/git-mirror/snooze/env/GIT diff --git a/s6/git-mirror-snooze/run b/s6/git-mirror/snooze/run diff --git a/s6/httpd-log/consumer-for b/s6/httpd-log/consumer-for @@ -1 +0,0 @@ -httpd-run diff --git a/s6/httpd-log/pipeline-name b/s6/httpd-log/pipeline-name @@ -1 +0,0 @@ -httpd diff --git a/s6/httpd-log/run b/s6/httpd-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/httpd diff --git a/s6/httpd-run/producer-for b/s6/httpd-run/producer-for @@ -1 +0,0 @@ -httpd-log diff --git a/s6/httpd-run/run b/s6/httpd/x/run diff --git a/s6/curvevpn-client/type b/s6/httpd/x/type diff --git a/s6/httpfile-log/consumer-for b/s6/httpfile-log/consumer-for @@ -1,2 +0,0 @@ -httpfile-tcp -httpfile-tls diff --git a/s6/httpfile-log/pipeline-name b/s6/httpfile-log/pipeline-name @@ -1 +0,0 @@ -httpfile diff --git a/s6/httpfile-log/run b/s6/httpfile-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/httpfile diff --git a/s6/httpfile-tcp/producer-for b/s6/httpfile-tcp/producer-for @@ -1 +0,0 @@ -httpfile-log diff --git a/s6/httpfile-tcp/data/Makefile b/s6/httpfile-tcp/x/data/Makefile diff --git a/s6/httpfile-tcp/env/ACCESSFILE b/s6/httpfile-tcp/x/env/ACCESSFILE diff --git a/s6/httpfile-tcp/env/ROOT b/s6/httpfile-tcp/x/env/ROOT diff --git a/s6/httpfile-tcp/run b/s6/httpfile-tcp/x/run diff --git a/s6/curvevpn-log/type b/s6/httpfile-tcp/x/type diff --git a/s6/httpfile-tls/env/CERTFILE b/s6/httpfile-tls/josuah.net/env/CERTFILE diff --git a/s6/httpfile-tls/env/KEYFILE b/s6/httpfile-tls/josuah.net/env/KEYFILE diff --git a/s6/httpfile-tls/producer-for b/s6/httpfile-tls/producer-for @@ -1 +0,0 @@ -httpfile-log diff --git a/s6/httpfile-tls/data/Makefile b/s6/httpfile-tls/x/data/Makefile diff --git a/s6/httpfile-tls/env/ACCESSFILE b/s6/httpfile-tls/x/env/ACCESSFILE diff --git a/s6/httpfile-tls/env/CERTFILE b/s6/httpfile-tls/x/env/CERTFILE diff --git a/s6/httpfile-tls/env/KEYFILE b/s6/httpfile-tls/x/env/KEYFILE diff --git a/s6/httpfile-tls/env/ROOT b/s6/httpfile-tls/x/env/ROOT diff --git a/s6/httpfile-tls/run b/s6/httpfile-tls/x/run diff --git a/s6/curvevpn-server/type b/s6/httpfile-tls/x/type diff --git a/s6/ii-log/consumer-for b/s6/ii-log/consumer-for @@ -1,2 +0,0 @@ -ii-irc.freenode.net -ii-irc.cyberia.is diff --git a/s6/ii-log/pipeline-name b/s6/ii-log/pipeline-name @@ -1 +0,0 @@ -ii diff --git a/s6/ii-log/run b/s6/ii-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/ii diff --git a/s6/ii-tcp/producer-for b/s6/ii-tcp/producer-for @@ -1 +0,0 @@ -ii-tcp-log diff --git a/s6/ii-tcp/run b/s6/ii-tcp/x/run diff --git a/s6/ii-tls/env/CAFILE b/s6/ii-tls/env/CAFILE @@ -1 +0,0 @@ -./data/cert.pem diff --git a/s6/ii-tls/env/PORT b/s6/ii-tls/env/PORT @@ -1 +0,0 @@ -6697 diff --git a/s6/ii-tls/finish b/s6/ii-tls/finish @@ -1,2 +0,0 @@ -#!/usr/local/bin/execlineb -P -sleep 30 diff --git a/s6/ii-tls/irc.cyberia.is/env/HOST b/s6/ii-tls/irc.cyberia.is/env/HOST @@ -0,0 +1 @@ +irc.cyberia.is diff --git a/s6/dnscache-run/data/servers/@ b/s6/ii-tls/irc.cyberia.is/env/NAME diff --git a/s6/ii-tcp/env/NICK b/s6/ii-tls/irc.cyberia.is/env/NICK diff --git a/s6/ii-tcp/env/NAME b/s6/ii-tls/irc.cyberia.is/env/PASS diff --git a/s6/ii-tcp/env/USER b/s6/ii-tls/irc.cyberia.is/env/USER diff --git a/s6/ii-tcp/env/HOST b/s6/ii-tls/irc.freenode.net/env/HOST diff --git a/s6/ii-tcp/env/PASS b/s6/ii-tls/irc.freenode.net/env/NAME diff --git a/s6/ii-tls/env/NICK b/s6/ii-tls/irc.freenode.net/env/NICK diff --git a/s6/ii-tls/data/.empty b/s6/ii-tls/irc.freenode.net/env/PASS diff --git a/s6/ii-tls/env/USER b/s6/ii-tls/irc.freenode.net/env/USER diff --git a/s6/ii-tls/irc.oftc.net/env/HOST b/s6/ii-tls/irc.oftc.net/env/HOST @@ -0,0 +1 @@ +irc.oftc.net diff --git a/s6/ii-tls/env/NAME b/s6/ii-tls/irc.oftc.net/env/NAME diff --git a/s6/mpop-run/env/USER b/s6/ii-tls/irc.oftc.net/env/NICK diff --git a/s6/ii-tls/env/PASS b/s6/ii-tls/irc.oftc.net/env/PASS diff --git a/s6/ii-tcp/env/NICK b/s6/ii-tls/irc.oftc.net/env/USER diff --git a/s6/ii-tls/producer-for b/s6/ii-tls/producer-for @@ -1 +0,0 @@ -ii-tls-log diff --git a/s6/ii-tls/x/env/CAFILE b/s6/ii-tls/x/env/CAFILE @@ -0,0 +1 @@ +data/cert.pem diff --git a/s6/ii-tls/env/HOST b/s6/ii-tls/x/env/HOST diff --git a/s6/anvil-snooze/run b/s6/ii-tls/x/env/NAME diff --git a/s6/anvil-snooze/run b/s6/ii-tls/x/env/NICK diff --git a/s6/anvil-snooze/run b/s6/ii-tls/x/env/PASS diff --git a/s6/ii-tcp/env/PORT b/s6/ii-tls/x/env/PORT diff --git a/s6/anvil-snooze/run b/s6/ii-tls/x/env/USER diff --git a/s6/ii-tcp/finish b/s6/ii-tls/x/finish diff --git a/s6/ii-tls/run b/s6/ii-tls/x/run diff --git a/s6/dnscache-log/type b/s6/ii-tls/x/type diff --git a/s6/mpop-log/consumer-for b/s6/mpop-log/consumer-for @@ -1 +0,0 @@ -mpop-run diff --git a/s6/mpop-log/pipeline-name b/s6/mpop-log/pipeline-name @@ -1 +0,0 @@ -mpop diff --git a/s6/mpop-log/run b/s6/mpop-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/mpop diff --git a/s6/mpop-log/type b/s6/mpop-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/mpop-run/producer-for b/s6/mpop-run/producer-for @@ -1 +0,0 @@ -mpop-log diff --git a/s6/mpop-run/run b/s6/mpop-run/run @@ -1,14 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 1 -s6-envdir env multisubstitute { - 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-run/type b/s6/mpop-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/mpop-run/data/mpoprc b/s6/mpop/x/data/mpoprc diff --git a/s6/ii-tcp/env/NICK b/s6/mpop/x/env/USER diff --git a/s6/mpop/x/run b/s6/mpop/x/run @@ -0,0 +1,13 @@ +#!/usr/bin/env execlineb +fdmove -c 1 +s6-envdir env multisubstitute { + 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/dnscache-run/type b/s6/mpop/x/type diff --git a/s6/ngircd-log/consumer-for b/s6/ngircd-log/consumer-for @@ -1 +0,0 @@ -ngircd-tls diff --git a/s6/ngircd-log/pipeline-name b/s6/ngircd-log/pipeline-name @@ -1 +0,0 @@ -ngircd diff --git a/s6/ngircd-log/run b/s6/ngircd-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/ngircd diff --git a/s6/ngircd-log/type b/s6/ngircd-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/ngircd-tls/producer-for b/s6/ngircd-tls/producer-for @@ -1 +0,0 @@ -ngircd-log diff --git a/s6/ngircd-tls/type b/s6/ngircd-tls/type @@ -1 +0,0 @@ -longrun diff --git a/s6/ngircd-tls/data/conf b/s6/ngircd-tls/x/data/conf diff --git a/s6/ngircd-tls/data/motd b/s6/ngircd-tls/x/data/motd diff --git a/s6/ngircd-tls/run b/s6/ngircd-tls/x/run diff --git a/s6/ffingerd-log/type b/s6/ngircd-tls/x/type diff --git a/s6/ntpclient-log/consumer-for b/s6/ntpclient-log/consumer-for @@ -1 +0,0 @@ -ntpclient-run diff --git a/s6/ntpclient-log/pipeline-name b/s6/ntpclient-log/pipeline-name @@ -1 +0,0 @@ -ntpclient diff --git a/s6/ntpclient-log/run b/s6/ntpclient-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/ntpclient diff --git a/s6/ntpclient-log/type b/s6/ntpclient-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/ntpclient-run/env/HOST b/s6/ntpclient-run/env/HOST @@ -1 +0,0 @@ -pool.ntp.org diff --git a/s6/ntpclient-run/producer-for b/s6/ntpclient-run/producer-for @@ -1 +0,0 @@ -ntpclient-log diff --git a/s6/ntpclient-run/run b/s6/ntpclient-run/run @@ -1,7 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 1 -s6-envdir env multisubstitute { - importas HOST HOST -} - -ntpclient -h $HOST diff --git a/s6/ntpclient-run/type b/s6/ntpclient-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/ntpclient/x/env/HOST b/s6/ntpclient/x/env/HOST @@ -0,0 +1 @@ +pool.ntp.org diff --git a/s6/ntpclient/x/run b/s6/ntpclient/x/run @@ -0,0 +1,7 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env multisubstitute { + importas HOST HOST +} + +ntpclient -h $HOST diff --git a/s6/ffingerd-tcp/type b/s6/ntpclient/x/type diff --git a/s6/ok-all/contents b/s6/ok-all/contents @@ -1,2 +0,0 @@ -s6rc-fdholder -s6rc-oneshot-runner diff --git a/s6/ok-all/type b/s6/ok-all/type @@ -1 +0,0 @@ -bundle diff --git a/s6/ok-laptop/type b/s6/ok-laptop/type @@ -1 +0,0 @@ -bundle diff --git a/s6/ok-server/contents b/s6/ok-server/contents @@ -1,8 +0,0 @@ -httpfile -qmail -s6rc-fdholder -s6rc-oneshot-runner -tinysshd -ngircd -curvevpn -acme-client diff --git a/s6/ok-server/type b/s6/ok-server/type @@ -1 +0,0 @@ -bundle diff --git a/s6/ok/laptop/type b/s6/ok/laptop/type @@ -0,0 +1 @@ +bundle diff --git a/s6/ok/minimal/contents b/s6/ok/minimal/contents @@ -0,0 +1,2 @@ +s6rc-fdholder +s6rc-oneshot-runner diff --git a/s6/ok/minimal/type b/s6/ok/minimal/type @@ -0,0 +1 @@ +bundle diff --git a/s6/ok/server/contents b/s6/ok/server/contents @@ -0,0 +1,8 @@ +httpfile +qmail +s6rc-fdholder +s6rc-oneshot-runner +tinysshd +ngircd +curvevpn +acme-client diff --git a/s6/ok/server/type b/s6/ok/server/type @@ -0,0 +1 @@ +bundle diff --git a/s6/opentracker-log/consumer-for b/s6/opentracker-log/consumer-for @@ -1 +0,0 @@ -opentracker-run diff --git a/s6/opentracker-log/pipeline-name b/s6/opentracker-log/pipeline-name @@ -1 +0,0 @@ -opentracker diff --git a/s6/opentracker-log/run b/s6/opentracker-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/opentracker diff --git a/s6/opentracker-log/type b/s6/opentracker-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/opentracker-run/producer-for b/s6/opentracker-run/producer-for @@ -1 +0,0 @@ -opentracker-log diff --git a/s6/opentracker-run/run b/s6/opentracker-run/run @@ -1,4 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 - -opentracker -d /home/tracker diff --git a/s6/opentracker-run/type b/s6/opentracker-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/opentracker/x/run b/s6/opentracker/x/run @@ -0,0 +1,4 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 + +opentracker -d /var/opentracker diff --git a/s6/fossil-log/type b/s6/opentracker/x/type diff --git a/s6/publicfile/ftpd-run/producer-for b/s6/publicfile/ftpd-run/producer-for @@ -1 +0,0 @@ -ftpd-log diff --git a/s6/publicfile/ftpd-run/run b/s6/publicfile/ftpd-run/run @@ -1,7 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-envuidgid www -s6-tcpserver -vD -b50 -c100 0.0.0.0 21 - -ftpd /var/www/ diff --git a/s6/publicfile/ftpd-run/type b/s6/publicfile/ftpd-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/qemu-tap-log/consumer-for b/s6/qemu-tap-log/consumer-for @@ -1 +0,0 @@ -qemu-tap-run diff --git a/s6/qemu-tap-log/pipeline-name b/s6/qemu-tap-log/pipeline-name @@ -1 +0,0 @@ -qemu-tap diff --git a/s6/qemu-tap-log/run b/s6/qemu-tap-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/qemu-tap diff --git a/s6/qemu-tap-log/type b/s6/qemu-tap-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/qemu-tap-run/producer-for b/s6/qemu-tap-run/producer-for @@ -1 +0,0 @@ -qemu-tap-log diff --git a/s6/qemu-tap-run/run b/s6/qemu-tap-run/run @@ -1,23 +0,0 @@ -#!/usr/bin/env execlineb -fdmove 1 -s6-envdir env multisubstitute { - importas NAME NAME -} - -# qemu without networking services, using a tap ethernet device - -# The virtual machine main interface (nic,vlan=0) is communicating -# 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. - -qemu-system-x86_64 - -name $NAME - -m 333M - -netdev tap,id=nd0,ifname=tap0,script=no,downscript=no - -device virtio-net,netdev=nd0,mac=52:54:00:00:00:00 - /var/iso/$name.iso - -# -display none -# -display curses -# -display vnc=0.0.0.0:0 diff --git a/s6/qemu-tap-run/type b/s6/qemu-tap-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/qemu-tap/x/run b/s6/qemu-tap/x/run @@ -0,0 +1,23 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env multisubstitute { + importas NAME NAME +} + +# qemu without networking services, using a tap ethernet device + +# The virtual machine main interface (nic,vlan=0) is communicating +# 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. + +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/fossil-run/type b/s6/qemu-tap/x/type diff --git a/s6/qemu-user-log/consumer-for b/s6/qemu-user-log/consumer-for @@ -1 +0,0 @@ -qemu-user-run diff --git a/s6/qemu-user-log/pipeline-name b/s6/qemu-user-log/pipeline-name @@ -1 +0,0 @@ -qemu-user diff --git a/s6/qemu-user-log/run b/s6/qemu-user-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/qemu-user diff --git a/s6/qemu-user-log/type b/s6/qemu-user-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/qemu-user-run/env/NAME b/s6/qemu-user-run/env/NAME diff --git a/s6/qemu-user-run/producer-for b/s6/qemu-user-run/producer-for @@ -1 +0,0 @@ -qemu-user-log diff --git a/s6/qemu-user-run/run b/s6/qemu-user-run/run @@ -1,21 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 1 -s6-envdir envmultisubstitute { - importas NAME NAME -} - -# qemu with facilitated networking services - -# The virtual machine communicates with the hypervisor, which setups -# a lot of servers (dns, tftp, dhcp...) for ease of use. - -qemu-system-x86_64 - -name $NAME - -m 333M - -netdev user,id=nd0,hostfwd=tcp::10000-:22 - -device e1000,netdev=nd0 - -display none - /var/iso/$NAME.iso - -# -display curses -# -display vnc=0.0.0.0:0 diff --git a/s6/qemu-user-run/type b/s6/qemu-user-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/anvil-snooze/run b/s6/qemu-user/x/env/NAME diff --git a/s6/qemu-user/x/run b/s6/qemu-user/x/run @@ -0,0 +1,21 @@ +#!/usr/bin/env execlineb +fdmove -c 1 +s6-envdir envmultisubstitute { + importas NAME NAME +} + +# qemu with facilitated networking services + +# The virtual machine communicates with the hypervisor, which setups +# a lot of servers (dns, tftp, dhcp...) for ease of use. + +qemu-system-x86_64 + -name $NAME + -m 333M + -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/ftpd-log/type b/s6/qemu-user/x/type diff --git a/s6/qmail-log/consumer-for b/s6/qmail-log/consumer-for @@ -1,4 +0,0 @@ -qmail-pop3d -qmail-send -qmail-tcp -qmail-tls diff --git a/s6/qmail-log/pipeline-name b/s6/qmail-log/pipeline-name @@ -1 +0,0 @@ -qmail diff --git a/s6/qmail-log/run b/s6/qmail-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/qmail diff --git a/s6/qmail-log/type b/s6/qmail-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/qmail-pop3d/producer-for b/s6/qmail-pop3d/producer-for @@ -1 +0,0 @@ -qmail-log diff --git a/s6/qmail-pop3d/run b/s6/qmail-pop3d/run @@ -1,9 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 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/x/run b/s6/qmail-pop3d/x/run @@ -0,0 +1,9 @@ +#!/usr/bin/env execlineb +fdmove -c 1 +s6-envdir env multisubstitute { + importas -n HOST HOST + importas -n MAILDIR MAILDIR +} + +s6-tlsserver 0.0.0.0 995 +qmail-popup $HOST checkpassword qmail-pop3d $MAILDIR diff --git a/s6/qmail-send/env/MAILDIR b/s6/qmail-send/env/MAILDIR @@ -1 +0,0 @@ -./mail/INBOX/ diff --git a/s6/qmail-send/producer-for b/s6/qmail-send/producer-for @@ -1 +0,0 @@ -qmail-log diff --git a/s6/qmail-send/run b/s6/qmail-send/run @@ -1,7 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 1 -s6-envdir env multisubstitute { - importas MAILDIR MAILDIR -} - -qmail-start $MAILDIR diff --git a/s6/qmail-send/type b/s6/qmail-send/type @@ -1 +0,0 @@ -longrun diff --git a/s6/qmail-send/x/env/MAILDIR b/s6/qmail-send/x/env/MAILDIR @@ -0,0 +1 @@ +./mail/INBOX/ diff --git a/s6/qmail-send/x/run b/s6/qmail-send/x/run @@ -0,0 +1,7 @@ +#!/usr/bin/env execlineb +fdmove -c 1 +s6-envdir env multisubstitute { + importas -n MAILDIR MAILDIR +} + +qmail-start $MAILDIR diff --git a/s6/geomyidae-log/type b/s6/qmail-send/x/type diff --git a/s6/qmail-tcp/producer-for b/s6/qmail-tcp/producer-for @@ -1 +0,0 @@ -qmail-log diff --git a/s6/qmail-tcp/run b/s6/qmail-tcp/run @@ -1,7 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-envuidgid qmaild - -s6-tcpserver -U 0.0.0.0 25 -qmail-smtpd diff --git a/s6/qmail-tcp/x/run b/s6/qmail-tcp/x/run @@ -0,0 +1,11 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir multisubstitute { + importas -n HOST HOST + importas -n PORT PORT +} + +s6-envuidgid qmaild + +s6-tcpserver -U $HOST $PORT +qmail-smtpd diff --git a/s6/qmail-tls/env/CERTFILE b/s6/qmail-tls/env/CERTFILE @@ -1 +0,0 @@ -/etc/ssl/josuah.net/cert.pem diff --git a/s6/qmail-tls/env/KEYFILE b/s6/qmail-tls/env/KEYFILE @@ -1 +0,0 @@ -/etc/ssl/josuah.net/privkey.pem diff --git a/s6/httpfile-tls/env/CERTFILE b/s6/qmail-tls/josuah.net/env/CERTFILE diff --git a/s6/httpfile-tls/env/KEYFILE b/s6/qmail-tls/josuah.net/env/KEYFILE diff --git a/s6/qmail-tls/producer-for b/s6/qmail-tls/producer-for @@ -1 +0,0 @@ -qmail-log diff --git a/s6/qmail-tls/run b/s6/qmail-tls/run @@ -1,10 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 1 -s6-envdir env multisubstitute { - importas -n ACCESSFILE ACCESSFILE -} - -s6-envuidgid qmaild - -s6-tlsserver -U 0.0.0.0 465 -qmail-smtpd diff --git a/s6/qmail-tls/type b/s6/qmail-tls/type @@ -1 +0,0 @@ -longrun diff --git a/s6/anvil-snooze/run b/s6/qmail-tls/x/env/CERTFILE diff --git a/s6/anvil-snooze/run b/s6/qmail-tls/x/env/KEYFILE diff --git a/s6/qmail-tls/x/run b/s6/qmail-tls/x/run @@ -0,0 +1,10 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env multisubstitute { + importas -n ACCESSFILE ACCESSFILE +} + +s6-envuidgid qmaild + +s6-tlsserver -U 0.0.0.0 465 +qmail-smtpd diff --git a/s6/geomyidae-tcp/type b/s6/qmail-tls/x/type diff --git a/s6/quark-log/consumer-for b/s6/quark-log/consumer-for @@ -1,2 +0,0 @@ -quark-tcp -quark-tor diff --git a/s6/quark-log/pipeline-name b/s6/quark-log/pipeline-name @@ -1 +0,0 @@ -quark diff --git a/s6/quark-log/run b/s6/quark-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/quark diff --git a/s6/quark-log/type b/s6/quark-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/quark-tcp/producer-for b/s6/quark-tcp/producer-for @@ -1 +0,0 @@ -quark-log diff --git a/s6/quark-tcp/run b/s6/quark-tcp/run @@ -1,13 +0,0 @@ -#!/usr/bin/env 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-tcp/type b/s6/quark-tcp/type @@ -1 +0,0 @@ -longrun diff --git a/s6/quark-tor/producer-for b/s6/quark-tor/producer-for @@ -1 +0,0 @@ -quark-log diff --git a/s6/quark-tor/run b/s6/quark-tor/run @@ -1,16 +0,0 @@ -#!/usr/bin/env execlineb -# static http server -fdmove -c 2 1 - -backtick tor { homeof tor } -importas tor tor - -backtick host { cat $tor/http/hostname } -importas host host - -quark -l - -u srv - -h 0.0.0.0 - -p 80 - -d /home/srv - -v $host" "$host"$ cyberia.systems" diff --git a/s6/quark-tor/type b/s6/quark-tor/type @@ -1 +0,0 @@ -longrun diff --git a/s6/ratox-log/consumer-for b/s6/ratox-log/consumer-for @@ -1 +0,0 @@ -ratox-tcp diff --git a/s6/ratox-log/pipeline-name b/s6/ratox-log/pipeline-name @@ -1 +0,0 @@ -ratox diff --git a/s6/ratox-log/run b/s6/ratox-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/ratox diff --git a/s6/ratox-log/type b/s6/ratox-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/ratox-tcp/producer-for b/s6/ratox-tcp/producer-for @@ -1 +0,0 @@ -ratox-log diff --git a/s6/ratox-tcp/run b/s6/ratox-tcp/run @@ -1,6 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 - -backtick home { homeof $USER } if { mkdir -p $home/tox } cd $home/tox - -exec ratox diff --git a/s6/ratox-tcp/type b/s6/ratox-tcp/type @@ -1 +0,0 @@ -longrun diff --git a/s6/ratox/x/run b/s6/ratox/x/run @@ -0,0 +1,6 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 + +backtick home { homeof $USER } if { mkdir -p $home/tox } cd $home/tox + +exec ratox diff --git a/s6/git-daemon-log/type b/s6/ratox/x/type diff --git a/s6/s6-logger/run b/s6/s6-logger/run @@ -1,8 +0,0 @@ -#!/usr/bin/env execlineb -redirfd -w 2 /dev/console -redirfd -w 1 /dev/null -redirfd -rnb 0 fifo - -s6-applyuidgid -u 0 -g 0 - -s6-log -bp -- t /var/log/s6 diff --git a/s6/s6-logger/x/run b/s6/s6-logger/x/run @@ -0,0 +1,8 @@ +#!/usr/bin/env execlineb +redirfd -w 2 /dev/console +redirfd -w 1 /dev/null +redirfd -rnb 0 fifo + +s6-applyuidgid -u 0 -g 0 + +s6-log -bp -- t /var/log/s6 diff --git a/s6/ssh-agent-josuah-unix/env/USER b/s6/ssh-agent-josuah-unix/env/USER @@ -1 +0,0 @@ -josuah diff --git a/s6/ssh-agent-josuah-unix/producer-for b/s6/ssh-agent-josuah-unix/producer-for @@ -1 +0,0 @@ -ssh-agent-log diff --git a/s6/ssh-agent-josuah-unix/run b/s6/ssh-agent-josuah-unix/run @@ -1,9 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 -s6-envdir env multisubstitute { - importas USER USER -} - -backtick -n home { homeof $USER } importas home home - -ssh-agent -d -a ${home}/.ssh/sock diff --git a/s6/ssh-agent-josuah-unix/type b/s6/ssh-agent-josuah-unix/type @@ -1 +0,0 @@ -longrun diff --git a/s6/ssh-agent-log/consumer-for b/s6/ssh-agent-log/consumer-for @@ -1,2 +0,0 @@ -ssh-agent-root-unix -ssh-agent-josuah-unix diff --git a/s6/ssh-agent-log/pipeline-name b/s6/ssh-agent-log/pipeline-name @@ -1 +0,0 @@ -ssh-agent diff --git a/s6/ssh-agent-log/run b/s6/ssh-agent-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/ssh-agent diff --git a/s6/ssh-agent-log/type b/s6/ssh-agent-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/ssh-agent-root-unix/env/USER b/s6/ssh-agent-root-unix/env/USER @@ -1 +0,0 @@ -root diff --git a/s6/ssh-agent-root-unix/producer-for b/s6/ssh-agent-root-unix/producer-for @@ -1 +0,0 @@ -ssh-agent-log diff --git a/s6/ssh-agent-root-unix/run b/s6/ssh-agent-root-unix/run @@ -1,9 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 -s6-envdir env multisubstitute { - importas USER USER -} - -backtick -n home { homeof $USER } importas home home - -ssh-agent -d -a ${home}/.ssh/sock diff --git a/s6/ssh-agent-root-unix/type b/s6/ssh-agent-root-unix/type @@ -1 +0,0 @@ -longrun diff --git a/s6/ii-tcp/env/NICK b/s6/ssh-agent/josuah/env/USER diff --git a/s6/ssh-agent/root/env/USER b/s6/ssh-agent/root/env/USER @@ -0,0 +1 @@ +root diff --git a/s6/anvil-snooze/run b/s6/ssh-agent/x/env/USER diff --git a/s6/ssh-agent/x/run b/s6/ssh-agent/x/run @@ -0,0 +1,9 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 +s6-envdir env multisubstitute { + importas USER USER +} + +backtick -n home { homeof $USER } importas home home + +ssh-agent -d -a ${home}/.ssh/sock diff --git a/s6/git-daemon-tcp/type b/s6/ssh-agent/x/type diff --git a/s6/tinc-log/consumer-for b/s6/tinc-log/consumer-for @@ -1 +0,0 @@ -tinc-run diff --git a/s6/tinc-log/pipeline-name b/s6/tinc-log/pipeline-name @@ -1 +0,0 @@ -tinc diff --git a/s6/tinc-log/run b/s6/tinc-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/tinc diff --git a/s6/tinc-log/type b/s6/tinc-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/tinc-run/data/conf.d/common.conf b/s6/tinc-run/data/conf.d/common.conf @@ -1,2 +0,0 @@ -DeviceStandby = no -PingTimeout = 15 diff --git a/s6/tinc-run/data/hosts/kroa b/s6/tinc-run/data/hosts/kroa @@ -1,13 +0,0 @@ -Address = kroa.josuah.net -Subnet = 172.16.55.5 -Port = 6655 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAmnT1YEcPTOiaa/GfWsFF1p3Qo/xeIjIb6e/cG62nKcjJSS+L3G+P -VUFOT7YfRdggzWDAMvxdAq5+DFcg2v3iDm8yTcv8ITaSKHFp4Tarkl2zEs5VELVY -mcPrYI99oyo9xiXh+x1G9/wp+uKxgoeU4m0+iNwyZw7ypoIgJhx8TfT7rgaXmyNX -HDBu/hBH7orTF3TMRp/VrWqD8UQyD0tK1gGQe4WIQJqouPxd44O8tKRgtha69q42 -kZ92DuFHLjTkYFjt4WKGEUAdja+aqbk5QeNyoOHtw9VkTIJcWShwPTYj0Ykdm/BS -oyBpV8pID+xWz81lpMilfanlPjgmzc6UvQIDAQAB ------END RSA PUBLIC KEY----- -Ed25519PublicKey = UzE1NtmdKv3MWpslesWIT4/AB3a8WZX+AP/2suMRUnK diff --git a/s6/tinc-run/data/hosts/nas b/s6/tinc-run/data/hosts/nas @@ -1,13 +0,0 @@ -Address = nas.josuah.net -Subnet = 172.16.55.2 -Port = 655 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAxFl/zn8owPVa0EBaazQaUck0ImV3+VS9+jOs0tePcQxuYHtX94dm -ZlYADJP/TaN8IEezQcgm2+iyavoOEBTCKhQ7/mYqG6UI2bcZjtu5UFl37YUJEYHN -dhvrhJwoYOWTFSu/d+UT/k8tFxoW308AXxqmb85egSBg8zaekrS7ibBSMi+AVaAz -g/Me+qgWh2j6jGh55Av1JeJ+1trlRLIvMRDwPe0U4hRjEZ/nBXFQS67AW1qg2tSF -3ieQgIr12FyZMw3ieWKiUW3JShdYRRMnV8hfKsn98R8LOirXBY2nCqRkWvKjYyY6 -bN2MzG57jdprYDR4ljglDFaXsNCDFgWTXwIDAQAB ------END RSA PUBLIC KEY----- -Ed25519PublicKey = QbVvGg+CgFHyzWzbmG4hpY7Kus3kMZean2Vj52v2roN diff --git a/s6/tinc-run/data/hosts/pdmg b/s6/tinc-run/data/hosts/pdmg @@ -1,12 +0,0 @@ -Subnet = 172.16.55.4 -Port = 655 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAxnCPtS3uHC8ZwZCDDPpDZWfuQF2PP1GdqHAF7pmk1mXCfapSVU/I -5gVP7scrbSKhNXpeQvgfRk7BQ+O1TpvhYDJRR6/xlACbaWeoFIQLbBMik10Dvw7k -Zrt/cnF8WTdEgQ52GIhwJhc/ZoBQHLfoAPZrD3lyTG4PQb/VyouQVJq8JgthHgIi -u3jz3meiB292rz9kg+wafl7YVsvWQZMK3CAHWjKLOaSNFYM6zkZU42v5d2mkC1aT -JowYMn0GRTKL4IC2WkzAt1JNK5Hd8YexdKBfqmobZI+SevlPYVkZLM7jmcTR7836 -bdBZF/tZpvRUY7eHSwVni576SwO+zakt3wIDAQAB ------END RSA PUBLIC KEY----- -Ed25519PublicKey = 5ooarAS0cWAxPQ6q2wn/1ZvhLYuz6ZRSJGZFFMMeZBF diff --git a/s6/tinc-run/data/hosts/rpi b/s6/tinc-run/data/hosts/rpi @@ -1,13 +0,0 @@ -Address = rpi.josuah.net -Subnet = 172.16.55.3 -Port = 655 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA35oN9yPu+lF7ZmphYandl896xjKYnNjIn5UB4gGvfbBEEA3kKYev -6Z4ApOvw2AgQ3WVbAynG3KbNj5jsCBBG8M9PfSPeFn4jpjycDqORi3sW6z3MQHfZ -u61jif16QtuuwXtrTiWO+MEVmSsCH9Vxtq5L6qJHZA7pEkQMxu/aEjOpYdpwZb/M -AnO7TU+PzTjUte40sfrIczHHkpDh8CdS1mKseF1XcNBhUANB7F6hQwhwD96GdGer -ioqMpltyyXMz4oZvhV+LD/jVOUXD1FZjiqO5TNtCFXYDLF/gxq/vmQ84eDo/I3Mo -E7wbHst5mOSRLBUP9cCAys/r6+JAdg+LfwIDAQAB ------END RSA PUBLIC KEY----- -Ed25519PublicKey = Zsy56fH9Hbd/qiRWRy/7YEKv4eQUPI1o+3iXs8lHN1N diff --git a/s6/tinc-run/data/hosts/t470s b/s6/tinc-run/data/hosts/t470s @@ -1,12 +0,0 @@ -Subnet = 172.16.55.1 - -Port = 12196 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAs99vlkaTp2BWltxN5KiBMkH/fHV1O3DWARK6ojFlhgENdmGjDxxk -0rshmaAvSjZ3uU2z+QkUIpovqEZf5I5abrAu1yKyMTIMFwqasa5D3TSkcePf+dD7 -LIr/YBWPl6kxHrNd2s3qPXBoYNaTBX7CCdXla7Rlz1/EnkMCfSLLd6YQsaCR4MsE -dwgR17bu5MsvB9YNLvbkqHHZCwvwIHrvX8dxvCr1BZwHAt/SDwg0nnTD2YNBUUl+ -SsXzMNfKiEjqmfHGfzMmP9Q9yjM6W5YAr+/Y7OPb/LnsPbYNC1L5YqaKskM431JU -vcpAPqjRJTvo+ji4hKrKdRal6tE61ZUW4wIDAQAB ------END RSA PUBLIC KEY----- -Ed25519PublicKey = Wnd7bglt6wxqz/QJT1KH9wajs2LUUnMTHTDSU7/SsQM diff --git a/s6/tinc-run/data/tinc-up b/s6/tinc-run/data/tinc-up @@ -1,11 +0,0 @@ -#!/bin/sh -ex - -case $(uname) in -(*BSD) - ifconfig "$INTERFACE" "$(tinc -c . get subnet)" netmask 255.255.255.0 - ;; -(Linux) - ip link set "$INTERFACE" up - ip addr add "$(tinc -c . get subnet | sed q)/24" dev "$INTERFACE" - ;; -esac diff --git a/s6/tinc-run/producer-for b/s6/tinc-run/producer-for @@ -1 +0,0 @@ -tinc-log diff --git a/s6/tinc-run/run b/s6/tinc-run/run @@ -1,7 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 - -tincd -D - -d 5 - --config=./data - --pidfile=./data/pid diff --git a/s6/tinc-run/type b/s6/tinc-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/tinc/josuah.net/data/hosts/kroa b/s6/tinc/josuah.net/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/josuah.net/data/hosts/nas b/s6/tinc/josuah.net/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/josuah.net/data/hosts/pdmg b/s6/tinc/josuah.net/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/josuah.net/data/hosts/rpi b/s6/tinc/josuah.net/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/josuah.net/data/hosts/t470s b/s6/tinc/josuah.net/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/x/data/conf.d/common.conf b/s6/tinc/x/data/conf.d/common.conf @@ -0,0 +1,2 @@ +DeviceStandby = no +PingTimeout = 15 diff --git a/s6/tinc/x/data/tinc-up b/s6/tinc/x/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/x/run b/s6/tinc/x/run @@ -0,0 +1,7 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 + +tincd -D + -d 5 + --config=./data + --pidfile=./data/pid diff --git a/s6/httpd-log/type b/s6/tinc/x/type diff --git a/s6/tinydns-log/consumer-for b/s6/tinydns-log/consumer-for @@ -1 +0,0 @@ -tinydns-run diff --git a/s6/tinydns-log/pipeline-name b/s6/tinydns-log/pipeline-name @@ -1 +0,0 @@ -tinydns diff --git a/s6/tinydns-log/run b/s6/tinydns-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/tinydns diff --git a/s6/tinydns-log/type b/s6/tinydns-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/tinydns-run/data/Makefile b/s6/tinydns-run/data/Makefile @@ -1,2 +0,0 @@ -data.cdb: data - tinydns-data diff --git a/s6/tinydns-run/data/add-alias b/s6/tinydns-run/data/add-alias @@ -1,2 +0,0 @@ -#!/bin/sh -e -exec tinydns-edit data data.new add alias "$@" diff --git a/s6/tinydns-run/data/add-childns b/s6/tinydns-run/data/add-childns @@ -1,2 +0,0 @@ -#!/bin/sh -e -exec tinydns-edit data data.new add childns "$@" diff --git a/s6/tinydns-run/data/add-host b/s6/tinydns-run/data/add-host @@ -1,2 +0,0 @@ -#!/bin/sh -e -exec tinydns-edit data data.new add host "$@" diff --git a/s6/tinydns-run/data/add-mx b/s6/tinydns-run/data/add-mx @@ -1,2 +0,0 @@ -#!/bin/sh -e -exec tinydns-edit data data.new add mx "$@" diff --git a/s6/tinydns-run/data/add-ns b/s6/tinydns-run/data/add-ns @@ -1,2 +0,0 @@ -#!/bin/sh -e -exec tinydns-edit data data.new add ns "$@" diff --git a/s6/tinydns-run/env/IP b/s6/tinydns-run/env/IP @@ -1 +0,0 @@ -0.0.0.0 diff --git a/s6/tinydns-run/env/ROOT b/s6/tinydns-run/env/ROOT @@ -1 +0,0 @@ -./data/ diff --git a/s6/tinydns-run/producer-for b/s6/tinydns-run/producer-for @@ -1 +0,0 @@ -tinydns-log diff --git a/s6/tinydns-run/run b/s6/tinydns-run/run @@ -1,7 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 1 -s6-envdir env - -s6-envuidgid dns - -tinydns diff --git a/s6/tinydns-run/type b/s6/tinydns-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/tinydns/x/data/Makefile b/s6/tinydns/x/data/Makefile @@ -0,0 +1,2 @@ +data.cdb: data + tinydns-data diff --git a/s6/tinydns/x/data/add-alias b/s6/tinydns/x/data/add-alias @@ -0,0 +1,2 @@ +#!/bin/sh -e +exec tinydns-edit data data.new add alias "$@" diff --git a/s6/tinydns/x/data/add-childns b/s6/tinydns/x/data/add-childns @@ -0,0 +1,2 @@ +#!/bin/sh -e +exec tinydns-edit data data.new add childns "$@" diff --git a/s6/tinydns/x/data/add-host b/s6/tinydns/x/data/add-host @@ -0,0 +1,2 @@ +#!/bin/sh -e +exec tinydns-edit data data.new add host "$@" diff --git a/s6/tinydns/x/data/add-mx b/s6/tinydns/x/data/add-mx @@ -0,0 +1,2 @@ +#!/bin/sh -e +exec tinydns-edit data data.new add mx "$@" diff --git a/s6/tinydns/x/data/add-ns b/s6/tinydns/x/data/add-ns @@ -0,0 +1,2 @@ +#!/bin/sh -e +exec tinydns-edit data data.new add ns "$@" diff --git a/s6/curvevpn-server/env/IP b/s6/tinydns/x/env/IP diff --git a/s6/axfrdns-run/env/ROOT b/s6/tinydns/x/env/ROOT diff --git a/s6/tinydns/x/run b/s6/tinydns/x/run @@ -0,0 +1,7 @@ +#!/usr/bin/env execlineb +fdmove -c 1 +s6-envdir env + +s6-envuidgid dns + +tinydns diff --git a/s6/httpd-run/type b/s6/tinydns/x/type diff --git a/s6/tinysshd-log/consumer-for b/s6/tinysshd-log/consumer-for @@ -1 +0,0 @@ -tinysshd-tcp diff --git a/s6/tinysshd-log/pipeline-name b/s6/tinysshd-log/pipeline-name @@ -1 +0,0 @@ -tinysshd diff --git a/s6/tinysshd-log/run b/s6/tinysshd-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/tinysshd diff --git a/s6/tinysshd-log/type b/s6/tinysshd-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/tinysshd-tcp/data/... b/s6/tinysshd-tcp/data/... diff --git a/s6/tinysshd-tcp/env/PORT b/s6/tinysshd-tcp/env/PORT @@ -1 +0,0 @@ -22 diff --git a/s6/tinysshd-tcp/producer-for b/s6/tinysshd-tcp/producer-for @@ -1 +0,0 @@ -tinysshd-log diff --git a/s6/tinysshd-tcp/run b/s6/tinysshd-tcp/run @@ -1,11 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 1 -s6-envdir env multisubstitute { - importas PORT PORT -} - -foreground { if { test ! -d ./data/key/ } tinysshd-makekey ./data/key/ } -foreground { chmod 500 ./data/key/ } - -s6-tcpserver 0.0.0.0 $PORT -tinysshd -sovv data/key diff --git a/s6/tinysshd-tcp/type b/s6/tinysshd-tcp/type @@ -1 +0,0 @@ -longrun diff --git a/s6/anvil-snooze/run b/s6/tinysshd/x/data/... diff --git a/s6/tinysshd/x/env/PORT b/s6/tinysshd/x/env/PORT @@ -0,0 +1 @@ +22 diff --git a/s6/tinysshd/x/run b/s6/tinysshd/x/run @@ -0,0 +1,11 @@ +#!/usr/bin/env execlineb +fdmove -c 1 +s6-envdir env multisubstitute { + importas PORT PORT +} + +foreground { if { test ! -d ./data/key/ } tinysshd-makekey ./data/key/ } +foreground { chmod 500 ./data/key/ } + +s6-tcpserver 0.0.0.0 $PORT +tinysshd -sovv data/key diff --git a/s6/httpfile-log/type b/s6/tinysshd/x/type diff --git a/s6/tor-log/consumer-for b/s6/tor-log/consumer-for @@ -1 +0,0 @@ -tor-run diff --git a/s6/tor-log/pipeline-name b/s6/tor-log/pipeline-name @@ -1 +0,0 @@ -tor diff --git a/s6/tor-log/run b/s6/tor-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/tor diff --git a/s6/tor-log/type b/s6/tor-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/tor-run/data/conf b/s6/tor-run/data/conf @@ -1,26 +0,0 @@ -Log debug stderr -RunAsDaemon 0 - -DataDirectory @LOCALSTATEDIR@/var/tor - -## Once you have configured a hidden service, you can look at the -## contents of the file ".../hidden_service/hostname" for the address -## to tell people. -## -## HiddenServicePort x y:z says to redirect requests on port x to the -## address y:z. - -SOCKSPort 0 -User tor -PIDFile /var/tor/pid -Log notice stderr -DataDirectory /var/tor - -HiddenServiceDir /var/tor/gopher -HiddenServicePort 70 127.0.0.1:71 - -HiddenServiceDir /var/tor/http -HiddenServicePort 80 127.0.0.1:8080 - -HiddenServiceDir /var/tor/icecast -HiddenServicePort 3232 127.0.0.1:3232 diff --git a/s6/tor-run/producer-for b/s6/tor-run/producer-for @@ -1 +0,0 @@ -tor-log diff --git a/s6/tor-run/run b/s6/tor-run/run @@ -1,4 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 - -tor -f ./data/conf diff --git a/s6/tor-run/type b/s6/tor-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/tor/x/data/conf b/s6/tor/x/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 /var/tor/pid +Log notice stderr +DataDirectory /var/tor + +HiddenServiceDir /var/tor/gopher +HiddenServicePort 70 127.0.0.1:71 + +HiddenServiceDir /var/tor/http +HiddenServicePort 80 127.0.0.1:8080 + +HiddenServiceDir /var/tor/icecast +HiddenServicePort 3232 127.0.0.1:3232 diff --git a/s6/tor/x/run b/s6/tor/x/run @@ -0,0 +1,4 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 + +tor -f ./data/conf diff --git a/s6/httpfile-tcp/type b/s6/tor/x/type diff --git a/s6/transmission-log/consumer-for b/s6/transmission-log/consumer-for @@ -1 +0,0 @@ -transmission-run diff --git a/s6/transmission-log/pipeline-name b/s6/transmission-log/pipeline-name @@ -1 +0,0 @@ -transmission diff --git a/s6/transmission-log/run b/s6/transmission-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/transmission diff --git a/s6/transmission-log/type b/s6/transmission-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/transmission-run/producer-for b/s6/transmission-run/producer-for @@ -1 +0,0 @@ -transmission-log diff --git a/s6/transmission-run/run b/s6/transmission-run/run @@ -1,4 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 - -transmission-daemon -f -T --log-debug diff --git a/s6/transmission-run/type b/s6/transmission-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/transmission/x/run b/s6/transmission/x/run @@ -0,0 +1,4 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 + +transmission-daemon -f -T --log-debug diff --git a/s6/u9fs-log/consumer-for b/s6/u9fs-log/consumer-for @@ -1 +0,0 @@ -u9fs-run diff --git a/s6/u9fs-log/pipeline-name b/s6/u9fs-log/pipeline-name @@ -1 +0,0 @@ -u9fs diff --git a/s6/u9fs-log/run b/s6/u9fs-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/u9fs diff --git a/s6/u9fs-log/type b/s6/u9fs-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/u9fs-mount-log/consumer-for b/s6/u9fs-mount-log/consumer-for @@ -1 +0,0 @@ -u9fs-mount-run diff --git a/s6/u9fs-mount-log/pipeline-name b/s6/u9fs-mount-log/pipeline-name @@ -1 +0,0 @@ -u9fs-mount diff --git a/s6/u9fs-mount-log/run b/s6/u9fs-mount-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/u9fs-mount diff --git a/s6/u9fs-mount-log/type b/s6/u9fs-mount-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/u9fs-mount-run/down b/s6/u9fs-mount-run/down @@ -1,4 +0,0 @@ -#!/usr/local/bin/execlineb -# mount a 9p filesystem from a local UNIX socket - -exec /mnt/9p diff --git a/s6/u9fs-mount-run/producer-for b/s6/u9fs-mount-run/producer-for @@ -1 +0,0 @@ -u9fs-mount-log diff --git a/s6/u9fs-mount-run/type b/s6/u9fs-mount-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/u9fs-mount-run/up b/s6/u9fs-mount-run/up @@ -1,5 +0,0 @@ -#!/usr/local/bin/execlineb -# mount a 9p filesystem from a local UNIX socket - -mkdir -p /mnt/9p -exec 9pfs -U /tmp/9p /mnt/9p diff --git a/s6/u9fs-mount/x/run/down b/s6/u9fs-mount/x/run/down @@ -0,0 +1,4 @@ +#!/usr/local/bin/execlineb +# mount a 9p filesystem from a local UNIX socket + +exec /mnt/9p diff --git a/s6/u9fs-mount/x/run/producer-for b/s6/u9fs-mount/x/run/producer-for @@ -0,0 +1 @@ +u9fs-mount-log diff --git a/s6/httpfile-tls/type b/s6/u9fs-mount/x/run/type diff --git a/s6/u9fs-mount/x/run/up b/s6/u9fs-mount/x/run/up @@ -0,0 +1,5 @@ +#!/usr/local/bin/execlineb +# mount a 9p filesystem from a local UNIX socket + +mkdir -p /mnt/9p +exec 9pfs -U /tmp/9p /mnt/9p diff --git a/s6/u9fs-run/producer-for b/s6/u9fs-run/producer-for @@ -1 +0,0 @@ -u9fs-log diff --git a/s6/u9fs-run/run b/s6/u9fs-run/run @@ -1,6 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 - -unixserver -v /tmp/9p -ssh u9fs@host -u9fs -l /dev/stderr -a none -u u9fs /home/u9fs diff --git a/s6/u9fs-run/type b/s6/u9fs-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/u9fs-ssh/x/run b/s6/u9fs-ssh/x/run @@ -0,0 +1,6 @@ +#!/usr/bin/env execlineb +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/ii-log/type b/s6/u9fs-ssh/x/type diff --git a/s6/venti-log/consumer-for b/s6/venti-log/consumer-for @@ -1 +0,0 @@ -venti-run diff --git a/s6/venti-log/pipeline-name b/s6/venti-log/pipeline-name @@ -1 +0,0 @@ -venti diff --git a/s6/venti-log/run b/s6/venti-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/venti diff --git a/s6/venti-log/type b/s6/venti-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/venti-run/data/conf b/s6/venti-run/data/conf @@ -1,8 +0,0 @@ -index main - -isect /home/venti/isect0 -isect /home/venti/isect1 -arenas /home/venti/arena0 -mem 10M -bcmem 20M -icmem 30M diff --git a/s6/venti-run/data/fmt b/s6/venti-run/data/fmt @@ -1,9 +0,0 @@ -#!/bin/sh -e - -dd if=/dev/zero of=/home/venti/isect0 bs=1M count=1' -dd if=/dev/zero of=/home/venti/arena0 bs=1M count=1k - -/9/port/bin/venti/fmtisect isect0 /home/venti/isect0 -/9/port/bin/venti/fmtisect isect1 /home/venti/isect1 -/9/port/bin/venti/fmtarenas arena0 /home/venti/arena0 -/9/port/bin/venti/fmtindex conf diff --git a/s6/venti-run/producer-for b/s6/venti-run/producer-for @@ -1 +0,0 @@ -venti-log diff --git a/s6/venti-run/run b/s6/venti-run/run @@ -1,9 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 - -s6-setuidgid venti - -venti -s - -c data/conf - -a tcp!*!17034 - -h tcp!*!8080 diff --git a/s6/venti-run/type b/s6/venti-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/venti/x/data/conf b/s6/venti/x/data/conf @@ -0,0 +1,8 @@ +index main + +isect /var/venti/isect0 +isect /var/venti/isect1 +arenas /var/venti/arena0 +mem 10M +bcmem 20M +icmem 30M diff --git a/s6/venti/x/data/fmt b/s6/venti/x/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/x/run b/s6/venti/x/run @@ -0,0 +1,9 @@ +#!/usr/bin/env execlineb +fdmove -c 2 1 + +s6-setuidgid venti + +venti -s + -c data/conf + -a tcp!*!17034 + -h tcp!*!8080 diff --git a/s6/ii-tcp/type b/s6/venti/x/type diff --git a/s6/walldns-log/consumer-for b/s6/walldns-log/consumer-for @@ -1 +0,0 @@ -walldns-run diff --git a/s6/walldns-log/pipeline-name b/s6/walldns-log/pipeline-name @@ -1 +0,0 @@ -walldns diff --git a/s6/walldns-log/run b/s6/walldns-log/run @@ -1,2 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 s6-log t /var/log/walldns diff --git a/s6/walldns-log/type b/s6/walldns-log/type @@ -1 +0,0 @@ -longrun diff --git a/s6/walldns-run/env/IP b/s6/walldns-run/env/IP @@ -1 +0,0 @@ -0.0.0.0 diff --git a/s6/walldns-run/env/ROOT b/s6/walldns-run/env/ROOT @@ -1 +0,0 @@ -./data/ diff --git a/s6/walldns-run/producer-for b/s6/walldns-run/producer-for @@ -1 +0,0 @@ -walldns-log diff --git a/s6/walldns-run/run b/s6/walldns-run/run @@ -1,5 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 1 -s6-envdir env - -walldns diff --git a/s6/walldns-run/type b/s6/walldns-run/type @@ -1 +0,0 @@ -longrun diff --git a/s6/curvevpn-server/env/IP b/s6/walldns/x/env/IP diff --git a/s6/axfrdns-run/env/ROOT b/s6/walldns/x/env/ROOT diff --git a/s6/walldns/x/run b/s6/walldns/x/run @@ -0,0 +1,5 @@ +#!/usr/bin/env execlineb +fdmove -c 1 +s6-envdir env + +walldns diff --git a/s6/ii-tls/type b/s6/walldns/x/type