diff options
Diffstat (limited to 'opendkim-2.4.2-initscript.patch')
| -rw-r--r-- | opendkim-2.4.2-initscript.patch | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/opendkim-2.4.2-initscript.patch b/opendkim-2.4.2-initscript.patch index 5670542..325313f 100644 --- a/opendkim-2.4.2-initscript.patch +++ b/opendkim-2.4.2-initscript.patch @@ -1,5 +1,5 @@ --- opendkim-2.4.2/contrib/init/redhat/opendkim.in 2011-08-05 21:09:35.000000000 -0700 -+++ opendkim-2.4.2p/contrib/init/redhat/opendkim.in 2011-09-19 13:54:19.138499060 -0700 ++++ opendkim-2.4.2p/contrib/init/redhat/opendkim.in 2011-09-22 10:59:20.765451439 -0700 @@ -2,7 +2,7 @@ # # opendkim Start and stop OpenDKIM. @@ -9,7 +9,7 @@ # description: OpenDKIM implements the DomainKeys Identified Mail (DKIM) # service and a milter-based filter application that can plug # in to any milter-aware MTA. -@@ -11,33 +11,66 @@ +@@ -11,33 +11,73 @@ ### BEGIN INIT INFO # Provides: opendkim @@ -24,8 +24,8 @@ -# OpenDKIM startup script v1.3 for RHEL/CentOS/Fedora -# by Steve Jenkins (SteveJenkins.com) - 02-15-2011 -# Based on a script by Andrew Colin Kissa (TopDog) for dkim-milter - 28-05-2009 -+# OpenDKIM startup script v1.5 for RHEL/CentOS/Fedora -+# by Steve Jenkins (SteveJenkins.com) - 09-19-2011 ++# OpenDKIM startup script v1.7 for RHEL/CentOS/Fedora ++# by Steve Jenkins (SteveJenkins.com) - 09-22-2011 +# Based on a script by Andrew Colin Kissa (TopDog) for dkim-milter - 05-28-2009 # - Additional functionality to prevent multiple instances and a reload -# handler by Chris LaJoie - 11-01-2011 @@ -36,6 +36,8 @@ +# - Added support for /etc/sysconfig/opendkim override of default init script +# setup parameters - 09-19-2011 +# - Changed default stop priority - 09-19-2011 ++# - Updated success and warning outputs for default key generation - 09-20-2011 ++# - Changed default key directory ownership and permissions - 09-22-2011 . /etc/rc.d/init.d/functions @@ -64,14 +66,19 @@ + if [ ! -s $DKIM_KEYDIR/$DKIM_SELECTOR.private ]; then + echo -n $"Generating default DKIM keys: " + if [ "x`hostname --domain`" = "x" ]; then -+ echo -n $"Cannot determine host's domain name, skipping default key generation." ++ echo_warning ++ echo ++ echo $"Cannot determine host's domain name, so skipping default key generation." + else + mkdir -p $DKIM_KEYDIR + $KEYGEN -D $DKIM_KEYDIR -s $DKIM_SELECTOR -d `hostname --domain` -+ chown -R opendkim:opendkim $DKIM_KEYDIR ++ chown root:$prog $DKIM_KEYDIR ++ chown $prog:$prog $DKIM_KEYDIR/$DKIM_SELECTOR.{private,txt} + chmod 600 $DKIM_KEYDIR/$DKIM_SELECTOR.private + chmod 644 $DKIM_KEYDIR/$DKIM_SELECTOR.txt -+ echo -n $"Default DKIM keys generated." ++ echo_success ++ echo ++ echo Default DKIM keys for `hostname --domain` created in $DKIM_KEYDIR. + fi + fi +} |