dot

packages and services management
Log | Files | Refs | README

commit 4d9207ec6535effa144756da0fd2d4c5cda54b8e
parent 83a9799539fce06e473a0c8b48f31b67a50335d4
Author: Josuah Demangeon <mail@josuah.net>
Date:   Thu,  3 Jan 2019 19:24:33 +0100

monitoring setup

Diffstat:
Dbin/git-hook-fetch | 4----
Dbin/git-hook-stagit | 40----------------------------------------
Mbin/s6-rc-log | 2+-
Mconf/git | 1+
Metc/git/public/hooks/post-receive.d/git-hook-stagit | 2+-
Detc/s6-mk/acme-client/default/env/USER | 1-
Metc/s6-mk/acme-client/default/env/WWWDIR | 2+-
Metc/s6-mk/acme-client/default/run | 15++-------------
Aetc/s6-mk/acme-client/default/setup | 17+++++++++++++++++
Detc/s6-mk/acme-client/irc.josuah.net/env/DOMAIN | 1-
Metc/s6-mk/ii/default/env/ROOT | 2+-
Cetc/s6-mk/ii/default/env/ROOT -> etc/s6-mk/ii/default/env/USER | 0
Metc/s6-mk/ii/default/finish | 2+-
Aetc/s6-mk/ii/default/timeout-finish | 1+
Metc/s6-mk/ii/irc.cyberia.is/env/NAME | 1+
Metc/s6-mk/ii/irc.cyberia.is/env/NICK | 2+-
Detc/s6-mk/ii/irc.cyberia.is/env/USER | 1-
Metc/s6-mk/ii/irc.epitech.eu/env/NAME | 1+
Detc/s6-mk/ii/irc.epitech.eu/env/USER | 1-
Metc/s6-mk/ii/irc.freenode.net/env/NAME | 1+
Detc/s6-mk/ii/irc.freenode.net/env/USER | 1-
Aetc/s6-mk/ii/irc.h-o.st/env/HOST | 1+
Aetc/s6-mk/ii/irc.h-o.st/env/NAME | 1+
Aetc/s6-mk/ii/irc.h-o.st/env/NICK | 1+
Metc/s6-mk/ii/irc.oftc.net/env/NAME | 1+
Detc/s6-mk/ii/irc.oftc.net/env/USER | 1-
Metc/s6-mk/ii/monit-bot/env/HOST | 2+-
Detc/s6-mk/ii/monit-bot/env/USER | 1-
Metc/s6-mk/monit/default/data/alert/irc | 7++++---
Aetc/s6-mk/monit/default/data/check/http | 21+++++++++++++++++++++
Metc/s6-mk/monit/default/data/check/smtp | 13++++++++-----
Metc/s6-mk/monit/default/data/uri/test | 3+++
Aetc/s6-mk/monit/default/env/IRC_CHAN | 1+
Aetc/s6-mk/monit/default/env/IRC_HOST | 1+
Aetc/s6-mk/monit/default/env/IRC_ROOT | 1+
Detc/s6-mk/monit/default/finish | 4----
Metc/s6-mk/monit/default/run | 6+++---
Aetc/s6-mk/monit/default/timeout-finish | 1+
Detc/s6-mk/ngircd/default/conf/Global/AdminInfo2 | 1-
Detc/s6-mk/ngircd/default/conf/Global/Name | 1-
Metc/s6-mk/ngircd/default/setup | 8++++++++
Metc/s6-mk/ngircd/irc.h-o.st/conf/Global/AdminInfo1 | 2+-
Retc/s6-mk/ngircd/default/conf/Global/AdminInfo1 -> etc/s6-mk/ngircd/irc.h-o.st/conf/Global/AdminInfo2 | 0
Aetc/s6-mk/ngircd/irc.h-o.st/conf/Global/Name | 1+
Metc/s6-mk/ngircd/irc.h-o.st/conf/Operator/Mask | 2+-
Metc/s6-mk/ngircd/irc.h-o.st/conf/Operator/Name | 2+-
Metc/s6-mk/ngircd/irc.h-o.st/conf/Operator/Password | 1-
Aetc/s6-mk/ngircd/irc.h-o.st/conf/Server/Host | 1+
Metc/s6-mk/ngircd/irc.h-o.st/data/motd | 17+++++++++--------
Metc/s6-mk/qmail-send/default/setup | 73++++++++++++++++++++++++++++++++++++++++---------------------------------
Retc/s6-mk/qmail-send/mail.gandi.net/conf/control/authsenders.d/mail.gandi.net -> etc/s6-mk/qmail-send/josuah.net/conf/control/authsenders.d/mail.gandi.net | 0
Aetc/s6-mk/qmail-send/josuah.net/conf/control/tlsdestinations.d/mail.gandi.net | 1+
Detc/s6-mk/qmail-send/mail.gandi.net/conf/control/tlsdestinations.d/mail.gandi.net | 1-
53 files changed, 141 insertions(+), 134 deletions(-)

