dot

packages and services management
Log | Files | Refs | README

commit 598374ec44e93896d022e1edff852afcf61666c7
parent 9728b4fdbe61d69841adf80cce1d95ab43e4b76c
Author: Josuah Demangeon <mail@josuah.net>
Date:   Thu, 16 Aug 2018 08:40:53 +0200

s6-rc: avoid name clash between the service and the bundle

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

diff --git a/bin/s6-rc-load b/bin/s6-rc-load @@ -1,4 +1,7 @@ #!/usr/bin/env execlineb -s6-rc-recompile -s6-rc-update -l /run/s6-rc +backtick -n t { s6-clock } +importas t t +if { s6-rc-compile /var/s6-rc/compiled${t} /var/s6-rc/source } +if { s6-ln -nsf /var/s6-rc/compiled${t} /var/s6-rc/compiled } +s6-rc-update -l /run/s6-rc/live /var/s6-rc/compiled diff --git a/bin/s6-rc-recompile b/bin/s6-rc-recompile @@ -1,7 +0,0 @@ -#!/usr/bin/env execlineb - -cd /etc/s6-rc -backtick -n t { s6-clock } -importas t t -if { s6-rc-compile /var/s6-rc/compiled-$t /etc/s6-rc/source } -if { s6-ln -nfs /var/s6-rc/compiled-$t /var/s6-rc/compiled } diff --git a/bin/s6-rc-start b/bin/s6-rc-start @@ -1,12 +0,0 @@ -#!/usr/bin/env execlineb - -if { rm -rf /var/s6-rc/scandir } -if { mkdir -p /var/s6-rc/scandir } -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 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/configure b/configure @@ -5,4 +5,12 @@ cd "$(dirname "$0")/dot" find * -type d -exec sh -c 'mkdir -p "$HOME/.$0"' {} ';' -o \ -type f -exec sh -c 'ln -sf "$PWD/$0" "$HOME/.$0"' {} ';' -o \ -type l -exec sh -c 'ln -sf "$(readlink "$0")" "$HOME/.$0"' {} ';' -test "$(whoami)" != root || ln -sf /root/conf/s6-rc /root/conf/pack /etc + +test "$(whoami)" = root || exit 0 + +cd .. +ln -sf "$PWD/s6-rc" "$PWD/pack" /etc +rm -rf /etc/node +ln -sf "$PWD/node/$(uname -n)" /etc/node +mkdir -p /var/s6-rc +ln -sf /etc/node/source /var/s6-rc diff --git a/init b/init @@ -0,0 +1,26 @@ +#!/usr/bin/env execlineb + +# setup +if { s6-rmrf /run/s6 } +if { s6-mkdir -p /run/s6 } +if { s6-hier-copy -nfs /etc/s6-rc/s6-svscan-log /run/s6/s6-svscan-log } + +# s6-svscan +background +{ + redirfd -r 0 /dev/null + redirfd -wnb 1 /run/s6/s6-svscan-log/fifo + fdmove -c 2 1 + s6-svscan -t1 /run/s6 +} + +# wait until s6-svscan starts +redirfd -w 3 /run/s6/s6-svscan-log/fifo +fdclose 3 + +backtick -n t { s6-clock } +importas t t +if { s6-mkdir -p /var/s6-rc /run/s6-rc } +if { s6-rc-compile /var/s6-rc/compiled${t} /var/s6-rc/source } +if { s6-ln -nsf /var/s6-rc/compiled${t} /var/s6-rc/compiled } +if { s6-rc-init -c /var/s6-rc/compiled -l /run/s6-rc/live /run/s6 } diff --git a/node/t470s/pack b/node/t470s/pack @@ -0,0 +1,2 @@ +s6-rc/cur +s6-portable-utils/cur diff --git a/node/t470s/source/httpd-log b/node/t470s/source/httpd-log @@ -0,0 +1 @@ +/etc/s6-rc/httpd-log+ \ No newline at end of file diff --git a/node/t470s/source/httpd-run b/node/t470s/source/httpd-run @@ -0,0 +1 @@ +/etc/s6-rc/httpd-run+ \ No newline at end of file diff --git a/node/t470s/source/tinysshd-log b/node/t470s/source/tinysshd-log @@ -0,0 +1 @@ +/etc/s6-rc/tinysshd-log/+ \ No newline at end of file diff --git a/node/t470s/source/tinysshd-run b/node/t470s/source/tinysshd-run @@ -0,0 +1 @@ +/etc/s6-rc/tinysshd-run+ \ No newline at end of file diff --git a/pack/execline/2.5.0.1/build b/pack/execline/2.5.0.1/build @@ -2,8 +2,8 @@ ./configure \ --prefix="$PREFIX" \ - --with-sysdeps=/opt/libskarnet/cur/lib/skalibs/sysdeps \ - --with-include=/opt/libskarnet/cur/include \ - --with-lib=/opt/libskarnet/cur/lib/skalibs + --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 gmake install diff --git a/pack/execline/2.5.0.1/dep b/pack/execline/2.5.0.1/dep @@ -1,2 +1,2 @@ gmake/cur -libskarnet/cur +libskarnet/2.7.0.0 diff --git a/pack/s6-rc/0.4.0.1/build b/pack/s6-linux-init/0.4.0.0/build diff --git a/pack/s6-linux-init/0.4.0.0/dep b/pack/s6-linux-init/0.4.0.0/dep @@ -0,0 +1,5 @@ +libskarnet/2.7.0.0 +execline/2.5.0.1 +s6-portable-utils/2.2.1.1 +s6/2.7.2.0 + diff --git a/pack/s6-linux-init/0.4.0.0/tar b/pack/s6-linux-init/0.4.0.0/tar @@ -0,0 +1 @@ +https://skarnet.org/software/s6-linux-init/s6-linux-init-0.4.0.0.tar.gz diff --git a/pack/s6-linux-init/cur b/pack/s6-linux-init/cur @@ -0,0 +1 @@ +0.4.0.0+ \ No newline at end of file diff --git a/pack/s6-rc/0.4.0.1/build b/pack/s6-rc/0.4.0.1/build @@ -2,12 +2,12 @@ ./configure \ --prefix="$PREFIX" \ - --with-sysdeps=/opt/libskarnet/cur/lib/skalibs/sysdeps \ - --with-include=/opt/libskarnet/cur/include \ - --with-lib=/opt/libskarnet/cur/lib/skalibs \ - --with-include=/opt/execline/cur/include \ - --with-lib=/opt/execline/cur/lib/execline \ - --with-include=/opt/s6/cur/include \ - --with-lib=/opt/s6/cur/lib/s6 + --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 \ + --with-include=/opt/s6/2.7.2.0/include \ + --with-lib=/opt/s6/2.7.2.0/lib/s6 gmake install diff --git a/pack/s6-rc/0.4.0.1/dep b/pack/s6-rc/0.4.0.1/dep @@ -1 +1,4 @@ gmake/cur +libskarnet/2.7.0.0 +execline/2.5.0.1 +s6/2.7.2.0 diff --git a/s6-rc/backup-log/run b/s6-rc/backup-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/backup-run +s6-log t /log/backup diff --git a/s6-rc/backup/dependencies b/s6-rc/backup-run/producer-for diff --git a/s6-rc/backup/run b/s6-rc/backup-run/run diff --git a/s6-rc/backup/type b/s6-rc/backup-run/type diff --git a/s6-rc/backup/producer-for b/s6-rc/backup/producer-for @@ -1 +0,0 @@ -backup-log diff --git a/s6-rc/btpd-log/run b/s6-rc/btpd-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/btpd-run +s6-log t /log/btpd diff --git a/s6-rc/btpd/dependencies b/s6-rc/btpd-run/producer-for diff --git a/s6-rc/btpd/run b/s6-rc/btpd-run/run diff --git a/s6-rc/btpd/type b/s6-rc/btpd-run/type diff --git a/s6-rc/btpd/producer-for b/s6-rc/btpd/producer-for @@ -1 +0,0 @@ -btpd-log diff --git a/s6-rc/cherrymusic-log/run b/s6-rc/cherrymusic-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/cherrymusic-run +s6-log t /log/cherrymusic diff --git a/s6-rc/cherrymusic/dependencies b/s6-rc/cherrymusic-run/producer-for diff --git a/s6-rc/cherrymusic/run b/s6-rc/cherrymusic-run/run diff --git a/s6-rc/cherrymusic/type b/s6-rc/cherrymusic-run/type diff --git a/s6-rc/cherrymusic/producer-for b/s6-rc/cherrymusic/producer-for @@ -1 +0,0 @@ -cherrymusic-log diff --git a/s6-rc/collectd-log/run b/s6-rc/collectd-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/collectd-run +s6-log t /log/collectd diff --git a/s6-rc/collectd/data/conf b/s6-rc/collectd-run/data/conf diff --git a/s6-rc/collectd/dependencies b/s6-rc/collectd-run/producer-for diff --git a/s6-rc/collectd/run b/s6-rc/collectd-run/run diff --git a/s6-rc/collectd/type b/s6-rc/collectd-run/type diff --git a/s6-rc/collectd/producer-for b/s6-rc/collectd/producer-for @@ -1 +0,0 @@ -collectd-log diff --git a/s6-rc/djbdns-axfrdns-log/run b/s6-rc/djbdns-axfrdns-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/djbdns-axfrdns-run +s6-log t /log/djbdns-axfrdns diff --git a/s6-rc/djbdns-axfrdns/env/ROOT b/s6-rc/djbdns-axfrdns-run/env/ROOT diff --git a/s6-rc/djbdns-axfrdns/dependencies b/s6-rc/djbdns-axfrdns-run/producer-for diff --git a/s6-rc/djbdns-axfrdns/run b/s6-rc/djbdns-axfrdns-run/run diff --git a/s6-rc/djbdns-axfrdns/type b/s6-rc/djbdns-axfrdns-run/type diff --git a/s6-rc/djbdns-axfrdns/producer-for b/s6-rc/djbdns-axfrdns/producer-for @@ -1 +0,0 @@ -djbdns-axfrdns-log diff --git a/s6-rc/djbdns-dnscache-log/run b/s6-rc/djbdns-dnscache-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/djbdns-dnscache-run +s6-log t /log/djbdns-dnscache diff --git a/s6-rc/.s6-svscan/lock b/s6-rc/djbdns-dnscache-run/data/ip/127.0.0.1 diff --git a/s6-rc/djbdns-dnscache/data/ip/127.0.0.1 b/s6-rc/djbdns-dnscache-run/data/servers/@ diff --git a/s6-rc/djbdns-dnscache/env/CACHESIZE b/s6-rc/djbdns-dnscache-run/env/CACHESIZE diff --git a/s6-rc/djbdns-dnscache/env/DATALIMIT b/s6-rc/djbdns-dnscache-run/env/DATALIMIT diff --git a/s6-rc/djbdns-dnscache/env/IP b/s6-rc/djbdns-dnscache-run/env/IP diff --git a/s6-rc/djbdns-dnscache/env/IPSEND b/s6-rc/djbdns-dnscache-run/env/IPSEND diff --git a/s6-rc/djbdns-dnscache/env/ROOT b/s6-rc/djbdns-dnscache-run/env/ROOT diff --git a/s6-rc/djbdns-dnscache/dependencies b/s6-rc/djbdns-dnscache-run/producer-for diff --git a/s6-rc/djbdns-dnscache/run b/s6-rc/djbdns-dnscache-run/run diff --git a/s6-rc/djbdns-dnscache/type b/s6-rc/djbdns-dnscache-run/type diff --git a/s6-rc/djbdns-dnscache/producer-for b/s6-rc/djbdns-dnscache/producer-for @@ -1 +0,0 @@ -djbdns-dnscache-log diff --git a/s6-rc/djbdns-tinydns-log/run b/s6-rc/djbdns-tinydns-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/djbdns-tinydns-run +s6-log t /log/djbdns-tinydns diff --git a/s6-rc/djbdns-tinydns/data/Makefile b/s6-rc/djbdns-tinydns-run/data/Makefile diff --git a/s6-rc/djbdns-tinydns/data/add-alias b/s6-rc/djbdns-tinydns-run/data/add-alias diff --git a/s6-rc/djbdns-tinydns/data/add-childns b/s6-rc/djbdns-tinydns-run/data/add-childns diff --git a/s6-rc/djbdns-tinydns/data/add-host b/s6-rc/djbdns-tinydns-run/data/add-host diff --git a/s6-rc/djbdns-tinydns/data/add-mx b/s6-rc/djbdns-tinydns-run/data/add-mx diff --git a/s6-rc/djbdns-tinydns/data/add-ns b/s6-rc/djbdns-tinydns-run/data/add-ns diff --git a/s6-rc/djbdns-dnscache/data/servers/@ b/s6-rc/djbdns-tinydns-run/data/data diff --git a/s6-rc/djbdns-tinydns/env/IP b/s6-rc/djbdns-tinydns-run/env/IP diff --git a/s6-rc/djbdns-tinydns/env/ROOT b/s6-rc/djbdns-tinydns-run/env/ROOT diff --git a/s6-rc/djbdns-tinydns/dependencies b/s6-rc/djbdns-tinydns-run/producer-for diff --git a/s6-rc/djbdns-tinydns/run b/s6-rc/djbdns-tinydns-run/run diff --git a/s6-rc/djbdns-tinydns/type b/s6-rc/djbdns-tinydns-run/type diff --git a/s6-rc/djbdns-tinydns/producer-for b/s6-rc/djbdns-tinydns/producer-for @@ -1 +0,0 @@ -djbdns-tinydns-log diff --git a/s6-rc/djbdns-walldns-log/run b/s6-rc/djbdns-walldns-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/djbdns-walldns-run +s6-log t /log/djbdns-walldns diff --git a/s6-rc/djbdns-walldns/env/IP b/s6-rc/djbdns-walldns-run/env/IP diff --git a/s6-rc/djbdns-walldns/env/ROOT b/s6-rc/djbdns-walldns-run/env/ROOT diff --git a/s6-rc/djbdns-walldns/dependencies b/s6-rc/djbdns-walldns-run/producer-for diff --git a/s6-rc/djbdns-walldns/run b/s6-rc/djbdns-walldns-run/run diff --git a/s6-rc/djbdns-walldns/type b/s6-rc/djbdns-walldns-run/type diff --git a/s6-rc/djbdns-walldns/producer-for b/s6-rc/djbdns-walldns/producer-for @@ -1 +0,0 @@ -djbdns-walldns-log diff --git a/s6-rc/fossil-log/run b/s6-rc/fossil-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/fossil-run +s6-log t /log/fossil diff --git a/s6-rc/fossil/dependencies b/s6-rc/fossil-run/producer-for diff --git a/s6-rc/fossil/run b/s6-rc/fossil-run/run diff --git a/s6-rc/fossil/type b/s6-rc/fossil-run/type diff --git a/s6-rc/fossil/producer-for b/s6-rc/fossil/producer-for @@ -1 +0,0 @@ -fossil-log diff --git a/s6-rc/ftpd-log/run b/s6-rc/ftpd-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/ftpd-run +s6-log t /log/ftpd diff --git a/s6-rc/ftpd/dependencies b/s6-rc/ftpd-run/producer-for diff --git a/s6-rc/ftpd/run b/s6-rc/ftpd-run/run diff --git a/s6-rc/ftpd/type b/s6-rc/ftpd-run/type diff --git a/s6-rc/ftpd/producer-for b/s6-rc/ftpd/producer-for @@ -1 +0,0 @@ -ftpd-log diff --git a/s6-rc/geomyidae-log/run b/s6-rc/geomyidae-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/geomyidae-run +s6-log t /log/geomyidae diff --git a/s6-rc/geomyidae/env/BASE b/s6-rc/geomyidae-run/env/BASE diff --git a/s6-rc/geomyidae/env/HOST b/s6-rc/geomyidae-run/env/HOST diff --git a/s6-rc/geomyidae/env/PORT b/s6-rc/geomyidae-run/env/PORT diff --git a/s6-rc/geomyidae/dependencies b/s6-rc/geomyidae-run/producer-for diff --git a/s6-rc/geomyidae/run b/s6-rc/geomyidae-run/run diff --git a/s6-rc/geomyidae/type b/s6-rc/geomyidae-run/type diff --git a/s6-rc/geomyidae/producer-for b/s6-rc/geomyidae/producer-for @@ -1 +0,0 @@ -geomyidae-log diff --git a/s6-rc/git-daemon-log/run b/s6-rc/git-daemon-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/git-daemon-run +s6-log t /log/git-daemon diff --git a/s6-rc/git-daemon/dependencies b/s6-rc/git-daemon-run/producer-for diff --git a/s6-rc/git-daemon/run b/s6-rc/git-daemon-run/run diff --git a/s6-rc/git-daemon/type b/s6-rc/git-daemon-run/type diff --git a/s6-rc/git-daemon/producer-for b/s6-rc/git-daemon/producer-for @@ -1 +0,0 @@ -git-daemon-log diff --git a/s6-rc/git-mirror-log/run b/s6-rc/git-mirror-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/git-mirror-run +s6-log t /log/git-mirror diff --git a/s6-rc/djbdns-tinydns/data/data b/s6-rc/git-mirror-run/data/mirror diff --git a/s6-rc/git-mirror/dependencies b/s6-rc/git-mirror-run/producer-for diff --git a/s6-rc/git-mirror/run b/s6-rc/git-mirror-run/run diff --git a/s6-rc/git-mirror/type b/s6-rc/git-mirror-run/type diff --git a/s6-rc/git-mirror/producer-for b/s6-rc/git-mirror/producer-for @@ -1 +0,0 @@ -git-mirror-log diff --git a/s6-rc/gproxy-log/run b/s6-rc/gproxy-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/gproxy-run +s6-log t /log/gproxy diff --git a/s6-rc/gproxy/data/gproxy b/s6-rc/gproxy-run/data/gproxy diff --git a/s6-rc/gproxy/dependencies b/s6-rc/gproxy-run/producer-for diff --git a/s6-rc/gproxy/run b/s6-rc/gproxy-run/run diff --git a/s6-rc/gproxy/type b/s6-rc/gproxy-run/type diff --git a/s6-rc/gproxy/producer-for b/s6-rc/gproxy/producer-for @@ -1 +0,0 @@ -gproxy-log diff --git a/s6-rc/httpd-log/run b/s6-rc/httpd-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/httpd-run +s6-log t /log/httpd diff --git a/s6-rc/httpd/dependencies b/s6-rc/httpd-run/producer-for diff --git a/s6-rc/httpd/run b/s6-rc/httpd-run/run diff --git a/s6-rc/httpd/type b/s6-rc/httpd-run/type diff --git a/s6-rc/httpd/producer-for b/s6-rc/httpd/producer-for @@ -1 +0,0 @@ -httpd-log diff --git a/s6-rc/ii-tcp-log/run b/s6-rc/ii-tcp-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/ii-tcp-run +s6-log t /log/ii-tcp diff --git a/s6-rc/ii-tcp/env/HOST b/s6-rc/ii-tcp-run/env/HOST diff --git a/s6-rc/git-mirror/data/mirror b/s6-rc/ii-tcp-run/env/NAME diff --git a/s6-rc/ii-tcp/env/NICK b/s6-rc/ii-tcp-run/env/NICK diff --git a/s6-rc/ii-tcp/env/NAME b/s6-rc/ii-tcp-run/env/PASS diff --git a/s6-rc/ii-tcp/env/PORT b/s6-rc/ii-tcp-run/env/PORT diff --git a/s6-rc/ii-tcp/env/USER b/s6-rc/ii-tcp-run/env/USER diff --git a/s6-rc/ii-tcp/finish b/s6-rc/ii-tcp-run/finish diff --git a/s6-rc/ii-tcp/dependencies b/s6-rc/ii-tcp-run/producer-for diff --git a/s6-rc/ii-tcp/run b/s6-rc/ii-tcp-run/run diff --git a/s6-rc/ii-tcp/type b/s6-rc/ii-tcp-run/type diff --git a/s6-rc/ii-tcp/producer-for b/s6-rc/ii-tcp/producer-for @@ -1 +0,0 @@ -ii-tcp-log diff --git a/s6-rc/ii-tls-log/run b/s6-rc/ii-tls-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/ii-tls-run +s6-log t /log/ii-tls diff --git a/s6-rc/ii-tcp/env/PASS b/s6-rc/ii-tls-run/data/.empty diff --git a/s6-rc/ii-tls/env/CAFILE b/s6-rc/ii-tls-run/env/CAFILE diff --git a/s6-rc/ii-tls/env/HOST b/s6-rc/ii-tls-run/env/HOST diff --git a/s6-rc/ii-tls/data/.empty b/s6-rc/ii-tls-run/env/NAME diff --git a/s6-rc/ii-tls/env/NICK b/s6-rc/ii-tls-run/env/NICK diff --git a/s6-rc/ii-tls/env/NAME b/s6-rc/ii-tls-run/env/PASS diff --git a/s6-rc/ii-tls/env/PORT b/s6-rc/ii-tls-run/env/PORT diff --git a/s6-rc/ii-tls/env/USER b/s6-rc/ii-tls-run/env/USER diff --git a/s6-rc/ii-tls/finish b/s6-rc/ii-tls-run/finish diff --git a/s6-rc/ii-tls/dependencies b/s6-rc/ii-tls-run/producer-for diff --git a/s6-rc/ii-tls/run b/s6-rc/ii-tls-run/run diff --git a/s6-rc/ii-tls/type b/s6-rc/ii-tls-run/type diff --git a/s6-rc/ii-tls/producer-for b/s6-rc/ii-tls/producer-for @@ -1 +0,0 @@ -ii-tls-log diff --git a/s6-rc/mpop-log/run b/s6-rc/mpop-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/mpop-run +s6-log t /log/mpop diff --git a/s6-rc/mpop/data/mpoprc b/s6-rc/mpop-run/data/mpoprc diff --git a/s6-rc/mpop/env/USER b/s6-rc/mpop-run/env/USER diff --git a/s6-rc/mpop/dependencies b/s6-rc/mpop-run/producer-for diff --git a/s6-rc/mpop/run b/s6-rc/mpop-run/run diff --git a/s6-rc/mpop/type b/s6-rc/mpop-run/type diff --git a/s6-rc/mpop/producer-for b/s6-rc/mpop/producer-for @@ -1 +0,0 @@ -mpop-log diff --git a/s6-rc/ngircd-log/run b/s6-rc/ngircd-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/ngircd-run +s6-log t /log/ngircd diff --git a/s6-rc/ngircd/data/conf b/s6-rc/ngircd-run/data/conf diff --git a/s6-rc/ngircd/data/motd b/s6-rc/ngircd-run/data/motd diff --git a/s6-rc/ngircd/data/tls b/s6-rc/ngircd-run/data/tls diff --git a/s6-rc/ngircd/dependencies b/s6-rc/ngircd-run/producer-for diff --git a/s6-rc/ngircd/run b/s6-rc/ngircd-run/run diff --git a/s6-rc/ngircd/type b/s6-rc/ngircd-run/type diff --git a/s6-rc/ngircd/producer-for b/s6-rc/ngircd/producer-for @@ -1 +0,0 @@ -ngircd-log diff --git a/s6-rc/ntpclient-log/run b/s6-rc/ntpclient-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/ntpclient-run +s6-log t /log/ntpclient diff --git a/s6-rc/ntpclient/env/HOST b/s6-rc/ntpclient-run/env/HOST diff --git a/s6-rc/ntpclient/dependencies b/s6-rc/ntpclient-run/producer-for diff --git a/s6-rc/ntpclient/run b/s6-rc/ntpclient-run/run diff --git a/s6-rc/ntpclient/type b/s6-rc/ntpclient-run/type diff --git a/s6-rc/ntpclient/producer-for b/s6-rc/ntpclient/producer-for @@ -1 +0,0 @@ -ntpclient-log diff --git a/s6-rc/opentracker-log/run b/s6-rc/opentracker-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/opentracker-run +s6-log t /log/opentracker diff --git a/s6-rc/opentracker/dependencies b/s6-rc/opentracker-run/producer-for diff --git a/s6-rc/opentracker/run b/s6-rc/opentracker-run/run diff --git a/s6-rc/opentracker/type b/s6-rc/opentracker-run/type diff --git a/s6-rc/opentracker/producer-for b/s6-rc/opentracker/producer-for @@ -1 +0,0 @@ -opentracker-log diff --git a/s6-rc/plot-log/run b/s6-rc/plot-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/plot-run +s6-log t /log/plot diff --git a/s6-rc/plot/data/plot b/s6-rc/plot-run/data/plot diff --git a/s6-rc/plot/dependencies b/s6-rc/plot-run/producer-for diff --git a/s6-rc/plot/run b/s6-rc/plot-run/run diff --git a/s6-rc/plot/type b/s6-rc/plot-run/type diff --git a/s6-rc/plot/producer-for b/s6-rc/plot/producer-for @@ -1 +0,0 @@ -plot-log diff --git a/s6-rc/qemu-tap-log/run b/s6-rc/qemu-tap-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/qemu-tap-run +s6-log t /log/qemu-tap diff --git a/s6-rc/qemu-tap/dependencies b/s6-rc/qemu-tap-run/producer-for diff --git a/s6-rc/qemu-tap/run b/s6-rc/qemu-tap-run/run diff --git a/s6-rc/qemu-tap/type b/s6-rc/qemu-tap-run/type diff --git a/s6-rc/qemu-tap/producer-for b/s6-rc/qemu-tap/producer-for @@ -1 +0,0 @@ -qemu-tap-log diff --git a/s6-rc/qemu-user-log/run b/s6-rc/qemu-user-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/qemu-user-run +s6-log t /log/qemu-user diff --git a/s6-rc/ii-tls/env/PASS b/s6-rc/qemu-user-run/env/NAME diff --git a/s6-rc/qemu-user/dependencies b/s6-rc/qemu-user-run/producer-for diff --git a/s6-rc/qemu-user/run b/s6-rc/qemu-user-run/run diff --git a/s6-rc/qemu-user/type b/s6-rc/qemu-user-run/type diff --git a/s6-rc/qemu-user/producer-for b/s6-rc/qemu-user/producer-for @@ -1 +0,0 @@ -qemu-user-log diff --git a/s6-rc/qmail-pop3d-log/run b/s6-rc/qmail-pop3d-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/qmail-pop3d-run +s6-log t /log/qmail-pop3d diff --git a/s6-rc/qmail-pop3d/dependencies b/s6-rc/qmail-pop3d-run/producer-for diff --git a/s6-rc/qmail-pop3d/qmail-pop3d/env/CERTFILE b/s6-rc/qmail-pop3d-run/qmail-pop3d/env/CERTFILE diff --git a/s6-rc/qmail-pop3d/qmail-pop3d/env/HOST b/s6-rc/qmail-pop3d-run/qmail-pop3d/env/HOST diff --git a/s6-rc/qmail-pop3d/qmail-pop3d/env/KEYFILE b/s6-rc/qmail-pop3d-run/qmail-pop3d/env/KEYFILE diff --git a/s6-rc/qmail-pop3d/qmail-pop3d/env/MAILDIR b/s6-rc/qmail-pop3d-run/qmail-pop3d/env/MAILDIR diff --git a/s6-rc/qmail-pop3d/qmail-pop3d/run b/s6-rc/qmail-pop3d-run/qmail-pop3d/run diff --git a/s6-rc/qmail-pop3d/type b/s6-rc/qmail-pop3d-run/type diff --git a/s6-rc/qmail-pop3d/producer-for b/s6-rc/qmail-pop3d/producer-for @@ -1 +0,0 @@ -qmail-pop3d-log diff --git a/s6-rc/qmail-pop3d/qmail-pop3d-log/run b/s6-rc/qmail-pop3d/qmail-pop3d-log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/qmail-pop3d/ diff --git a/s6-rc/qmail-send-log/run b/s6-rc/qmail-send-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/qmail-send-run +s6-log t /log/qmail-send diff --git a/s6-rc/qmail-send/data/alias/.qmail-mail b/s6-rc/qmail-send-run/data/alias/.qmail-mail diff --git a/s6-rc/qmail-send/data/control/defaultdelivery b/s6-rc/qmail-send-run/data/control/defaultdelivery diff --git a/s6-rc/qmail-send/data/control/defaultdomain b/s6-rc/qmail-send-run/data/control/defaultdomain diff --git a/s6-rc/qmail-send/data/control/locals b/s6-rc/qmail-send-run/data/control/locals diff --git a/s6-rc/qmail-send/data/control/me b/s6-rc/qmail-send-run/data/control/me diff --git a/s6-rc/qmail-send/data/control/plusdomain b/s6-rc/qmail-send-run/data/control/plusdomain diff --git a/s6-rc/qmail-send/data/control/rcpthosts b/s6-rc/qmail-send-run/data/control/rcpthosts diff --git a/s6-rc/qmail-send/env/MAILDIR b/s6-rc/qmail-send-run/env/MAILDIR diff --git a/s6-rc/qmail-send/dependencies b/s6-rc/qmail-send-run/producer-for diff --git a/s6-rc/qmail-send/run b/s6-rc/qmail-send-run/run diff --git a/s6-rc/qmail-send/type b/s6-rc/qmail-send-run/type diff --git a/s6-rc/qmail-send/producer-for b/s6-rc/qmail-send/producer-for @@ -1 +0,0 @@ -qmail-send-log diff --git a/s6-rc/qmail-smtpd-log/run b/s6-rc/qmail-smtpd-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/qmail-smtpd-run +s6-log t /log/qmail-smtpd diff --git a/s6-rc/qmail-smtpd-run/producer-for b/s6-rc/qmail-smtpd-run/producer-for @@ -0,0 +1 @@ +qmail-smtpd-log diff --git a/s6-rc/qmail-smtpd-run/run b/s6-rc/qmail-smtpd-run/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-rc/ngircd/data/tls b/s6-rc/qmail-smtpd-run/tls diff --git a/s6-rc/backup/type b/s6-rc/qmail-smtpd-run/type diff --git a/s6-rc/qmail-smtpd/dependencies b/s6-rc/qmail-smtpd/dependencies @@ -1 +0,0 @@ -qmail-smtpd-log diff --git a/s6-rc/qmail-smtpd/producer-for b/s6-rc/qmail-smtpd/producer-for @@ -1 +0,0 @@ -qmail-smtpd-log diff --git a/s6-rc/qmail-smtpd/run b/s6-rc/qmail-smtpd/run @@ -1,20 +0,0 @@ -#!/local/bin/execlineb -# qmail smtp daemon - -fdmove -c 2 1 - -foreground { if { test ! -d ./data/key/ } - if { mkdir -p ./data/key/ } - cd ./data/key/ - if { openssl req -x509 -newkey rsa:4096 -days 365 -keyout key -out pem } - if { openssl dhparam -out dhp 4096 } -} -if { chmod -R 500 ./data/key/ } -if { chmod 400 ./data/key/key ./data/key/pem ./data/key/dhp } - -s6-envdir ./env/ - -s6-envuidgid qmaild - -s6-tcpserver -U 0.0.0.0 25 -qmail-smtpd diff --git a/s6-rc/qmail-smtpd/tls b/s6-rc/qmail-smtpd/tls @@ -1,8 +0,0 @@ -#!/bin/sh -e - -openssl req -x509 -newkey rsa:4096 -days 365 -keyout key -out pem -chmod 400 key -chmod 444 pem - -openssl dhparam -out dhp 4096 -chmod 444 dhp diff --git a/s6-rc/qmail-smtpd/type b/s6-rc/qmail-smtpd/type @@ -1 +0,0 @@ -longrun diff --git a/s6-rc/quark-log/run b/s6-rc/quark-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/quark-run +s6-log t /log/quark diff --git a/s6-rc/quark-run/producer-for b/s6-rc/quark-run/producer-for @@ -0,0 +1 @@ +quark-log diff --git a/s6-rc/quark-run/run b/s6-rc/quark-run/run @@ -0,0 +1,14 @@ +#!/local/bin/execlineb +# static http server + +fdmove -c 2 1 + +quark -l + -u srv + -h 0.0.0.0 + -p 80 + -d /var/www + -v "josuah.net josuah.net$ josuah.net" + -v "josuah.cyb josuah.cyb$ josuah.net" + -v "cyberia.systems cyberia.systems$ cyberia.systems" + -v "www.atelier-fu.fr atelier-fu.fr$ atelier-fu.fr" diff --git a/s6-rc/backup/type b/s6-rc/quark-run/type diff --git a/s6-rc/quark-tor-log/run b/s6-rc/quark-tor-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/quark-tor-run +s6-log t /log/quark-tor diff --git a/s6-rc/quark-tor-run/producer-for b/s6-rc/quark-tor-run/producer-for @@ -0,0 +1 @@ +quark-tor-log diff --git a/s6-rc/quark-tor-run/run b/s6-rc/quark-tor-run/run @@ -0,0 +1,17 @@ +#!/local/bin/execlineb +# static http server + +fdmove -c 2 1 + +backtick tor { homeof tor } +importas tor tor + +backtick host { cat $tor/http/hostname } +importas host host + +quark -l + -u srv + -h 0.0.0.0 + -p 80 + -d /home/srv + -v $host" "$host"$ cyberia.systems" diff --git a/s6-rc/backup/type b/s6-rc/quark-tor-run/type diff --git a/s6-rc/quark-tor/dependencies b/s6-rc/quark-tor/dependencies @@ -1 +0,0 @@ -quark-tor-log diff --git a/s6-rc/quark-tor/producer-for b/s6-rc/quark-tor/producer-for @@ -1 +0,0 @@ -quark-tor-log diff --git a/s6-rc/quark-tor/run b/s6-rc/quark-tor/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-rc/quark-tor/type b/s6-rc/quark-tor/type @@ -1 +0,0 @@ -longrun diff --git a/s6-rc/quark/dependencies b/s6-rc/quark/dependencies @@ -1 +0,0 @@ -quark-log diff --git a/s6-rc/quark/producer-for b/s6-rc/quark/producer-for @@ -1 +0,0 @@ -quark-log diff --git a/s6-rc/quark/run b/s6-rc/quark/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-rc/quark/type b/s6-rc/quark/type @@ -1 +0,0 @@ -longrun diff --git a/s6-rc/ratox-log/run b/s6-rc/ratox-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/ratox-run +s6-log t /log/ratox diff --git a/s6-rc/ratox-run/producer-for b/s6-rc/ratox-run/producer-for @@ -0,0 +1 @@ +ratox-log diff --git a/s6-rc/ratox-run/run b/s6-rc/ratox-run/run @@ -0,0 +1,11 @@ +#!/local/bin/execlineb +# tox protocol client communicating through the filesystem + +fdmove -c 2 1 + +define dir /home/tox + +mkdir -p $dir +cd $dir + +exec ratox diff --git a/s6-rc/backup/type b/s6-rc/ratox-run/type diff --git a/s6-rc/ratox/dependencies b/s6-rc/ratox/dependencies @@ -1 +0,0 @@ -ratox-log diff --git a/s6-rc/ratox/producer-for b/s6-rc/ratox/producer-for @@ -1 +0,0 @@ -ratox-log diff --git a/s6-rc/ratox/run b/s6-rc/ratox/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-rc/ratox/type b/s6-rc/ratox/type @@ -1 +0,0 @@ -longrun diff --git a/s6-rc/s6-svscan-log/run b/s6-rc/s6-svscan-log/run @@ -0,0 +1,7 @@ +#!/bin/execlineb -P + +redirfd -w 2 /dev/console +redirfd -w 1 /dev/null +redirfd -rnb 0 fifo +s6-applyuidgid -u 0 -g 0 +s6-log -bp -- t /log/s6-svscan diff --git a/s6-rc/snooze-acme-client-log/run b/s6-rc/snooze-acme-client-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/snooze-acme-client-run +s6-log t /log/snooze-acme-client diff --git a/s6-rc/snooze-acme-client-run/data/conf b/s6-rc/snooze-acme-client-run/data/conf @@ -0,0 +1,17 @@ +authority letsencrypt { + api url "https://acme-v01.api.letsencrypt.org/directory" + account key "/etc/acme/letsencrypt-privkey.pem" +} + +authority letsencrypt-staging { + api url "https://acme-staging.api.letsencrypt.org/directory" + account key "/etc/acme/letsencrypt-staging-privkey.pem" +} + +domain josuah.net { + alternative names { mail.josuah.net } + domain key "data/ssl/josuah.net.key" + domain certificate "data/ssl/josuah.net.crt" + domain full chain certificate "data/ssl/josuah.net.pem" + sign with letsencrypt +} diff --git a/s6-rc/snooze-acme-client-run/producer-for b/s6-rc/snooze-acme-client-run/producer-for @@ -0,0 +1 @@ +snooze-acme-client-log diff --git a/s6-rc/snooze-acme-client-run/run b/s6-rc/snooze-acme-client-run/run @@ -0,0 +1,4 @@ +#!/local/bin/execlineb -P + +if { mkdir -p /etc/acme /etc/ssl/acme/private /var/www/acme } +acme-client -vAD -f data/conf josuah.net diff --git a/s6-rc/backup/type b/s6-rc/snooze-acme-client-run/type diff --git a/s6-rc/snooze-acme-client/data/conf b/s6-rc/snooze-acme-client/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-rc/snooze-acme-client/dependencies b/s6-rc/snooze-acme-client/dependencies @@ -1 +0,0 @@ -snooze-acme-client-log diff --git a/s6-rc/snooze-acme-client/producer-for b/s6-rc/snooze-acme-client/producer-for @@ -1 +0,0 @@ -snooze-acme-client-log diff --git a/s6-rc/snooze-acme-client/run b/s6-rc/snooze-acme-client/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-rc/snooze-acme-client/type b/s6-rc/snooze-acme-client/type @@ -1 +0,0 @@ -longrun diff --git a/s6-rc/snooze-tls-cert-log/run b/s6-rc/snooze-tls-cert-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/snooze-tls-cert-run +s6-log t /log/snooze-tls-cert diff --git a/s6-rc/qemu-user/env/NAME b/s6-rc/snooze-tls-cert-run/data/... diff --git a/s6-rc/geomyidae/env/HOST b/s6-rc/snooze-tls-cert-run/env/HOST diff --git a/s6-rc/snooze-tls-cert-run/producer-for b/s6-rc/snooze-tls-cert-run/producer-for @@ -0,0 +1 @@ +snooze-tls-cert-log diff --git a/s6-rc/snooze-tls-cert-run/run b/s6-rc/snooze-tls-cert-run/run @@ -0,0 +1,17 @@ +#!/local/bin/execlineb -P + +fdmove -c 2 1 +s6-envdir ./env/ +importas HOST HOST + +snooze -d 1 +if { chmod 400 data } +openssl req + -new + -newkey rsa + -days 365 + -nodes + -x509 + -subj /CN=josuah.net + -keyout data/key + -out data/pem diff --git a/s6-rc/backup/type b/s6-rc/snooze-tls-cert-run/type diff --git a/s6-rc/snooze-tls-cert/data/... b/s6-rc/snooze-tls-cert/data/... diff --git a/s6-rc/snooze-tls-cert/dependencies b/s6-rc/snooze-tls-cert/dependencies @@ -1 +0,0 @@ -snooze-tls-cert-log diff --git a/s6-rc/snooze-tls-cert/env/HOST b/s6-rc/snooze-tls-cert/env/HOST @@ -1 +0,0 @@ -josuah.net diff --git a/s6-rc/snooze-tls-cert/producer-for b/s6-rc/snooze-tls-cert/producer-for @@ -1 +0,0 @@ -snooze-tls-cert-log diff --git a/s6-rc/snooze-tls-cert/run b/s6-rc/snooze-tls-cert/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-rc/snooze-tls-cert/type b/s6-rc/snooze-tls-cert/type @@ -1 +0,0 @@ -longrun diff --git a/s6-rc/snooze-tls-dhparam-log/run b/s6-rc/snooze-tls-dhparam-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/snooze-tls-dhparam-run +s6-log t /log/snooze-tls-dhparam diff --git a/s6-rc/snooze-tls-dhparam-run/producer-for b/s6-rc/snooze-tls-dhparam-run/producer-for @@ -0,0 +1 @@ +snooze-tls-dhparam-log diff --git a/s6-rc/snooze-tls-dhparam-run/run b/s6-rc/snooze-tls-dhparam-run/run @@ -0,0 +1,6 @@ +#!/local/bin/execlineb -P + +movefd -c 2 1 + +snooze -m /3 -d 1 +openssl dhparam -out ./data/dhp 4096 diff --git a/s6-rc/backup/type b/s6-rc/snooze-tls-dhparam-run/type diff --git a/s6-rc/snooze-tls-dhparam/dependencies b/s6-rc/snooze-tls-dhparam/dependencies @@ -1 +0,0 @@ -snooze-tls-dhparam-log diff --git a/s6-rc/snooze-tls-dhparam/producer-for b/s6-rc/snooze-tls-dhparam/producer-for @@ -1 +0,0 @@ -snooze-tls-dhparam-log diff --git a/s6-rc/snooze-tls-dhparam/run b/s6-rc/snooze-tls-dhparam/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-rc/snooze-tls-dhparam/type b/s6-rc/snooze-tls-dhparam/type @@ -1 +0,0 @@ -longrun diff --git a/s6-rc/ssh-fwd-log/run b/s6-rc/ssh-fwd-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/ssh-fwd-run +s6-log t /log/ssh-fwd diff --git a/s6-rc/ssh-fwd-run/producer-for b/s6-rc/ssh-fwd-run/producer-for @@ -0,0 +1 @@ +ssh-fwd-log diff --git a/s6-rc/ssh-fwd-run/run b/s6-rc/ssh-fwd-run/run @@ -0,0 +1,15 @@ +#!/local/bin/execlineb +# ssh tunnelling + +fdmove -c 2 1 + +s6-envdir ./env/ +multisubstitute { + importas PORT_LOCAL PORT_LOCAL + importas PORT_REMOTE PORT_REMOTE + importas HOST HOST + importas USER USER +} + +ssh -L ${PORT_LOCAL}:${HOST}:${PORT_REMOTE} + -n ${USER}@${HOST} diff --git a/s6-rc/backup/type b/s6-rc/ssh-fwd-run/type diff --git a/s6-rc/ssh-fwd/dependencies b/s6-rc/ssh-fwd/dependencies @@ -1 +0,0 @@ -ssh-fwd-log diff --git a/s6-rc/ssh-fwd/producer-for b/s6-rc/ssh-fwd/producer-for @@ -1 +0,0 @@ -ssh-fwd-log diff --git a/s6-rc/ssh-fwd/run b/s6-rc/ssh-fwd/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-rc/ssh-fwd/type b/s6-rc/ssh-fwd/type @@ -1 +0,0 @@ -longrun diff --git a/s6-rc/tinc-log/run b/s6-rc/tinc-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/tinc-run +s6-log t /log/tinc diff --git a/s6-rc/tinc-run/data/conf.d/common.conf b/s6-rc/tinc-run/data/conf.d/common.conf @@ -0,0 +1,2 @@ +DeviceStandby = no +PingTimeout = 15 diff --git a/s6-rc/tinc-run/data/hosts/kroa b/s6-rc/tinc-run/data/hosts/kroa @@ -0,0 +1,13 @@ +Address = kroa.josuah.net +Subnet = 172.16.55.5 +Port = 6655 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAmnT1YEcPTOiaa/GfWsFF1p3Qo/xeIjIb6e/cG62nKcjJSS+L3G+P +VUFOT7YfRdggzWDAMvxdAq5+DFcg2v3iDm8yTcv8ITaSKHFp4Tarkl2zEs5VELVY +mcPrYI99oyo9xiXh+x1G9/wp+uKxgoeU4m0+iNwyZw7ypoIgJhx8TfT7rgaXmyNX +HDBu/hBH7orTF3TMRp/VrWqD8UQyD0tK1gGQe4WIQJqouPxd44O8tKRgtha69q42 +kZ92DuFHLjTkYFjt4WKGEUAdja+aqbk5QeNyoOHtw9VkTIJcWShwPTYj0Ykdm/BS +oyBpV8pID+xWz81lpMilfanlPjgmzc6UvQIDAQAB +-----END RSA PUBLIC KEY----- +Ed25519PublicKey = UzE1NtmdKv3MWpslesWIT4/AB3a8WZX+AP/2suMRUnK diff --git a/s6-rc/tinc-run/data/hosts/nas b/s6-rc/tinc-run/data/hosts/nas @@ -0,0 +1,13 @@ +Address = nas.josuah.net +Subnet = 172.16.55.2 +Port = 655 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAxFl/zn8owPVa0EBaazQaUck0ImV3+VS9+jOs0tePcQxuYHtX94dm +ZlYADJP/TaN8IEezQcgm2+iyavoOEBTCKhQ7/mYqG6UI2bcZjtu5UFl37YUJEYHN +dhvrhJwoYOWTFSu/d+UT/k8tFxoW308AXxqmb85egSBg8zaekrS7ibBSMi+AVaAz +g/Me+qgWh2j6jGh55Av1JeJ+1trlRLIvMRDwPe0U4hRjEZ/nBXFQS67AW1qg2tSF +3ieQgIr12FyZMw3ieWKiUW3JShdYRRMnV8hfKsn98R8LOirXBY2nCqRkWvKjYyY6 +bN2MzG57jdprYDR4ljglDFaXsNCDFgWTXwIDAQAB +-----END RSA PUBLIC KEY----- +Ed25519PublicKey = QbVvGg+CgFHyzWzbmG4hpY7Kus3kMZean2Vj52v2roN diff --git a/s6-rc/tinc-run/data/hosts/pdmg b/s6-rc/tinc-run/data/hosts/pdmg @@ -0,0 +1,12 @@ +Subnet = 172.16.55.4 +Port = 655 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAxnCPtS3uHC8ZwZCDDPpDZWfuQF2PP1GdqHAF7pmk1mXCfapSVU/I +5gVP7scrbSKhNXpeQvgfRk7BQ+O1TpvhYDJRR6/xlACbaWeoFIQLbBMik10Dvw7k +Zrt/cnF8WTdEgQ52GIhwJhc/ZoBQHLfoAPZrD3lyTG4PQb/VyouQVJq8JgthHgIi +u3jz3meiB292rz9kg+wafl7YVsvWQZMK3CAHWjKLOaSNFYM6zkZU42v5d2mkC1aT +JowYMn0GRTKL4IC2WkzAt1JNK5Hd8YexdKBfqmobZI+SevlPYVkZLM7jmcTR7836 +bdBZF/tZpvRUY7eHSwVni576SwO+zakt3wIDAQAB +-----END RSA PUBLIC KEY----- +Ed25519PublicKey = 5ooarAS0cWAxPQ6q2wn/1ZvhLYuz6ZRSJGZFFMMeZBF diff --git a/s6-rc/tinc-run/data/hosts/rpi b/s6-rc/tinc-run/data/hosts/rpi @@ -0,0 +1,13 @@ +Address = rpi.josuah.net +Subnet = 172.16.55.3 +Port = 655 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA35oN9yPu+lF7ZmphYandl896xjKYnNjIn5UB4gGvfbBEEA3kKYev +6Z4ApOvw2AgQ3WVbAynG3KbNj5jsCBBG8M9PfSPeFn4jpjycDqORi3sW6z3MQHfZ +u61jif16QtuuwXtrTiWO+MEVmSsCH9Vxtq5L6qJHZA7pEkQMxu/aEjOpYdpwZb/M +AnO7TU+PzTjUte40sfrIczHHkpDh8CdS1mKseF1XcNBhUANB7F6hQwhwD96GdGer +ioqMpltyyXMz4oZvhV+LD/jVOUXD1FZjiqO5TNtCFXYDLF/gxq/vmQ84eDo/I3Mo +E7wbHst5mOSRLBUP9cCAys/r6+JAdg+LfwIDAQAB +-----END RSA PUBLIC KEY----- +Ed25519PublicKey = Zsy56fH9Hbd/qiRWRy/7YEKv4eQUPI1o+3iXs8lHN1N diff --git a/s6-rc/tinc-run/data/hosts/t470s b/s6-rc/tinc-run/data/hosts/t470s @@ -0,0 +1,12 @@ +Subnet = 172.16.55.1 + +Port = 12196 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAs99vlkaTp2BWltxN5KiBMkH/fHV1O3DWARK6ojFlhgENdmGjDxxk +0rshmaAvSjZ3uU2z+QkUIpovqEZf5I5abrAu1yKyMTIMFwqasa5D3TSkcePf+dD7 +LIr/YBWPl6kxHrNd2s3qPXBoYNaTBX7CCdXla7Rlz1/EnkMCfSLLd6YQsaCR4MsE +dwgR17bu5MsvB9YNLvbkqHHZCwvwIHrvX8dxvCr1BZwHAt/SDwg0nnTD2YNBUUl+ +SsXzMNfKiEjqmfHGfzMmP9Q9yjM6W5YAr+/Y7OPb/LnsPbYNC1L5YqaKskM431JU +vcpAPqjRJTvo+ji4hKrKdRal6tE61ZUW4wIDAQAB +-----END RSA PUBLIC KEY----- +Ed25519PublicKey = Wnd7bglt6wxqz/QJT1KH9wajs2LUUnMTHTDSU7/SsQM diff --git a/s6-rc/tinc-run/data/tinc-up b/s6-rc/tinc-run/data/tinc-up @@ -0,0 +1,11 @@ +#!/bin/sh -ex + +case $(uname) in +(*BSD) + ifconfig "$INTERFACE" "$(tinc -c . get subnet)" netmask 255.255.255.0 + ;; +(Linux) + ip link set "$INTERFACE" up + ip addr add "$(tinc -c . get subnet | sed q)/24" dev "$INTERFACE" + ;; +esac diff --git a/s6-rc/tinc-run/producer-for b/s6-rc/tinc-run/producer-for @@ -0,0 +1 @@ +tinc-log diff --git a/s6-rc/tinc-run/run b/s6-rc/tinc-run/run @@ -0,0 +1,9 @@ +#!/local/bin/execlineb +# vpn focused on mesh networking + +fdmove -c 2 1 + +tincd -D + -d 5 + --config=./data + --pidfile=./data/pid diff --git a/s6-rc/backup/type b/s6-rc/tinc-run/type diff --git a/s6-rc/tinc/data/conf.d/common.conf b/s6-rc/tinc/data/conf.d/common.conf @@ -1,2 +0,0 @@ -DeviceStandby = no -PingTimeout = 15 diff --git a/s6-rc/tinc/data/hosts/kroa b/s6-rc/tinc/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-rc/tinc/data/hosts/nas b/s6-rc/tinc/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-rc/tinc/data/hosts/pdmg b/s6-rc/tinc/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-rc/tinc/data/hosts/rpi b/s6-rc/tinc/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-rc/tinc/data/hosts/t470s b/s6-rc/tinc/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-rc/tinc/data/tinc-up b/s6-rc/tinc/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-rc/tinc/dependencies b/s6-rc/tinc/dependencies @@ -1 +0,0 @@ -tinc-log diff --git a/s6-rc/tinc/producer-for b/s6-rc/tinc/producer-for @@ -1 +0,0 @@ -tinc-log diff --git a/s6-rc/tinc/run b/s6-rc/tinc/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-rc/tinc/type b/s6-rc/tinc/type @@ -1 +0,0 @@ -longrun diff --git a/s6-rc/tinysshd-log/run b/s6-rc/tinysshd-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/tinysshd-run +s6-log t /log/tinysshd diff --git a/s6-rc/tinysshd-run/env/PORT b/s6-rc/tinysshd-run/env/PORT @@ -0,0 +1 @@ +22 diff --git a/s6-rc/tinysshd-run/producer-for b/s6-rc/tinysshd-run/producer-for @@ -0,0 +1 @@ +tinysshd-log diff --git a/s6-rc/tinysshd-run/run b/s6-rc/tinysshd-run/run @@ -0,0 +1,14 @@ +#!/local/bin/execlineb +# SSHv2 server with minimal footprint https://tinyssh.org/ + +fdmove -c 2 1 + +foreground { mkdir -p ./data/ } +foreground { if { test ! -d ./data/key/ } tinysshd-makekey ./data/key/ } +foreground { chmod 500 ./data/key/ } + +s6-envdir ./env/ +importas PORT PORT + +s6-tcpserver 0.0.0.0 $PORT +tinysshd -sovv ./data/key/ diff --git a/s6-rc/backup/type b/s6-rc/tinysshd-run/type diff --git a/s6-rc/tinysshd/dependencies b/s6-rc/tinysshd/dependencies @@ -1 +0,0 @@ -tinysshd-log diff --git a/s6-rc/tinysshd/env/PORT b/s6-rc/tinysshd/env/PORT @@ -1 +0,0 @@ -22 diff --git a/s6-rc/tinysshd/producer-for b/s6-rc/tinysshd/producer-for @@ -1 +0,0 @@ -tinysshd-log diff --git a/s6-rc/tinysshd/run b/s6-rc/tinysshd/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-rc/tinysshd/type b/s6-rc/tinysshd/type @@ -1 +0,0 @@ -longrun diff --git a/s6-rc/tls-server-log/run b/s6-rc/tls-server-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/tls-server-run +s6-log t /log/tls-server diff --git a/s6-rc/tls-server-run/producer-for b/s6-rc/tls-server-run/producer-for @@ -0,0 +1 @@ +tls-server-log diff --git a/s6-rc/tls-server-run/run b/s6-rc/tls-server-run/run @@ -0,0 +1,12 @@ +#!/local/bin/execlineb +# TLS proxy based off brsl and ucspi-unix + +fdmove -c 2 1 + +s6-envdir ./env/ +importas HOST HOST + +mkdir -p /tmp/tls/ + +unixserver /tmp/tls/$HOST +brssl client $HOST diff --git a/s6-rc/backup/type b/s6-rc/tls-server-run/type diff --git a/s6-rc/tls-server/dependencies b/s6-rc/tls-server/dependencies @@ -1 +0,0 @@ -tls-server-log diff --git a/s6-rc/tls-server/producer-for b/s6-rc/tls-server/producer-for @@ -1 +0,0 @@ -tls-server-log diff --git a/s6-rc/tls-server/run b/s6-rc/tls-server/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-rc/tls-server/type b/s6-rc/tls-server/type @@ -1 +0,0 @@ -longrun diff --git a/s6-rc/tor-log/run b/s6-rc/tor-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/tor-run +s6-log t /log/tor diff --git a/s6-rc/tor-run/data/conf b/s6-rc/tor-run/data/conf @@ -0,0 +1,26 @@ +Log debug stderr +RunAsDaemon 0 + +DataDirectory @LOCALSTATEDIR@/var/tor + +## Once you have configured a hidden service, you can look at the +## contents of the file ".../hidden_service/hostname" for the address +## to tell people. +## +## HiddenServicePort x y:z says to redirect requests on port x to the +## address y:z. + +SOCKSPort 0 +User tor +PIDFile /home/tor/pid +Log notice stderr +DataDirectory /home/tor + +HiddenServiceDir /home/tor/gopher +HiddenServicePort 70 127.0.0.1:71 + +HiddenServiceDir /home/tor/http +HiddenServicePort 80 127.0.0.1:8080 + +HiddenServiceDir /home/tor/icecast +HiddenServicePort 3232 127.0.0.1:3232 diff --git a/s6-rc/tor-run/producer-for b/s6-rc/tor-run/producer-for @@ -0,0 +1 @@ +tor-log diff --git a/s6-rc/tor-run/run b/s6-rc/tor-run/run @@ -0,0 +1,6 @@ +#!/local/bin/execlineb +# tor daemon for routing and publishing services + +fdmove -c 2 1 + +tor -f ./data/conf diff --git a/s6-rc/backup/type b/s6-rc/tor-run/type diff --git a/s6-rc/tor/data/conf b/s6-rc/tor/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-rc/tor/dependencies b/s6-rc/tor/dependencies @@ -1 +0,0 @@ -tor-log diff --git a/s6-rc/tor/producer-for b/s6-rc/tor/producer-for @@ -1 +0,0 @@ -tor-log diff --git a/s6-rc/tor/run b/s6-rc/tor/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-rc/tor/type b/s6-rc/tor/type @@ -1 +0,0 @@ -longrun diff --git a/s6-rc/transmission-log/run b/s6-rc/transmission-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/transmission-run +s6-log t /log/transmission diff --git a/s6-rc/.s6-svscan/lock b/s6-rc/transmission-run/env/PASS diff --git a/s6-rc/transmission-run/env/USER b/s6-rc/transmission-run/env/USER @@ -0,0 +1 @@ +torrent diff --git a/s6-rc/transmission-run/producer-for b/s6-rc/transmission-run/producer-for @@ -0,0 +1 @@ +transmission-log diff --git a/s6-rc/transmission-run/run b/s6-rc/transmission-run/run @@ -0,0 +1,10 @@ +#!/local/bin/execlineb -P + +s6-envdir env + +multisubstitute { + importas USER USER + importas PASS PASS +} + +transmission-daemon -f -t -u $USER -v $PASS diff --git a/s6-rc/backup/type b/s6-rc/transmission-run/type diff --git a/s6-rc/transmission/dependencies b/s6-rc/transmission/dependencies @@ -1 +0,0 @@ -transmission-log diff --git a/s6-rc/transmission/env/PASS b/s6-rc/transmission/env/PASS diff --git a/s6-rc/transmission/env/USER b/s6-rc/transmission/env/USER @@ -1 +0,0 @@ -torrent diff --git a/s6-rc/transmission/producer-for b/s6-rc/transmission/producer-for @@ -1 +0,0 @@ -transmission-log diff --git a/s6-rc/transmission/run b/s6-rc/transmission/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-rc/transmission/type b/s6-rc/transmission/type @@ -1 +0,0 @@ -longrun diff --git a/s6-rc/u9fs-log/run b/s6-rc/u9fs-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/u9fs-run +s6-log t /log/u9fs diff --git a/s6-rc/u9fs-mount-log/run b/s6-rc/u9fs-mount-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/u9fs-mount-run +s6-log t /log/u9fs-mount diff --git a/s6-rc/u9fs-mount-run/down b/s6-rc/u9fs-mount-run/down @@ -0,0 +1,4 @@ +#!/usr/local/bin/execlineb +# mount a 9p filesystem from a local UNIX socket + +exec /mnt/9p diff --git a/s6-rc/u9fs-mount-run/producer-for b/s6-rc/u9fs-mount-run/producer-for @@ -0,0 +1 @@ +u9fs-mount-log diff --git a/s6-rc/backup/type b/s6-rc/u9fs-mount-run/type diff --git a/s6-rc/u9fs-mount-run/up b/s6-rc/u9fs-mount-run/up @@ -0,0 +1,5 @@ +#!/usr/local/bin/execlineb +# mount a 9p filesystem from a local UNIX socket + +mkdir -p /mnt/9p +exec 9pfs -U /tmp/9p /mnt/9p diff --git a/s6-rc/u9fs-mount/dependencies b/s6-rc/u9fs-mount/dependencies @@ -1 +0,0 @@ -u9fs-mount-log diff --git a/s6-rc/u9fs-mount/down b/s6-rc/u9fs-mount/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-rc/u9fs-mount/producer-for b/s6-rc/u9fs-mount/producer-for @@ -1 +0,0 @@ -u9fs-mount-log diff --git a/s6-rc/u9fs-mount/type b/s6-rc/u9fs-mount/type @@ -1 +0,0 @@ -longrun diff --git a/s6-rc/u9fs-mount/up b/s6-rc/u9fs-mount/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-rc/u9fs-run/producer-for b/s6-rc/u9fs-run/producer-for @@ -0,0 +1 @@ +u9fs-log diff --git a/s6-rc/u9fs-run/run b/s6-rc/u9fs-run/run @@ -0,0 +1,8 @@ +#!/local/bin/execlineb +# forward u9fs from a remote host to a local socket through ssh + +fdmove -c 2 1 + +unixserver -v /tmp/9p +ssh u9fs@host +u9fs -l /dev/stderr -a none -u u9fs /home/u9fs diff --git a/s6-rc/backup/type b/s6-rc/u9fs-run/type diff --git a/s6-rc/u9fs/dependencies b/s6-rc/u9fs/dependencies @@ -1 +0,0 @@ -u9fs-log diff --git a/s6-rc/u9fs/producer-for b/s6-rc/u9fs/producer-for @@ -1 +0,0 @@ -u9fs-log diff --git a/s6-rc/u9fs/run b/s6-rc/u9fs/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-rc/u9fs/type b/s6-rc/u9fs/type @@ -1 +0,0 @@ -longrun diff --git a/s6-rc/venti-log/run b/s6-rc/venti-log/run @@ -1,2 +1,2 @@ #!/usr/bin/env execlineb -s6-log t /var/log/venti-run +s6-log t /log/venti diff --git a/s6-rc/venti-run/data/conf b/s6-rc/venti-run/data/conf @@ -0,0 +1,8 @@ +index main + +isect /home/venti/isect0 +isect /home/venti/isect1 +arenas /home/venti/arena0 +mem 10M +bcmem 20M +icmem 30M diff --git a/s6-rc/venti-run/data/fmt b/s6-rc/venti-run/data/fmt @@ -0,0 +1,9 @@ +#!/bin/sh -e + +dd if=/dev/zero of=/home/venti/isect0 bs=1M count=1' +dd if=/dev/zero of=/home/venti/arena0 bs=1M count=1k + +/9/port/bin/venti/fmtisect isect0 /home/venti/isect0 +/9/port/bin/venti/fmtisect isect1 /home/venti/isect1 +/9/port/bin/venti/fmtarenas arena0 /home/venti/arena0 +/9/port/bin/venti/fmtindex conf diff --git a/s6-rc/venti-run/producer-for b/s6-rc/venti-run/producer-for @@ -0,0 +1 @@ +venti-log diff --git a/s6-rc/venti-run/run b/s6-rc/venti-run/run @@ -0,0 +1,11 @@ +#!/local/bin/execlineb -P +# write once read many (worm) storage server from plan 9 (p9p) + +fdmove -c 2 1 + +s6-setuidgid venti + +venti -s + -c ./data/conf + -a tcp!*!17034 + -h tcp!*!8080 diff --git a/s6-rc/backup/type b/s6-rc/venti-run/type diff --git a/s6-rc/venti/data/conf b/s6-rc/venti/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-rc/venti/data/fmt b/s6-rc/venti/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-rc/venti/dependencies b/s6-rc/venti/dependencies @@ -1 +0,0 @@ -venti-log diff --git a/s6-rc/venti/producer-for b/s6-rc/venti/producer-for @@ -1 +0,0 @@ -venti-log diff --git a/s6-rc/venti/run b/s6-rc/venti/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-rc/venti/type b/s6-rc/venti/type @@ -1 +0,0 @@ -longrun diff --git a/setup b/setup @@ -0,0 +1,3 @@ +#!/bin/sh -e + +xargs -r -n1 pack-add </etc/node/pack