Addition of postfix_flags variable to rc.subr startup script.

This variable is passed to postfix-script on startup, allowing
administrators to do things like postfix_flags="-c /my/place/postfix"
(alternate location of main.cf and master.cf), or postfix_flags="-v"
(for verbose logging).  See postfix(1) manpage for flags.

PR:		ports/109137
Reviewed by:	Vivek Khera <vivek@khera.org>
Approved by:	philip

8 files changed, 40 insertions, 16 deletions

diff --git a/mail/postfix-current/files/postfix.sh.in b/mail/postfix-current/files/postfix.sh.in
index f2326b56c11b..7f7e7eaf46f9 100644
--- a/mail/postfix-current/files/postfix.sh.in
+++ b/mail/postfix-current/files/postfix.sh.in
@@ -14,6 +14,8 @@
 # postfix_procname (command):	Set command that start master. Used to verify if
 #				postfix is running.
 #				Default is "%%PREFIX%%/libexec/postfix/master".
+# postfix_flags (str):		Flags passed to postfix-script on startup.
+#				Default is "".
 #
 
 . %%RC_SUBR%%
@@ -26,6 +28,7 @@ load_rc_config $name
 : ${postfix_enable="NO"}
 : ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
 : ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
+: ${postfix_flags=""}
 
 start_cmd=${name}_start
 stop_cmd=${name}_stop
@@ -35,11 +38,11 @@ pidfile=${postfix_pidfile}
 procname=${postfix_procname}
 
 postfix_start() {
-	%%PREFIX%%/sbin/postfix start
+	%%PREFIX%%/sbin/postfix ${postfix_flags} start
 }
 
 postfix_stop() {
-	%%PREFIX%%/sbin/postfix stop
+	%%PREFIX%%/sbin/postfix ${postfix_flags} stop
 }
 
 run_rc_command "$1"
diff --git a/mail/postfix/files/postfix.sh.in b/mail/postfix/files/postfix.sh.in
index f2326b56c11b..7f7e7eaf46f9 100644
--- a/mail/postfix/files/postfix.sh.in
+++ b/mail/postfix/files/postfix.sh.in
@@ -14,6 +14,8 @@
 # postfix_procname (command):	Set command that start master. Used to verify if
 #				postfix is running.
 #				Default is "%%PREFIX%%/libexec/postfix/master".
+# postfix_flags (str):		Flags passed to postfix-script on startup.
+#				Default is "".
 #
 
 . %%RC_SUBR%%
@@ -26,6 +28,7 @@ load_rc_config $name
 : ${postfix_enable="NO"}
 : ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
 : ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
+: ${postfix_flags=""}
 
 start_cmd=${name}_start
 stop_cmd=${name}_stop
@@ -35,11 +38,11 @@ pidfile=${postfix_pidfile}
 procname=${postfix_procname}
 
 postfix_start() {
-	%%PREFIX%%/sbin/postfix start
+	%%PREFIX%%/sbin/postfix ${postfix_flags} start
 }
 
 postfix_stop() {
-	%%PREFIX%%/sbin/postfix stop
+	%%PREFIX%%/sbin/postfix ${postfix_flags} stop
 }
 
 run_rc_command "$1"
diff --git a/mail/postfix23/files/postfix.sh.in b/mail/postfix23/files/postfix.sh.in
index f2326b56c11b..7f7e7eaf46f9 100644
--- a/mail/postfix23/files/postfix.sh.in
+++ b/mail/postfix23/files/postfix.sh.in
@@ -14,6 +14,8 @@
 # postfix_procname (command):	Set command that start master. Used to verify if
 #				postfix is running.
 #				Default is "%%PREFIX%%/libexec/postfix/master".
+# postfix_flags (str):		Flags passed to postfix-script on startup.
+#				Default is "".
 #
 
 . %%RC_SUBR%%
@@ -26,6 +28,7 @@ load_rc_config $name
 : ${postfix_enable="NO"}
 : ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
 : ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
+: ${postfix_flags=""}
 
 start_cmd=${name}_start
 stop_cmd=${name}_stop
@@ -35,11 +38,11 @@ pidfile=${postfix_pidfile}
 procname=${postfix_procname}
 
 postfix_start() {
-	%%PREFIX%%/sbin/postfix start
+	%%PREFIX%%/sbin/postfix ${postfix_flags} start
 }
 
 postfix_stop() {
-	%%PREFIX%%/sbin/postfix stop
+	%%PREFIX%%/sbin/postfix ${postfix_flags} stop
 }
 
 run_rc_command "$1"
diff --git a/mail/postfix24/files/postfix.sh.in b/mail/postfix24/files/postfix.sh.in
index f2326b56c11b..7f7e7eaf46f9 100644
--- a/mail/postfix24/files/postfix.sh.in
+++ b/mail/postfix24/files/postfix.sh.in
@@ -14,6 +14,8 @@
 # postfix_procname (command):	Set command that start master. Used to verify if
 #				postfix is running.
 #				Default is "%%PREFIX%%/libexec/postfix/master".
+# postfix_flags (str):		Flags passed to postfix-script on startup.
+#				Default is "".
 #
 
 . %%RC_SUBR%%
@@ -26,6 +28,7 @@ load_rc_config $name
 : ${postfix_enable="NO"}
 : ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
 : ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
+: ${postfix_flags=""}
 
 start_cmd=${name}_start
 stop_cmd=${name}_stop
@@ -35,11 +38,11 @@ pidfile=${postfix_pidfile}
 procname=${postfix_procname}
 
 postfix_start() {
-	%%PREFIX%%/sbin/postfix start
+	%%PREFIX%%/sbin/postfix ${postfix_flags} start
 }
 
 postfix_stop() {
-	%%PREFIX%%/sbin/postfix stop
+	%%PREFIX%%/sbin/postfix ${postfix_flags} stop
 }
 
 run_rc_command "$1"
