aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <dev@blino.org>2017-04-10 02:59:06 +0200
committerOlivier Blin <dev@blino.org>2017-04-10 02:59:48 +0200
commitcd619ceb3b7248ca7c40c65581ab0318317a793f (patch)
tree613c00bc91542a88cd6270f4e1172dc9cde22216
parentce148add48f62b9aa8144e2ec40f19909d67ac8d (diff)
downloadpuppet-cd619ceb3b7248ca7c40c65581ab0318317a793f.tar
puppet-cd619ceb3b7248ca7c40c65581ab0318317a793f.tar.gz
puppet-cd619ceb3b7248ca7c40c65581ab0318317a793f.tar.bz2
puppet-cd619ceb3b7248ca7c40c65581ab0318317a793f.tar.xz
puppet-cd619ceb3b7248ca7c40c65581ab0318317a793f.zip
postgrey: make config works for Mga >= 3
postgrey switched to systemd in 1.34-6.mga3 This change is backwards-compatible, since before systemd, the Unix socket path was specfied in the initscript.
-rw-r--r--modules/postgrey/templates/postgrey.sysconfig10
1 files changed, 4 insertions, 6 deletions
diff --git a/modules/postgrey/templates/postgrey.sysconfig b/modules/postgrey/templates/postgrey.sysconfig
index ec4e6947..f08b8f6f 100644
--- a/modules/postgrey/templates/postgrey.sysconfig
+++ b/modules/postgrey/templates/postgrey.sysconfig
@@ -1,12 +1,10 @@
# change default configuration option here
-# SOCKET=$(postconf -h queue_directory)/extern/postgrey/socket
-# OPTIONS="--unix=$SOCKET"
-# DBPATH=/var/lib/postgrey
-# OPTIONS="$OPTIONS --dbdir=$DBPATH"
+# default: unix socket
+SOCKET="--unix=/var/spool/postfix/extern/postgrey/socket"
-# to use an inet connection instead of a socket
-#OPTIONS="--inet=127.0.0.1:10031"
+# to use an inet socket instead
+#SOCKET="--inet=127.0.0.1:10031"
# enable whitelisting
OPTIONS="$OPTIONS --auto-whitelist-clients"