dot

packages and services management
Log | Files | Refs | README

commit 79604dfa79460964111d08b9aefe967c5f71f334
parent 886f86f93853f79ec25f317832178e7a51c8c6ba
Author: Josuah Demangeon <mail@josuah.net>
Date:   Thu, 22 Feb 2018 00:06:51 +0100

runsvdir-ready

Diffstat:
M.profile | 1+
M.ssh/config | 2++
Mbin/edit | 2+-
Mconfigure | 4+++-
Apack/scron/build | 3+++
Asv/.gitignore | 6++++++
Asv/collectd/log/run | 2++
Asv/crond/log/run | 2++
Msv/crond/run | 2+-
Asv/geomyidae/log/run | 2++
Asv/git/log/run | 2++
Asv/ii-irc.cyberia.is/log/run | 2++
Asv/ii-irc.cyberia.is/run | 2++
Asv/ii-irc.efnet.org/log/run | 2++
Asv/ii-irc.efnet.org/run | 2++
Asv/ii-irc.freenode.net/log/run | 2++
Asv/ii-irc.freenode.net/run | 2++
Asv/ii-irc.oftc.net/log/run | 2++
Asv/ii-irc.oftc.net/run | 2++
Asv/ii-irc.rezosup.net/log/run | 2++
Asv/ii-irc.rezosup.net/run | 2++
Asv/ii-unix.chat/log/run | 2++
Asv/ii-unix.chat/run | 2++
Asv/ii/log/run | 2++
Msv/ii/run | 11+++++------
Asv/inetd/log/run | 2++
Asv/ngircd/log/run | 2++
Msv/ngircd/run | 2+-
Asv/opentracker/log/run | 2++
Asv/quark/log/run | 2++
Asv/ratox/log/run | 2++
Asv/runsvdir/run | 3+++
Asv/ssh-agent/log/run | 2++
Msv/ssh-agent/run | 5+----
Asv/svlogd/run | 3+++
Asv/tincd/log/run | 2++
Asv/tor/log/run | 2++
37 files changed, 80 insertions(+), 14 deletions(-)