diff --git a/mail/postfix25/files/postfix.sh.in b/mail/postfix25/files/postfix.sh.in
index f2326b56c11b..7f7e7eaf46f9 100644
--- a/mail/postfix25/files/postfix.sh.in
+++ b/mail/postfix25/files/postfix.sh.in
@@ -14,6 +14,8 @@
 # postfix_procname (command):	Set command that start master. Used to verify if
 #				postfix is running.
 #				Default is "%%PREFIX%%/libexec/postfix/master".
+# postfix_flags (str):		Flags passed to postfix-script on startup.
+#				Default is "".
 #
 
 . %%RC_SUBR%%
@@ -26,6 +28,7 @@ load_rc_config $name
 : ${postfix_enable="NO"}
 : ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
 : ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
+: ${postfix_flags=""}
 
 start_cmd=${name}_start
 stop_cmd=${name}_stop
@@ -35,11 +38,11 @@ pidfile=${postfix_pidfile}
 procname=${postfix_procname}
 
 postfix_start() {
-	%%PREFIX%%/sbin/postfix start
+	%%PREFIX%%/sbin/postfix ${postfix_flags} start
 }
 
 postfix_stop() {
-	%%PREFIX%%/sbin/postfix stop
+	%%PREFIX%%/sbin/postfix ${postfix_flags} stop
 }
 
 run_rc_command "$1"
diff --git a/mail/postfix26/files/postfix.sh.in b/mail/postfix26/files/postfix.sh.in
index f2326b56c11b..7f7e7eaf46f9 100644
--- a/mail/postfix26/files/postfix.sh.in
+++ b/mail/postfix26/files/postfix.sh.in
@@ -14,6 +14,8 @@
 # postfix_procname (command):	Set command that start master. Used to verify if
 #				postfix is running.
 #				Default is "%%PREFIX%%/libexec/postfix/master".
+# postfix_flags (str):		Flags passed to postfix-script on startup.
+#				Default is "".
 #
 
 . %%RC_SUBR%%
@@ -26,6 +28,7 @@ load_rc_config $name
 : ${postfix_enable="NO"}
 : ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
 : ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
+: ${postfix_flags=""}
 
 start_cmd=${name}_start
 stop_cmd=${name}_stop
@@ -35,11 +38,11 @@ pidfile=${postfix_pidfile}
 procname=${postfix_procname}
 
 postfix_start() {
-	%%PREFIX%%/sbin/postfix start
+	%%PREFIX%%/sbin/postfix ${postfix_flags} start
 }
 
 postfix_stop() {
-	%%PREFIX%%/sbin/postfix stop
+	%%PREFIX%%/sbin/postfix ${postfix_flags} stop
 }
 
 run_rc_command "$1"
diff --git a/mail/postfix27/files/postfix.sh.in b/mail/postfix27/files/postfix.sh.in
index f2326b56c11b..7f7e7eaf46f9 100644
--- a/mail/postfix27/files/postfix.sh.in
+++ b/mail/postfix27/files/postfix.sh.in
@@ -14,6 +14,8 @@
 # postfix_procname (command):	Set command that start master. Used to verify if
 #				postfix is running.
 #				Default is "%%PREFIX%%/libexec/postfix/master".
+# postfix_flags (str):		Flags passed to postfix-script on startup.
+#				Default is "".
 #
 
 . %%RC_SUBR%%
@@ -26,6 +28,7 @@ load_rc_config $name
 : ${postfix_enable="NO"}
 : ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
 : ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
+: ${postfix_flags=""}
 
 start_cmd=${name}_start
 stop_cmd=${name}_stop
@@ -35,11 +38,11 @@ pidfile=${postfix_pidfile}
 procname=${postfix_procname}
 
 postfix_start() {
-	%%PREFIX%%/sbin/postfix start
+	%%PREFIX%%/sbin/postfix ${postfix_flags} start
 }
 
 postfix_stop() {
-	%%PREFIX%%/sbin/postfix stop
+	%%PREFIX%%/sbin/postfix ${postfix_flags} stop
 }
 
 run_rc_command "$1"
diff --git a/mail/postfix28/files/postfix.sh.in b/mail/postfix28/files/postfix.sh.in
index f2326b56c11b..7f7e7eaf46f9 100644
--- a/mail/postfix28/files/postfix.sh.in
+++ b/mail/postfix28/files/postfix.sh.in
@@ -14,6 +14,8 @@
 # postfix_procname (command):	Set command that start master. Used to verify if
 #				postfix is running.
 #				Default is "%%PREFIX%%/libexec/postfix/master".
+# postfix_flags (str):		Flags passed to postfix-script on startup.
+#				Default is "".
 #
 
 . %%RC_SUBR%%
@@ -26,6 +28,7 @@ load_rc_config $name
 : ${postfix_enable="NO"}
 : ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
 : ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
+: ${postfix_flags=""}
 
 start_cmd=${name}_start
 stop_cmd=${name}_stop
@@ -35,11 +38,11 @@ pidfile=${postfix_pidfile}
 procname=${postfix_procname}
 
 postfix_start() {
-	%%PREFIX%%/sbin/postfix start
+	%%PREFIX%%/sbin/postfix ${postfix_flags} start
 }
 
 postfix_stop() {
-	%%PREFIX%%/sbin/postfix stop
+	%%PREFIX%%/sbin/postfix ${postfix_flags} stop
 }
 
 run_rc_command "$1"