home
·
contact
·
privacy
projects
/
config
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2df2a31
)
Fix issues with OpenDKIM script.
author
Christian Heller
<c.heller@plomlompom.de>
Fri, 9 Oct 2015 04:18:57 +0000
(06:18 +0200)
committer
Christian Heller
<c.heller@plomlompom.de>
Fri, 9 Oct 2015 04:18:57 +0000
(06:18 +0200)
setup_opendkim.sh
patch
|
blob
|
history
diff --git
a/setup_opendkim.sh
b/setup_opendkim.sh
index 6d9749beea2f469363d8a8f250e3f0803e392aa2..cee5ce805a653cdc0dca2e2bd110506620cf1774 100755
(executable)
--- a/
setup_opendkim.sh
+++ b/
setup_opendkim.sh
@@
-4,7
+4,7
@@
set -e
selector=$1
file=$2
selector=$1
file=$2
-if [ "$(id -u)" -eq "0" ]; then
+if [
!
"$(id -u)" -eq "0" ]; then
echo "Must be run as root."
exit
fi
echo "Must be run as root."
exit
fi
@@
-18,7
+18,8
@@
fi
sed -r -i 's/^#Selector .*$/Selector '$selector'/' /etc/opendkim.conf
sed -r -i 's/^#Selector .*$/Selector '$selector'/' /etc/opendkim.conf
-if [ ! -f $file ]; then
+mkdir -p /etc/opendkim
+if [ -n $file ] || [ ! -f $file ]; then
opendkim-genkey -d plomlompom.com -s $selector
mv "$selector".private /etc/opendkim/dkim.key
else
opendkim-genkey -d plomlompom.com -s $selector
mv "$selector".private /etc/opendkim/dkim.key
else
@@
-26,7
+27,7
@@
else
fi
cp ~/config/systemfiles/main.cf /etc/postfix/main.cf
fi
cp ~/config/systemfiles/main.cf /etc/postfix/main.cf
-
echo
>> /etc/postfix/main.cf << EOF
+
cat
>> /etc/postfix/main.cf << EOF
# Use opendkim at given port as mail filter.
non_smtpd_milters = inet:localhost:12301
# Use opendkim at given port as mail filter.
non_smtpd_milters = inet:localhost:12301