[pkgsrc/trunk]: pkgsrc/mail/qmail-run/files Sort rc.conf defaults to match th...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2b910648ac9e
branches:  trunk
changeset: 325981:2b910648ac9e
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Wed Nov 28 16:42:44 2018 +0000

description:
Sort rc.conf defaults to match the order in which they're used.

diffstat:

 mail/qmail-run/files/qmailofmipd.sh |  12 ++++++------
 mail/qmail-run/files/qmailpop3d.sh  |  12 ++++++------
 mail/qmail-run/files/qmailqread.sh  |   4 ++--
 mail/qmail-run/files/qmailsmtpd.sh  |   8 ++++----
 4 files changed, 18 insertions(+), 18 deletions(-)

diffs (116 lines):

diff -r d893a18eac12 -r 2b910648ac9e mail/qmail-run/files/qmailofmipd.sh
--- a/mail/qmail-run/files/qmailofmipd.sh       Wed Nov 28 16:24:54 2018 +0000
+++ b/mail/qmail-run/files/qmailofmipd.sh       Wed Nov 28 16:42:44 2018 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailofmipd.sh,v 1.17 2018/11/28 16:22:41 schmonz Exp $
+# $NetBSD: qmailofmipd.sh,v 1.18 2018/11/28 16:42:44 schmonz Exp $
 #
 # @PKGNAME@ script to control ofmipd (SMTP submission service).
 #
@@ -12,16 +12,16 @@
 
 # User-settable rc.conf variables and their default values:
 : ${qmailofmipd_postenv:="SSL_UID=$(@ID@ -u @UCSPI_SSL_USER@) SSL_GID=$(@ID@ -g @UCSPI_SSL_GROUP@)"}
+: ${qmailofmipd_datalimit:="360000000"}
+: ${qmailofmipd_pretcpserver:=""}
+: ${qmailofmipd_tcpserver:="@PREFIX@/bin/sslserver"}
 : ${qmailofmipd_tcpflags:="-ne -vRl0"}
 : ${qmailofmipd_tcphost:="0.0.0.0"}
 : ${qmailofmipd_tcpport:="587"}
-: ${qmailofmipd_datalimit:="360000000"}
-: ${qmailofmipd_pretcpserver:=""}
-: ${qmailofmipd_tcpserver:="@PREFIX@/bin/sslserver"}
+: ${qmailofmipd_precheckpassword:="@PREFIX@/bin/reup -t 5 @PREFIX@/bin/authup smtp"}
+: ${qmailofmipd_checkpassword:="@PREFIX@/bin/nbcheckpassword"}
 : ${qmailofmipd_preofmipd:="@PREFIX@/bin/checknotroot @PREFIX@/bin/fixsmtpio"}
 : ${qmailofmipd_ofmipdcmd:="@PREFIX@/bin/ofmipd-with-user-cdb"}
-: ${qmailofmipd_precheckpassword:="@PREFIX@/bin/reup -t 5 @PREFIX@/bin/authup smtp"}
-: ${qmailofmipd_checkpassword:="@PREFIX@/bin/nbcheckpassword"}
 : ${qmailofmipd_postofmipd:=""}
 : ${qmailofmipd_log:="YES"}
 : ${qmailofmipd_logcmd:="logger -t nbqmail/ofmipd -p mail.info"}
diff -r d893a18eac12 -r 2b910648ac9e mail/qmail-run/files/qmailpop3d.sh
--- a/mail/qmail-run/files/qmailpop3d.sh        Wed Nov 28 16:24:54 2018 +0000
+++ b/mail/qmail-run/files/qmailpop3d.sh        Wed Nov 28 16:42:44 2018 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailpop3d.sh,v 1.25 2018/11/28 16:22:41 schmonz Exp $
+# $NetBSD: qmailpop3d.sh,v 1.26 2018/11/28 16:42:44 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs).
 #
@@ -11,16 +11,16 @@
 
 # User-settable rc.conf variables and their default values:
 : ${qmailpop3d_postenv:="SSL_UID=$(@ID@ -u @UCSPI_SSL_USER@) SSL_GID=$(@ID@ -g @UCSPI_SSL_GROUP@)"}
+: ${qmailpop3d_datalimit:="180000000"}
+: ${qmailpop3d_pretcpserver:=""}
+: ${qmailpop3d_tcpserver:="@PREFIX@/bin/sslserver"}
 : ${qmailpop3d_tcpflags:="-ne -vRl0"}
 : ${qmailpop3d_tcphost:="0.0.0.0"}
 : ${qmailpop3d_tcpport:="110"}
