dot

packages and services management
Log | Files | Refs | README

commit bb4d85dbd574158eede5987cba4525b3f043b13d
parent ac3fb03e8564647de1714874080749081d3221e7
Author: Josuah Demangeon <mail@josuah.net>
Date:   Sun, 22 Jul 2018 19:03:36 +0200

Merge branch 'master' of git.josuah.net:conf

Diffstat:
Mpack/qmail/build | 16+++++++---------
Rs6/qmail-start/data/alias/.qmail-mail -> s6/qmail-send/data/alias/.qmail-mail | 0
Rs6/qmail-start/data/control/defaultdelivery -> s6/qmail-send/data/control/defaultdelivery | 0
Rs6/qmail-start/data/control/defaultdomain -> s6/qmail-send/data/control/defaultdomain | 0
Rs6/qmail-start/data/control/locals -> s6/qmail-send/data/control/locals | 0
Rs6/qmail-start/data/control/me -> s6/qmail-send/data/control/me | 0
Rs6/qmail-start/data/control/plusdomain -> s6/qmail-send/data/control/plusdomain | 0
Rs6/qmail-start/data/control/rcpthosts -> s6/qmail-send/data/control/rcpthosts | 0
Rs6/qmail-start/data/control/defaultdelivery -> s6/qmail-send/env/MAILDIR | 0
As6/qmail-send/log/run | 2++
As6/qmail-send/run | 8++++++++
Ds6/qmail-start/log/run | 2--
Ds6/qmail-start/run | 6------
Muser/qmail/add | 16++++++++--------
14 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pack/qmail/build b/pack/qmail/build @@ -1,6 +1,6 @@ #!/bin/sh -ex -DATA=/var/s6/qmail-start/data +DATA=/var/s6/qmail-send/data echo gcc -O2 -include /usr/include/errno.h >conf-cc echo "$DATA" >conf-qmail @@ -9,12 +9,9 @@ touch nroff chmod +x nroff export PATH=$PWD:$PATH -mkdir -p "$DATA/bin/" "$PREFIX/share/" "$PREFIX/bin" +mkdir -p "$PREFIX/bin/" "$PREFIX/share/man/" "$DATA/" +rm -rf "$DATA/bin/" "$DATA/man/" +ln -sf "$PREFIX/bin/" "$DATA/" +ln -sf "$PREFIX/share/man/" "$DATA/" make setup check -./config - -mv "$DATA/man/" "$PREFIX/share/" -mv "$DATA/bin/"* "$PREFIX/bin/" - -cd "$PREFIX/bin/" -ln -s "$PREFIX/bin/"* "$DATA/bin/" +./config+ \ No newline at end of file diff --git a/s6/qmail-start/data/alias/.qmail-mail b/s6/qmail-send/data/alias/.qmail-mail diff --git a/s6/qmail-start/data/control/defaultdelivery b/s6/qmail-send/data/control/defaultdelivery diff --git a/s6/qmail-start/data/control/defaultdomain b/s6/qmail-send/data/control/defaultdomain diff --git a/s6/qmail-start/data/control/locals b/s6/qmail-send/data/control/locals diff --git a/s6/qmail-start/data/control/me b/s6/qmail-send/data/control/me diff --git a/s6/qmail-start/data/control/plusdomain b/s6/qmail-send/data/control/plusdomain diff --git a/s6/qmail-start/data/control/rcpthosts b/s6/qmail-send/data/control/rcpthosts diff --git a/s6/qmail-start/data/control/defaultdelivery b/s6/qmail-send/env/MAILDIR diff --git a/s6/qmail-send/log/run b/s6/qmail-send/log/run @@ -0,0 +1,2 @@ +#!/local/bin/execlineb -P +s6-log T /var/log/qmail-send/ diff --git a/s6/qmail-send/run b/s6/qmail-send/run @@ -0,0 +1,8 @@ +#!/local/bin/execlineb +# start watching qmail dir for queued messages + +fdmove -c 2 1 +s6-envdir ./env/ +importas MAILDIR MAILDIR + +qmail-start $MAILDIR diff --git a/s6/qmail-start/log/run b/s6/qmail-start/log/run @@ -1,2 +0,0 @@ -#!/local/bin/execlineb -P -s6-log T /var/log/qmail-start/ diff --git a/s6/qmail-start/run b/s6/qmail-start/run @@ -1,6 +0,0 @@ -#!/local/bin/execlineb -# start watching qmail dir for queued messages - -fdmove -c 2 1 - -qmail-start ./data/ diff --git a/user/qmail/add b/user/qmail/add @@ -1,15 +1,15 @@ #!/bin/sh -ex # qmail control and queues -mkdir -p /var/s6/qmail-start/data/ +mkdir -p /var/s6/qmail-send/data/ groupadd nofiles -useradd -g nofiles -d /var/s6/qmail-start/data/alias/ -s "$(which true)" alias -useradd -g nofiles -d /var/s6/qmail-start/data/ -s "$(which true)" qmaild -useradd -g nofiles -d /var/s6/qmail-start/data/ -s "$(which true)" qmaill -useradd -g nofiles -d /var/s6/qmail-start/data/ -s "$(which true)" qmailp +useradd -g nofiles -d /var/s6/qmail-send/data/alias -s "$(which true)" alias +useradd -g nofiles -d /var/s6/qmail-send/data -s "$(which true)" qmaild +useradd -g nofiles -d /var/s6/qmail-send/data -s "$(which true)" qmaill +useradd -g nofiles -d /var/s6/qmail-send/data -s "$(which true)" qmailp groupadd qmail -useradd -g qmail -d /var/s6/qmail-start/data/ -s "$(which true)" qmailq -useradd -g qmail -d /var/s6/qmail-start/data/ -s "$(which true)" qmailr -useradd -g qmail -d /var/s6/qmail-start/data/ -s "$(which true)" qmails +useradd -g qmail -d /var/s6/qmail-send/data -s "$(which true)" qmailq +useradd -g qmail -d /var/s6/qmail-send/data -s "$(which true)" qmailr +useradd -g qmail -d /var/s6/qmail-send/data -s "$(which true)" qmails