commit c505ff1678ec488b438fef12c33bfcf637853f3b
parent 8174c3a96f3cf2aa7f587b47d368544761f3c830
Author: Josuah Demangeon <mail@josuah.net>
Date: Sat, 10 Nov 2018 01:52:04 +0100
attempt at fixing qmail
Diffstat:
28 files changed, 64 insertions(+), 7 deletions(-)
diff --git a/bin/service-init b/bin/service-init
@@ -16,7 +16,6 @@ background {
backtick -n t { s6-clock } importas t t
if { s6-rc-compile compiled$t current }
if { s6-rc-init -c /var/s6/.s6-rc/compiled$t -l /var/s6/.s6-rc/live /run/s6 }
- if { s6-ln -nsf compiled$t compiled }
redirfd -w 1 init/fifo # wait that s6-svscan start
if { importas ! ! kill $! } # then kill s6-log
diff --git a/bin/service-load b/bin/service-load
@@ -3,5 +3,4 @@
backtick -n t { s6-clock } importas t t
if { s6-rc-compile /var/s6/.s6-rc/compiled$t /var/s6 }
if { s6-rc-update -l /var/s6/.s6-rc/live /var/s6/.s6-rc/compiled$t }
-if { s6-ln -nsf /var/s6/.s6-rc/compiled$t /var/s6/.s6-rc/compiled }
if { s6-rc -l /var/s6/.s6-rc/live -u change ok-all }
diff --git a/conf/etc b/conf/etc
@@ -1,4 +1,4 @@
#!/bin/sh -e
cd "$(dirname "$0")/.."
-ln -sf "$PWD/s6" /etc
+ln -sf "$PWD/qmail" "$PWD/s6" /etc
diff --git a/qmail/alias/.qmail-mail b/qmail/.qmail-mail
diff --git a/qmail/alias/.qmail-postmaster b/qmail/.qmail-postmaster
diff --git a/qmail/alias/.qmail-root b/qmail/.qmail-root
diff --git a/qmail/badloadertypes b/qmail/badloadertypes
@@ -0,0 +1,4 @@
+Mi5kb
+MzIuZ
+MyLmR
+MyLkR
diff --git a/qmail/badmailfrom b/qmail/badmailfrom
@@ -0,0 +1,5 @@
+# Wildmat evaluates from least specific to most specific
+*
+!
+!*@*.*
+*%*
diff --git a/qmail/badmimetypes b/qmail/badmimetypes
@@ -0,0 +1,12 @@
+TVqQAAMAA
+TVpQAAIAA
+TVpAALQAc
+TVpyAXkAX
+TVrmAU4AA
+TVrhARwAk
+TVoFAQUAA
+TVoAAAQAA
+TVoIARMAA
+TVouARsAA
+TVrQAT8AA
+TVoAAAEAA
diff --git a/qmail/badrcptto b/qmail/badrcptto
@@ -0,0 +1,4 @@
+# Wildmat evaluates from least specifc to most specific
+*%*
+*\ *@*
+!*@*.*
diff --git a/qmail/alias/.qmail-mail b/qmail/control/.qmail-mail
diff --git a/qmail/alias/.qmail-mail b/qmail/control/.qmail-postmaster
diff --git a/qmail/alias/.qmail-mail b/qmail/control/.qmail-root
diff --git a/qmail/control/badloadertypes b/qmail/control/badloadertypes
@@ -0,0 +1,4 @@
+Mi5kb
+MzIuZ
+MyLmR
+MyLkR
diff --git a/qmail/control/badmailfrom b/qmail/control/badmailfrom
@@ -0,0 +1,5 @@
+# Wildmat evaluates from least specific to most specific
+*
+!
+!*@*.*
+*%*
diff --git a/qmail/control/badmimetypes b/qmail/control/badmimetypes
@@ -0,0 +1,12 @@
+TVqQAAMAA
+TVpQAAIAA
+TVpAALQAc
+TVpyAXkAX
+TVrmAU4AA
+TVrhARwAk
+TVoFAQUAA
+TVoAAAQAA
+TVoIARMAA
+TVouARsAA
+TVrQAT8AA
+TVoAAAEAA
diff --git a/qmail/control/badrcptto b/qmail/control/badrcptto
@@ -0,0 +1,4 @@
+# Wildmat evaluates from least specifc to most specific
+*%*
+*\ *@*
+!*@*.*
diff --git a/qmail/control/locals b/qmail/control/locals
@@ -0,0 +1 @@
+localhost
diff --git a/qmail/locals b/qmail/locals
@@ -0,0 +1 @@
+localhost
diff --git a/qmail/me b/qmail/me
@@ -0,0 +1,2 @@
+josuah.net
+localhost
diff --git a/qmail/rcpthosts b/qmail/rcpthosts
@@ -0,0 +1,2 @@
+josuah.net
+localhost
diff --git a/qmail/tlsdestinations b/qmail/tlsdestinations
@@ -0,0 +1 @@
+*:
diff --git a/s6/ii-tls/x/env/CAFILE b/s6/ii-tls/x/env/CAFILE
@@ -1 +1 @@
-data/cert.pem
+cert.pem
diff --git a/s6/ii-tls/x/run b/s6/ii-tls/x/run
@@ -1,5 +1,5 @@
#!/usr/bin/env execlineb
-fdmove -c 1
+fdmove -c 2 1
s6-envdir env multisubstitute {
importas HOST HOST
importas PORT PORT
diff --git a/s6/qmail-send/x/run b/s6/qmail-send/x/run
@@ -1,5 +1,5 @@
#!/usr/bin/env execlineb
-fdmove -c 1
+fdmove -c 2 1
s6-envdir env multisubstitute {
importas -n MAILDIR MAILDIR
}
diff --git a/s6/qmail-tcp/x/env/HOST b/s6/qmail-tcp/x/env/HOST
@@ -0,0 +1 @@
+0.0.0.0
diff --git a/s6/qmail-tcp/x/env/PORT b/s6/qmail-tcp/x/env/PORT
@@ -0,0 +1 @@
+25
diff --git a/s6/qmail-tcp/x/run b/s6/qmail-tcp/x/run
@@ -1,6 +1,6 @@
#!/usr/bin/env execlineb
fdmove -c 2 1
-s6-envdir multisubstitute {
+s6-envdir env multisubstitute {
importas -n HOST HOST
importas -n PORT PORT
}