diff --git a/bin/git-hook-fetch b/bin/git-hook-fetch @@ -1,4 +0,0 @@ -#!/usr/bin/env execlineb - -if { git config remote.origin.fetch 'refs/heads/*:refs/heads/*' } -if { git remote update } diff --git a/bin/git-hook-stagit b/bin/git-hook-stagit @@ -1,40 +0,0 @@ -#!/usr/bin/env execlineb - -s6-envdir env -importas -D 0 target PATH_WWW - -backtick -n x { basename ${target} } -importas domain x - -backtick -n x { pwd } -importas gitdir x - -backtick -n x { heredoc 0 ${gitdir} sed -r "s,.*/,," } -importas repo x - -if { echo "stagit: ${repo}" } - -if { mkdir -p ${target}/${repo} stagit } -if { - cd ${target}/${repo} - stagit-gopher -b /git/${repo} -c ${gitdir}/stagit/cache-gopher ${gitdir} -} -if { - cd ${target}/${repo} - stagit ${gitdir} -c ${gitdir}/stagit/cache -} -if { ln -sf ../style.css ${target}/${repo}/style.css } - -elglob -0 x ../*/git-daemon-export-ok -backtick x { pipeline { printf "%s\n" ${x} } sed "s/[^/]*$//" } -importas -s -d "\n" repolist x - -if { - redirfd -w 1 ${target}/index.html - stagit-index ${repolist} -} - -if { - redirfd -w 1 ${target}/index.gph - stagit-gopher-index -b /git/${repo} ${repolist} -} diff --git a/bin/s6-rc-log b/bin/s6-rc-log @@ -10,7 +10,7 @@ backtick x { } importas -ns -d "\n" sv x -pipeline { elglob x /var/log/${sv}/@* cat ${x} /var/log/${sv}/current } +pipeline { elglob -0 x /var/log/${sv}/@* cat ${x} /var/log/${sv}/current } pipeline { sort -t " " -k1,1 } pipeline { s6-tai64nlocal } less diff --git a/conf/git b/conf/git @@ -10,3 +10,4 @@ if { git-newrepo public ploot "plot images or text from a .csv file" } if { git-newrepo public plstree "display ls or ps output as a tree" } if { git-newrepo public tttml "formatter for a very basic markup format" } if { git-newrepo public sites "mirror of git://git.suckless.org/sites" } +if { git-newrepo public pack "[WIP] dead simple source-based package manager" } diff --git a/etc/git/public/hooks/post-receive.d/git-hook-stagit b/etc/git/public/hooks/post-receive.d/git-hook-stagit @@ -36,5 +36,5 @@ if { if { redirfd -w 1 ${target}/index.gph - stagit-gopher-index -b /git/${repo} ${repolist} + stagit-gopher-index -b /git ${repolist} } diff --git a/etc/s6-mk/acme-client/default/env/USER b/etc/s6-mk/acme-client/default/env/USER @@ -1 +0,0 @@ -ssl diff --git a/etc/s6-mk/acme-client/default/env/WWWDIR b/etc/s6-mk/acme-client/default/env/WWWDIR @@ -1 +1 @@ -/var/www/plain +/var/www diff --git a/etc/s6-mk/acme-client/default/run b/etc/s6-mk/acme-client/default/run @@ -7,24 +7,13 @@ multisubstitute { importas WWWDIR WWWDIR importas SSLDIR SSLDIR importas DOMAIN DOMAIN - importas USER USER } -# 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 } - -s6-setuidgid ${USER} - snooze -d1 acme-client -vnN - -a $AGREEMENT_URL + -a ${AGREEMENT_URL} -C ${WWWDIR}/${DOMAIN}/:well-known/acme-challenge -c ${SSLDIR}/${DOMAIN} -k ${SSLDIR}/${DOMAIN}/privkey.pem -f ${SSLDIR}/private/privkey.pem - $DOMAIN + ${DOMAIN} diff --git a/etc/s6-mk/acme-client/default/setup b/etc/s6-mk/acme-client/default/setup @@ -0,0 +1,17 @@ +#!/usr/bin/env execlineb +s6-envdir env + +multisubstitute { + importas WWWDIR WWWDIR + importas SSLDIR SSLDIR + importas 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 { mkdir -p /var/empty } +if { chmod 700 ${SSLDIR}/private } diff --git a/etc/s6-mk/acme-client/irc.josuah.net/env/DOMAIN b/etc/s6-mk/acme-client/irc.josuah.net/env/DOMAIN @@ -1 +0,0 @@ -irc.josuah.net diff --git a/etc/s6-mk/ii/default/env/ROOT b/etc/s6-mk/ii/default/env/ROOT @@ -1 +1 @@ -irc +. diff --git a/etc/s6-mk/ii/default/env/ROOT b/etc/s6-mk/ii/default/env/USER diff --git a/etc/s6-mk/ii/default/finish b/etc/s6-mk/ii/default/finish @@ -1,2 +1,2 @@ -#!/usr/local/bin/execlineb -P +#!/usr/bin/env execlineb sleep 30 diff --git a/etc/s6-mk/ii/default/timeout-finish b/etc/s6-mk/ii/default/timeout-finish @@ -0,0 +1 @@ +300000 diff --git a/etc/s6-mk/ii/irc.cyberia.is/env/NAME b/etc/s6-mk/ii/irc.cyberia.is/env/NAME @@ -0,0 +1 @@ +jost + ii diff --git a/etc/s6-mk/ii/irc.cyberia.is/env/NICK b/etc/s6-mk/ii/irc.cyberia.is/env/NICK @@ -1 +1 @@ -iiosuah +iiost diff --git a/etc/s6-mk/ii/irc.cyberia.is/env/USER b/etc/s6-mk/ii/irc.cyberia.is/env/USER @@ -1 +0,0 @@ -josuah diff --git a/etc/s6-mk/ii/irc.epitech.eu/env/NAME b/etc/s6-mk/ii/irc.epitech.eu/env/NAME @@ -0,0 +1 @@ +josuah + ii diff --git a/etc/s6-mk/ii/irc.epitech.eu/env/USER b/etc/s6-mk/ii/irc.epitech.eu/env/USER @@ -1 +0,0 @@ -josuah diff --git a/etc/s6-mk/ii/irc.freenode.net/env/NAME b/etc/s6-mk/ii/irc.freenode.net/env/NAME @@ -0,0 +1 @@ +josuah + ii diff --git a/etc/s6-mk/ii/irc.freenode.net/env/USER b/etc/s6-mk/ii/irc.freenode.net/env/USER @@ -1 +0,0 @@ -josuah diff --git a/etc/s6-mk/ii/irc.h-o.st/env/HOST b/etc/s6-mk/ii/irc.h-o.st/env/HOST @@ -0,0 +1 @@ +irc.h-o.st diff --git a/etc/s6-mk/ii/irc.h-o.st/env/NAME b/etc/s6-mk/ii/irc.h-o.st/env/NAME @@ -0,0 +1 @@ +jost + ii diff --git a/etc/s6-mk/ii/irc.h-o.st/env/NICK b/etc/s6-mk/ii/irc.h-o.st/env/NICK @@ -0,0 +1 @@ +iiost diff --git a/etc/s6-mk/ii/irc.oftc.net/env/NAME b/etc/s6-mk/ii/irc.oftc.net/env/NAME @@ -0,0 +1 @@ +josuah + ii diff --git a/etc/s6-mk/ii/irc.oftc.net/env/USER b/etc/s6-mk/ii/irc.oftc.net/env/USER @@ -1 +0,0 @@ -josuah diff --git a/etc/s6-mk/ii/monit-bot/env/HOST b/etc/s6-mk/ii/monit-bot/env/HOST @@ -1 +1 @@ -irc.freenode.net +josuah.net diff --git a/etc/s6-mk/ii/monit-bot/env/USER b/etc/s6-mk/ii/monit-bot/env/USER @@ -1 +0,0 @@ -irc diff --git a/etc/s6-mk/monit/default/data/alert/irc b/etc/s6-mk/monit/default/data/alert/irc @@ -3,10 +3,11 @@ elgetpositionals #@ message importas -i host IRC_HOST importas -i chan IRC_CHAN +importas -i root IRC_ROOT if -n { - redirfd -wn 1 /var/irc/${host}/${chan} - echo "[alert]" "${@}" + if -t { redirfd -wn 1 ${root}/${host}/in echo "/j ${chan}" } + if -t { redirfd -wn 1 ${root}/${host}/${chan}/in echo "[alert]" "${@}" } } -echo "no irc bot is listenning at /var/irc/${host}/${chan}" +if { echo "could not send irc notification" } exit 1 diff --git a/etc/s6-mk/monit/default/data/check/http b/etc/s6-mk/monit/default/data/check/http @@ -0,0 +1,21 @@ +#!/usr/bin/env execlineb +elgetpositionals #0 scheme - #1 user - #2 host - #3 port - #4 path + +backtick -n x { + fdmove -c 2 1 + + s6-tcpclient -t 20 ${2} ${3} + fdmove -c 0 6 + fdswap 1 7 + if { printf "%s\r\n" + "GET /${4} HTTP/1.1" + "Host: ${2}" + "User-Agent: monit" + "" } + fdswap 7 1 + sed "s/\r//g; q" +} +importas answer x + +if -n { heredoc 0 ${answer} grep -E "^HTTP/[0-9.]+ 200 OK$" } +alert/irc "http://${2}:${3}/${4} -> \"${answer}\"" diff --git a/etc/s6-mk/monit/default/data/check/smtp b/etc/s6-mk/monit/default/data/check/smtp @@ -1,11 +1,14 @@ #!/usr/bin/env execlineb elgetpositionals #0 scheme - #1 user - #2 host - #3 port - #4 path -backtick -n x { s6-tcpclient -t 20 ${2} ${3} fdmove -c 0 6 sed q } +backtick -n x { + fdmove -c 2 1 + + s6-tcpclient -t 20 ${2} ${3} + fdmove -c 0 6 + sed "s/\r//g; q" +} importas hello x if -n { heredoc 0 ${hello} grep "^220 " } - -backtick x { heredoc 0 ${hello} tr -d "\\n\\r" } -importas hello-print x -alert/irc "[${0}] ${host:port}: \"${hello-print}\"" +alert/irc "smtp://${2}:${3} -> \"${hello}\"" diff --git a/etc/s6-mk/monit/default/data/uri/test b/etc/s6-mk/monit/default/data/uri/test @@ -1 +1,4 @@ smtp://josuah.net:25 +http://josuah.net:80 +http://atelier-fu.fr:80 +http://himalaya-solaire.org:80 diff --git a/etc/s6-mk/monit/default/env/IRC_CHAN b/etc/s6-mk/monit/default/env/IRC_CHAN @@ -0,0 +1 @@ +#monit diff --git a/etc/s6-mk/monit/default/env/IRC_HOST b/etc/s6-mk/monit/default/env/IRC_HOST @@ -0,0 +1 @@ +irc.h-o.st diff --git a/etc/s6-mk/monit/default/env/IRC_ROOT b/etc/s6-mk/monit/default/env/IRC_ROOT @@ -0,0 +1 @@ +/var/irc diff --git a/etc/s6-mk/monit/default/finish b/etc/s6-mk/monit/default/finish @@ -1,4 +0,0 @@ -#!/usr/bin/env execlineb -fdmove -c 2 1 - -snooze -H * -M * -S 20 diff --git a/etc/s6-mk/monit/default/run b/etc/s6-mk/monit/default/run @@ -4,15 +4,15 @@ fdmove -c 2 1 s6-envdir env cd data -ifte { wait -t 300 { } } { exit 1 } +ifte { if { wait -t 300 { } } snooze -H * -M * -S 20 } { exit 1 } forbacktickx -n -d "\n" x { elglob -0 x uri/* - sed -r "s,([^@:/#]+)://(([^@:/#]*)@)?([^:/#]*)?(:([^/#]*))?(/([^#]*))?(#(.*))?,\\1\t\\3\t\\4\t\\6\t\\8," ${x} + sed -r "s,([^@:/#]+)://(([^@:/#]*)@)?([^:/#]*)?(:([^/#]*))?(/([^#]*))?(#(.*))?,check/\\1\t\\3\t\\4\t\\6\t\\8\t," ${x} } importas -s -d "\t" parts x # the uri in data/uri/<uri> are now split into 5 arguments: #0 scheme - #1 user - #2 host - #3 port - #4 path -background { snooze -H * -M * -S * -R 10 check/${parts} } +background { ${parts} } diff --git a/etc/s6-mk/monit/default/timeout-finish b/etc/s6-mk/monit/default/timeout-finish @@ -0,0 +1 @@ +300000 diff --git a/etc/s6-mk/ngircd/default/conf/Global/AdminInfo2 b/etc/s6-mk/ngircd/default/conf/Global/AdminInfo2 @@ -1 +0,0 @@ -XXX diff --git a/etc/s6-mk/ngircd/default/conf/Global/Name b/etc/s6-mk/ngircd/default/conf/Global/Name @@ -1 +0,0 @@ -josuah.net diff --git a/etc/s6-mk/ngircd/default/setup b/etc/s6-mk/ngircd/default/setup @@ -1,5 +1,13 @@ #!/usr/bin/env execlineb +if { + redirfd -r 0 conf/Operator/Name withstdinas -n x importas nick x + redirfd -r 0 conf/Server/Host withstdinas -n x importas host x + + redirfd -w 1 conf/Operator/Password + pass irc/${host}/${nick} +} + if { mkdir -p data } redirfd -w 1 data/conf cd conf diff --git a/etc/s6-mk/ngircd/irc.h-o.st/conf/Global/AdminInfo1 b/etc/s6-mk/ngircd/irc.h-o.st/conf/Global/AdminInfo1 @@ -1 +1 @@ -jost +XXX diff --git a/etc/s6-mk/ngircd/default/conf/Global/AdminInfo1 b/etc/s6-mk/ngircd/irc.h-o.st/conf/Global/AdminInfo2 diff --git a/etc/s6-mk/ngircd/irc.h-o.st/conf/Global/Name b/etc/s6-mk/ngircd/irc.h-o.st/conf/Global/Name @@ -0,0 +1 @@ +irc.h-o.st diff --git a/etc/s6-mk/ngircd/irc.h-o.st/conf/Operator/Mask b/etc/s6-mk/ngircd/irc.h-o.st/conf/Operator/Mask @@ -1 +1 @@ -jost!XXX +iiost!* diff --git a/etc/s6-mk/ngircd/irc.h-o.st/conf/Operator/Name b/etc/s6-mk/ngircd/irc.h-o.st/conf/Operator/Name @@ -1 +1 @@ -jost +iiost diff --git a/etc/s6-mk/ngircd/irc.h-o.st/conf/Operator/Password b/etc/s6-mk/ngircd/irc.h-o.st/conf/Operator/Password @@ -1 +0,0 @@ -XXX diff --git a/etc/s6-mk/ngircd/irc.h-o.st/conf/Server/Host b/etc/s6-mk/ngircd/irc.h-o.st/conf/Server/Host @@ -0,0 +1 @@ +irc.h-o.st diff --git a/etc/s6-mk/ngircd/irc.h-o.st/data/motd b/etc/s6-mk/ngircd/irc.h-o.st/data/motd @@ -3,16 +3,16 @@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ __,--- - ,-' / - / , , /_ _ __ . ___ - / / / / \ ,'_| /' / ,' / - \__\ /_ /__,'_\__ / __ /__\__/___ __ _ - \/ - ____/ + ,-' / + / , , /_ _ __ . ___ + / / / / \ ,'_| /' / ,' / + \____\ /_ /__,'_\__ / __ /__\__/___ __ _ + \/ + ____/ Welcome to CyberiaIRC! -This is wired.2f30.org, listening on port 6697 (TLS) +This is irc.h-o.st, listening on port 6697 (TLS) Terms of Service: - No spamming or flooding @@ -31,7 +31,7 @@ Terms of Service: occgshn6gz4je57wyhpijni7waod6yxpxwihjdxjwrnpjtbayliei2id.onion Opers: - - jost + - iiost First steps: - Find an existing IRC channel on this network: /list @@ -41,3 +41,4 @@ Getting help: - Helpdesk on using IRC: /join #help - Network issues and oper queries: /join #noc - Specific issues with this server: /query jost + diff --git a/etc/s6-mk/qmail-send/default/setup b/etc/s6-mk/qmail-send/default/setup @@ -2,83 +2,90 @@ s6-envdir env importas GROUP GROUP -ifthenelse { test -d conf/control/tlsdestinations.d } { - redirfd -w 1 conf/control/tlsdestinations - cd conf/control/tlsdestinations.d - pipeline { elglob -0 x * grep . ${x} /dev/null } - sed "s/:/;/; s/$/:/" -} { echo no tlsdestinations } - -ifthenelse { test -d conf/control/authsenders.d } { - redirfd -w 1 conf/control/authsenders - cd conf/control/authsenders.d - forbacktickx -n -o 0 -d "\n" x { ls } - importas authsender x - - backtick -n x { cat ${authsender} } - importas relay x - - if { printf ":%s|%s|" ${relay} ${authsender} } - pass smtp/${authsender}/${relay} -} { echo no authsenders } +if { + elglob -0 x conf/control/*.d/ forx x { ${x} } + importas conf.d x + + backtick -n x { heredoc ${conf.d} sed "s/...$//" } + importas conf x + + redirfd -w 1 ${conf} + elglob -0 conf.d/file * cat ${conf.d/file} +} + +ifthenelse { test -f conf/control/authsenders } { + redirfd -r 0 conf/control/authsenders + redirfd -w 1 conf/control/authsenders.tmp + + forstdin -n x + importas + + pass smtp/${relay}/${authsender} +} { } if { s6-hiercopy conf /var/qmail } -if { chgrp -R ${GROUP} /var/qmail } +if { chgrp -RL ${GROUP} /var/qmail } + cd /var/qmail -if { chgrp -R sqmail . } +if { chgrp -RL sqmail . } + +if { chown qmailq bin/qmail-queue } +if { chmod 4711 bin/qmail-queue } +if { chmod 6711 bin/qmail-authuser } +if { chmod 6711 bin/qmail-vmailuser } -if { chown -R alias alias } +if { chown -RL alias alias } if { find alias -type d -exec chmod 750 {} + } if { find alias -type f -exec chmod 640 {} + } -if { chown -R root control } +if { chown -RL root control } if { find control -type d -exec chmod 750 {} + } if { find control -type f -exec chmod 640 {} + } if { chown qmailq queue } if { chmod 750 queue } -if { chown -R qmails queue/bounce } +if { chown -RL qmails queue/bounce } if { find queue/bounce -type d -exec chmod 700 {} + } if { find queue/bounce -type f -exec chmod 600 {} + } -if { chown -R qmails queue/info } +if { chown -RL qmails queue/info } if { find queue/info -type d -exec chmod 700 {} + } if { find queue/info -type f -exec chmod 600 {} + } -if { chown -R qmailq queue/intd } +if { chown -RL qmailq queue/intd } if { find queue/intd -type d -exec chmod 700 {} + } if { find queue/intd -type f -exec chmod 600 {} + } -if { chown -R qmails queue/local } +if { chown -RL qmails queue/local } if { find queue/local -type d -exec chmod 700 {} + } if { find queue/local -type f -exec chmod 600 {} + } if { chown qmailq queue/lock } if { chmod 750 queue/lock } -if { chown -R qmails queue/lock/sendmutex } +if { chown -RL qmails queue/lock/sendmutex } if { chmod 600 queue/lock/sendmutex } if { chown qmailr queue/lock/tcpto } if { chmod 644 queue/lock/tcpto } -if { chown -R qmails queue/lock/trigger } +if { chown -RL qmails queue/lock/trigger } if { chmod 622 queue/lock/trigger } -if { chown -R qmailq queue/mess } +if { chown -RL qmailq queue/mess } if { find queue/mess -type d -exec chmod 750 {} + } if { find queue/mess -type f -exec chmod 640 {} + } -if { chown -R qmailq queue/pid } +if { chown -RL qmailq queue/pid } if { chmod 700 queue/pid } -if { chown -R qmails queue/remote } +if { chown -RL qmails queue/remote } if { find queue/remote -type d -exec chmod 700 {} + } if { find queue/remote -type f -exec chmod 600 {} + } -if { chown -R qmailq queue/todo } +if { chown -RL qmailq queue/todo } if { find queue/todo -type d -exec chmod 750 {} + } if { find queue/todo -type f -exec chmod 640 {} + } diff --git a/etc/s6-mk/qmail-send/mail.gandi.net/conf/control/authsenders.d/mail.gandi.net b/etc/s6-mk/qmail-send/josuah.net/conf/control/authsenders.d/mail.gandi.net diff --git a/etc/s6-mk/qmail-send/josuah.net/conf/control/tlsdestinations.d/mail.gandi.net b/etc/s6-mk/qmail-send/josuah.net/conf/control/tlsdestinations.d/mail.gandi.net @@ -0,0 +1 @@ +;465 diff --git a/etc/s6-mk/qmail-send/mail.gandi.net/conf/control/tlsdestinations.d/mail.gandi.net b/etc/s6-mk/qmail-send/mail.gandi.net/conf/control/tlsdestinations.d/mail.gandi.net @@ -1 +0,0 @@ -465