-: ${qmailpop3d_datalimit:="180000000"}
-: ${qmailpop3d_pretcpserver:=""}
-: ${qmailpop3d_tcpserver:="@PREFIX@/bin/sslserver"}
+: ${qmailpop3d_precheckpassword:="@PREFIX@/bin/authup pop3"}
+: ${qmailpop3d_checkpassword:="@PREFIX@/bin/nbcheckpassword"}
 : ${qmailpop3d_prepop3d:="@PREFIX@/bin/checknotroot"}
 : ${qmailpop3d_pop3dcmd:="@PREFIX@/bin/qmail-pop3d"}
-: ${qmailpop3d_precheckpassword:="@PREFIX@/bin/authup pop3"}
-: ${qmailpop3d_checkpassword:="@PREFIX@/bin/nbcheckpassword"}
 : ${qmailpop3d_postpop3d:="Maildir"}
 : ${qmailpop3d_log:="YES"}
 : ${qmailpop3d_logcmd:="logger -t nbqmail/pop3d -p mail.info"}
diff -r d893a18eac12 -r 2b910648ac9e mail/qmail-run/files/qmailqread.sh
--- a/mail/qmail-run/files/qmailqread.sh        Wed Nov 28 16:24:54 2018 +0000
+++ b/mail/qmail-run/files/qmailqread.sh        Wed Nov 28 16:42:44 2018 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailqread.sh,v 1.15 2018/11/03 17:08:26 schmonz Exp $
+# $NetBSD: qmailqread.sh,v 1.16 2018/11/28 16:42:44 schmonz Exp $
 #
 # @PKGNAME@ script to control a service providing local non-root
 # users access to see the queue. Adapted from a script by Steinar Haug.
@@ -13,10 +13,10 @@
 
 # User-settable rc.conf variables and their default values:
 : ${qmailqread_postenv:=""}
+: ${qmailqread_tcpserver:="@PREFIX@/bin/tcpserver"}
 : ${qmailqread_tcpflags:="-R1"}
 : ${qmailqread_tcphost:="127.0.0.1"}
 : ${qmailqread_tcpport:="20025"}
-: ${qmailqread_tcpserver:="@PREFIX@/bin/tcpserver"}
 : ${qmailqread_log:="YES"}
 : ${qmailqread_logcmd:="logger -t nbqmail/qread -p mail.info"}
 : ${qmailqread_nologcmd:="@PREFIX@/bin/multilog -*"}
diff -r d893a18eac12 -r 2b910648ac9e mail/qmail-run/files/qmailsmtpd.sh
--- a/mail/qmail-run/files/qmailsmtpd.sh        Wed Nov 28 16:24:54 2018 +0000
+++ b/mail/qmail-run/files/qmailsmtpd.sh        Wed Nov 28 16:42:44 2018 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailsmtpd.sh,v 1.22 2018/11/28 16:22:41 schmonz Exp $
+# $NetBSD: qmailsmtpd.sh,v 1.23 2018/11/28 16:42:44 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-smtpd (SMTP service).
 #
@@ -12,12 +12,12 @@
 
 # User-settable rc.conf variables and their default values:
 : ${qmailsmtpd_postenv:="SSL_UID=$(@ID@ -u @UCSPI_SSL_USER@) SSL_GID=$(@ID@ -g @UCSPI_SSL_GROUP@)"}
+: ${qmailsmtpd_datalimit:="540000000"}
+: ${qmailsmtpd_pretcpserver:=""}
+: ${qmailsmtpd_tcpserver:="@PREFIX@/bin/sslserver"}
 : ${qmailsmtpd_tcpflags:="-ne -vRl0"}
 : ${qmailsmtpd_tcphost:="0.0.0.0"}
 : ${qmailsmtpd_tcpport:="25"}
-: ${qmailsmtpd_datalimit:="540000000"}
-: ${qmailsmtpd_pretcpserver:=""}
-: ${qmailsmtpd_tcpserver:="@PREFIX@/bin/sslserver"}
 : ${qmailsmtpd_presmtpd:="@PREFIX@/bin/greetdelay @PREFIX@/bin/rblsmtpd -r zen.spamhaus.org @PREFIX@/bin/fixsmtpio"}
 : ${qmailsmtpd_smtpdcmd:="@PREFIX@/bin/qmail-smtpd"}
 : ${qmailsmtpd_postsmtpd:=""}