Move most defaults to default file

init/postsrsd.default.in

@@ -17,7 +17,7 @@
 # When postsrsd is installed for the first time, a random secret is generated
 # and stored in /etc/postsrsd.secret. For most installations, that's just fine.
 #
-#SRS_SECRET=@SYSCONF_DIR@/@PROJECT_NAME@.secret
+SRS_SECRET=@SYSCONF_DIR@/@PROJECT_NAME@.secret
 
 # Local ports for TCP list.
 # These ports are used to bind the TCP list for postfix. If you change
@@ -25,11 +25,14 @@
 # are bound to the loopback interface, and should never be exposed on
 # the internet.
 #
-#SRS_FORWARD_PORT=10001
-#SRS_REVERSE_PORT=10002
+SRS_FORWARD_PORT=10001
+SRS_REVERSE_PORT=10002
 
 # Drop root privileges and run as another user after initialization.
 # This is highly recommended as postsrsd handles untrusted input.
 #
-#RUN_AS=nobody
+RUN_AS=nobody
+
+# Jail daemon in chroot environment
+CHROOT=@CHROOT_DIR@
 

init/postsrsd.systemd.in

@@ -4,11 +4,12 @@ After=network.target
 
 [Service]
 Type=simple
-Environment=SRS_DOMAIN=localhost.localdomain SRS_FORWARD_PORT=10001 SRS_REVERSE_PORT=10002 SRS_SECRET=@SYSCONF_DIR@/@PROJECT_NAME@.secret
-Environment=SRS_EXCLUDE_DOMAINS= RUN_AS=nobody CHROOT=@CHROOT_DIR@
-EnvironmentFile=-@CONFIG_DIR@/@PROJECT_NAME@
-ExecStart=@CMAKE_INSTALL_PREFIX@/sbin/@POSTSRSD@ -4 -f${SRS_FORWARD_PORT} -r${SRS_REVERSE_PORT} -d${SRS_DOMAIN} -s${SRS_SECRET} -u${RUN_AS} -c${CHROOT} -X${SRS_EXCLUDE_DOMAINS}
+Environment SRS_DOMAIN=localhost.localdomain
+Environment SRS_EXCLUDE_DOMAINS=
+EnvironmentFile=@CONFIG_DIR@/@PROJECT_NAME@
+ExecStart=@CMAKE_INSTALL_PREFIX@/sbin/@POSTSRSD@ -f${SRS_FORWARD_PORT} -r${SRS_REVERSE_PORT} -d${SRS_DOMAIN} -s${SRS_SECRET} -u${RUN_AS} -c${CHROOT} -X${SRS_EXCLUDE_DOMAINS}
 Restart=always
 
 [Install]
 WantedBy=multi-user.target
+

init/postsrsd.sysv-lsb.in

@@ -29,17 +29,10 @@ test -x $DAEMON || exit 0
 
 # Default configuration
 SRS_DOMAIN=`postconf -h mydomain || true`
-SRS_FORWARD_PORT=10001
-SRS_REVERSE_PORT=10002
-SRS_SECRET=@SYSCONF_DIR@/@PROJECT_NAME@.secret
-RUN_AS=nobody
-CHROOT=@CHROOT_DIR@
+SRS_EXCLUDE_DOMAINS=
 
-# Read config file if it is present.
-if [ -r @CONFIG_DIR@/$NAME ]
-then
-    . @CONFIG_DIR@/$NAME
-fi
+# Read config file
+. @CONFIG_DIR@/$NAME
 
 test -r "$SRS_SECRET" -a -n "$SRS_DOMAIN" || exit 0
 
@@ -51,7 +44,7 @@ case "$1" in
 		--pidfile $PIDFILE \
 		--name $NAME \
 		--startas $DAEMON \
-		-- -4 -f"$SRS_FORWARD_PORT" -r"$SRS_REVERSE_PORT" -d"$SRS_DOMAIN" -s"$SRS_SECRET" -u"$RUN_AS" -p"$PIDFILE" -c"$CHROOT" -X"$SRS_EXCLUDE_DOMAINS" -D
+		-- -f"$SRS_FORWARD_PORT" -r"$SRS_REVERSE_PORT" -d"$SRS_DOMAIN" -s"$SRS_SECRET" -u"$RUN_AS" -p"$PIDFILE" -c"$CHROOT" -X"$SRS_EXCLUDE_DOMAINS" -D
 	then
 	    log_end_msg 0
 	else

init/postsrsd.sysv-redhat.in

@@ -25,24 +25,17 @@ test -x $DAEMON || exit 0
 
 # Default configuration
 SRS_DOMAIN=`postconf -h mydomain || true`
-SRS_FORWARD_PORT=10001
-SRS_REVERSE_PORT=10002
-SRS_SECRET=@SYSCONF_DIR@/@PROJECT_NAME@.secret
-RUN_AS=nobody
-CHROOT=@CHROOT_DIR@
+SRS_EXCLUDE_DOMAINS=
 
-# Read config file if it is present.
-if [ -r @CONFIG_DIR@/$NAME ]
-then
-    . @CONFIG_DIR@/$NAME
-fi
+# Read config file
+. @CONFIG_DIR@/$NAME
 
 test -r "$SRS_SECRET" -a -n "$SRS_DOMAIN" || exit 0
 
 do_start()
 {
 	echo -n "Starting $DESC: "
-	daemon $DAEMON -4 -f"$SRS_FORWARD_PORT" -r"$SRS_REVERSE_PORT" -d"$SRS_DOMAIN" -s"$SRS_SECRET" \
+	daemon $DAEMON -f"$SRS_FORWARD_PORT" -r"$SRS_REVERSE_PORT" -d"$SRS_DOMAIN" -s"$SRS_SECRET" \
 	               -u"$RUN_AS" -p"$PIDFILE" -c"$CHROOT" -X"$SRS_EXCLUDE_DOMAINS" -D
 	RETVAL=$?
 	echo

init/postsrsd.upstart.in

@@ -5,19 +5,10 @@ start on (filesystem and net-device-up)
 stop on runlevel [!2345]
 respawn
 
-env DEFAULTFILE=@CONFIG_DIR@/@PROJECT_NAME@
-
 script
 	SRS_DOMAIN=`postconf -h mydomain || true`
-	SRS_FORWARD_PORT=10001
-	SRS_REVERSE_PORT=10002
-	SRS_SECRET=@SYSCONF_DIR@/@PROJECT_NAME@.secret
 	SRS_EXCLUDE_DOMAINS=
-	RUN_AS=nobody
-	CHROOT=@CHROOT_DIR@
-	if [ -r "$DEFAULTFILE" ]; then
-		. "$DEFAULTFILE"
-	fi
-	exec @CMAKE_INSTALL_PREFIX@/sbin/@POSTSRSD@ -4 -f"$SRS_FORWARD_PORT" -r"$SRS_REVERSE_PORT" -d"$SRS_DOMAIN" -s"$SRS_SECRET" -u"$RUN_AS" -c"$CHROOT" -X"$SRS_EXCLUDE_DOMAINS"
+	. "@CONFIG_DIR@/@PROJECT_NAME@"
+	exec @CMAKE_INSTALL_PREFIX@/sbin/@POSTSRSD@ -f"$SRS_FORWARD_PORT" -r"$SRS_REVERSE_PORT" -d"$SRS_DOMAIN" -s"$SRS_SECRET" -u"$RUN_AS" -c"$CHROOT" -X"$SRS_EXCLUDE_DOMAINS"
 end script