dot

packages and services management
Log | Files | Refs | README

commit 08d7c4c85a2b5e5526c1bedfdac02fd70eb4a3df
parent 46668377b6c226bbbbb5c8dd1fea86f54e8b5b40
Author: Josuah Demangeon <mail@josuah.net>
Date:   Sat, 22 Dec 2018 23:19:02 +0100

fix services including qmail

Diffstat:
Mbin/git-hook-stagit | 19+++++++++----------
Mbin/service-log | 2+-
Mbin/service-status | 2+-
Detc/s6/geomyidae/josuah.net/env/ROOT | 1-
Metc/s6/host/kuntur/contents | 4++--
Metc/s6/qmail-send/x/setup | 10+++++++++-
6 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/bin/git-hook-stagit b/bin/git-hook-stagit @@ -7,24 +7,23 @@ backtick -n x { basename ${target} } importas domain x backtick -n x { pwd } -importas repo x +importas gitdir x -backtick -n x { basename ${repo} .git } +backtick -n x { heredoc 0 ${gitdir} sed -r "s,.*/,," } importas repo x -cd ${target} - -if { stagit -l ${limit} -c ${repo}/stagit-cache ${repo} } -if { stagit-gopher -b ${domain} -l ${limit} -c ${repo}/stagit-cache ${repo} } +if { mkdir -p ${target}/${repo} } +if { cd ${target}/${repo} stagit ${gitdir} } +if { cd ${target}/${repo} stagit-gopher -b /git/${repo} ${gitdir} } if { - elglob -0 x ${target}/*/ + elglob -0 x ../*/ redirfd -w 1 ${target}/index.html stagit-index ${x} } if { - elglob -0 x ${target}/*/ - redirfd -w 1 ${target}/index.html - stagit-index-gopher -b ${domain} ${x} + elglob -0 x ../*/ + redirfd -w 1 ${target}/index.gph + stagit-gopher-index -b /git/${repo} ${x} } diff --git a/bin/service-log b/bin/service-log @@ -4,7 +4,7 @@ elgetpositionals if -n { test ${#} = 0 } backtick x { - pipeline { s6-rc -l /var/s6/live list ${@} } + pipeline { s6-rc list ${@} } pipeline { sed -n "s/,log$// p" } sort } diff --git a/bin/service-status b/bin/service-status @@ -4,7 +4,7 @@ elgetpositionals -P 1 if { printf "\n" } fdmove -c 2 1 -forbacktickx x { pipeline { s6-rc -l /var/s6/live list $@ } grep -v ",log$" } +forbacktickx x { pipeline { s6-rc list $@ } grep -v ",log$" } importas -n -d "\n" sv x if { heredoc 0 ${sv} sed -r "s/([^,]*),?(.*)/ \033[1m\\1\033[m (\\2)/; s/\\(\\)/(x)/" } diff --git a/etc/s6/geomyidae/josuah.net/env/ROOT b/etc/s6/geomyidae/josuah.net/env/ROOT @@ -1 +0,0 @@ -/var/www/plain/josuah.net diff --git a/etc/s6/host/kuntur/contents b/etc/s6/host/kuntur/contents @@ -1,5 +1,5 @@ -geomyidae,ipv4,josuah.net,x -geomyidae,ipv6,josuah.net,x +geomyidae,ipv4,x +geomyidae,ipv6,x git-daemon,x httpfile,tcp,x httpfile,tls,h-o.st,x diff --git a/etc/s6/qmail-send/x/setup b/etc/s6/qmail-send/x/setup @@ -6,4 +6,12 @@ multisubstitute { importas GROUP GROUP } if { s6-hiercopy conf /var/qmail } -chgrp -R ${USER}:${GROUP} /var/qmail + +cd /var/qmail +if { chgrp -R ${GROUP} /var/qmail } + +cd queue +if { chmod -R 750 mess todo } +if { chmod -R 700 info intd local remote } +if { chown -R qmailq:${GROUP} mess intd } +if { chown -R qmails:${GROUP} info local remote todo }