diff --git a/.profile b/.profile @@ -34,6 +34,7 @@ export LESSHISTFILE="-" export MBLAZE="$HOME/.config/mblaze" export PKG_PATH="https://ftp.fr.openbsd.org/pub/OpenBSD/" export SSH_AUTH_SOCK="/tmp/ssh-agent" +export SVDIR="$HOME/var/sv" export PS1='$([ "$?" -gt 0 ] && printf "\033[31;1mx\033[m\n\r")' export PS1="$PS1$(printf '\033]0;%s\a' '$PWD') diff --git a/.ssh/config b/.ssh/config @@ -1,3 +1,5 @@ +AddKeysToAgent yes + host git.nixers.net IdentityFile /mnt/key/git.nixers.net.key diff --git a/bin/edit b/bin/edit @@ -6,4 +6,4 @@ # emacs(1)-style input key bindings for everything REPL. This also permit to # change the $EDITOR without reloading the environment variables. -VISUAL=vi exec less "$@" +exec vi "$@" diff --git a/configure b/configure @@ -5,7 +5,7 @@ cd "$0/.." mkdir -p "$HOME/var" -find . -path './.*' -prune \ +find . -path './.*' -prune -o -path './sv/*' -prune \ -o -type d -exec mkdir -p "$HOME/.config/{}" \; \ -o -type f -exec ln -sf "$PWD/{}" "$HOME/.config/{}" \; @@ -15,3 +15,5 @@ find .* -name .git -prune -o -name . -prune -o -name .. -prune \ -o -type l -exec ln -sf "$PWD/{}" "$HOME/{}" \; find -L "$HOME" -maxdepth 2 -type l -exec rm {} + + +mkdir -p "$SVDIR" diff --git a/pack/scron/build b/pack/scron/build @@ -0,0 +1,3 @@ +#!/bin/sh -ex + +make PREFIX="$OPT" MANPREFIX="$OPT/share/man" install diff --git a/sv/.gitignore b/sv/.gitignore @@ -0,0 +1,6 @@ +*/supervise +*/log/* +!*/log/run +*/lock +*/@* +*/current diff --git a/sv/collectd/log/run b/sv/collectd/log/run @@ -0,0 +1 @@ +../../svlogd/run+ \ No newline at end of file diff --git a/sv/crond/log/run b/sv/crond/log/run @@ -0,0 +1 @@ +../../svlogd/run+ \ No newline at end of file diff --git a/sv/crond/run b/sv/crond/run @@ -1,4 +1,4 @@ #!/bin/sh -e exec 2>&1 -exec crond -f "/etc/crontab" +exec crond -n -f "/etc/crontab" diff --git a/sv/geomyidae/log/run b/sv/geomyidae/log/run @@ -0,0 +1 @@ +../../svlogd/run+ \ No newline at end of file diff --git a/sv/git/log/run b/sv/git/log/run @@ -0,0 +1 @@ +../../svlogd/run+ \ No newline at end of file diff --git a/sv/ii-irc.cyberia.is/log/run b/sv/ii-irc.cyberia.is/log/run @@ -0,0 +1 @@ +../../svlogd/run+ \ No newline at end of file diff --git a/sv/ii-irc.cyberia.is/run b/sv/ii-irc.cyberia.is/run @@ -0,0 +1 @@ +../ii/run+ \ No newline at end of file diff --git a/sv/ii-irc.efnet.org/log/run b/sv/ii-irc.efnet.org/log/run @@ -0,0 +1 @@ +../../svlogd/run+ \ No newline at end of file diff --git a/sv/ii-irc.efnet.org/run b/sv/ii-irc.efnet.org/run @@ -0,0 +1 @@ +../ii/run+ \ No newline at end of file diff --git a/sv/ii-irc.freenode.net/log/run b/sv/ii-irc.freenode.net/log/run @@ -0,0 +1 @@ +../../svlogd/run+ \ No newline at end of file diff --git a/sv/ii-irc.freenode.net/run b/sv/ii-irc.freenode.net/run @@ -0,0 +1 @@ +../ii/run+ \ No newline at end of file diff --git a/sv/ii-irc.oftc.net/log/run b/sv/ii-irc.oftc.net/log/run @@ -0,0 +1 @@ +../../svlogd/run+ \ No newline at end of file diff --git a/sv/ii-irc.oftc.net/run b/sv/ii-irc.oftc.net/run @@ -0,0 +1 @@ +../ii/run+ \ No newline at end of file diff --git a/sv/ii-irc.rezosup.net/log/run b/sv/ii-irc.rezosup.net/log/run @@ -0,0 +1 @@ +../../svlogd/run+ \ No newline at end of file diff --git a/sv/ii-irc.rezosup.net/run b/sv/ii-irc.rezosup.net/run @@ -0,0 +1 @@ +../ii/run+ \ No newline at end of file diff --git a/sv/ii-unix.chat/log/run b/sv/ii-unix.chat/log/run @@ -0,0 +1 @@ +../../svlogd/run+ \ No newline at end of file diff --git a/sv/ii-unix.chat/run b/sv/ii-unix.chat/run @@ -0,0 +1 @@ +../ii/run+ \ No newline at end of file diff --git a/sv/ii/log/run b/sv/ii/log/run @@ -0,0 +1 @@ +../../svlogd/run+ \ No newline at end of file diff --git a/sv/ii/run b/sv/ii/run @@ -4,13 +4,12 @@ # same name as the host, assume it is an openssl s_client inetd proxy and use # the ii -u option to connect through it, otherwise use the port argument. -host="" -port="6667" path="$HOME/var/irc" +host="$(cd "$(dirname "$0")" && pwd | sed 's/.*ii-//')" -[ -S "/tmp/$host" ] && p="u" port="/tmp/$host" || p="p" +mkdir -p "$path/$host" -mkdir -p "$HOME/var/irc/$host" "$HOME/log/ii" +[ -S "/tmp/$host" ] && p="u" port="/tmp/$host" || p="p" port="6667" -exec 2>&1 -exec ii -s "$host" -i "$path" -$p "$port" -n "$NICK" -k "PASS" -f "$NAME" +exec ii -s "$host" -i "$path" -$p "$port" -n "$NICK" -k "PASS" -f "$NAME" \ + 2>&1 >> "$path/$host/log" diff --git a/sv/inetd/log/run b/sv/inetd/log/run @@ -0,0 +1 @@ +../../svlogd/run+ \ No newline at end of file diff --git a/sv/ngircd/log/run b/sv/ngircd/log/run @@ -0,0 +1 @@ +../../svlogd/run+ \ No newline at end of file diff --git a/sv/ngircd/run b/sv/ngircd/run @@ -1,4 +1,4 @@ #!/bin/sh -e exec 2>&1 -exec ngircd -n -f "/etc/ngircd/conf" +exec ngircd -n -f "/etc/ngircd.conf" diff --git a/sv/opentracker/log/run b/sv/opentracker/log/run @@ -0,0 +1 @@ +../../svlogd/run+ \ No newline at end of file diff --git a/sv/quark/log/run b/sv/quark/log/run @@ -0,0 +1 @@ +../../svlogd/run+ \ No newline at end of file diff --git a/sv/ratox/log/run b/sv/ratox/log/run @@ -0,0 +1 @@ +../../svlogd/run+ \ No newline at end of file diff --git a/sv/runsvdir/run b/sv/runsvdir/run @@ -0,0 +1,3 @@ +#!/bin/sh -e + +exec runsvdir "$SVDIR" ........................................................ diff --git a/sv/ssh-agent/log/run b/sv/ssh-agent/log/run @@ -0,0 +1 @@ +../../svlogd/run+ \ No newline at end of file diff --git a/sv/ssh-agent/run b/sv/ssh-agent/run @@ -1,7 +1,4 @@ #!/bin/sh -e -mkdir -p "${SSH_AUTH_SOCK%/*}" -rm -f "$SSH_AUTH_SOCK" - exec 2>&1 -ssh-agent -a "$SSH_AUTH_SOCK" +exec ssh-agent -d -a "$SSH_AUTH_SOCK" diff --git a/sv/svlogd/run b/sv/svlogd/run @@ -0,0 +1,3 @@ +#!/bin/sh -e + +exec svlogd -tt . diff --git a/sv/tincd/log/run b/sv/tincd/log/run @@ -0,0 +1 @@ +../../svlogd/run+ \ No newline at end of file diff --git a/sv/tor/log/run b/sv/tor/log/run @@ -0,0 +1 @@ +../../svlogd/run+ \ No newline at end of file