Work_Archive/VPS-scripts_Web-V2
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases 11 Wiki Activity

Mod:Postfix Fixed incorrect links & dkim conf dir

Browse Source 
Updated location of OpenDKIM config files to default /etc/opendkim.d
from /etc/opendkim
Updated config file to reflect filename hanges in repo
This commit is contained in:
Bram Prieshof
2021-02-05 17:23:40 +01:00
parent 2988258ffd
commit c60b57d41b
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SubModules/postfix/CMSHook-conf.sh
View File

@@ -1,15 +1,15 @@
#ADD DOMAIN #ADD DOMAIN
sudo --user opendkim mkdir /etc/opendkim/keys/"$maildomain" sudo --user opendkim mkdir /etc/opendkim.d/keys/"$maildomain"
sudo --user opendkim opendkim-genkey -r -D /etc/opendkim/keys/"$maildomain" -d "$maildomain" -s vps sudo --user opendkim opendkim-genkey -r -D /etc/opendkim.d/keys/"$maildomain" -d "$maildomain" -s vps
echo "$maildomain" >> /etc/opendkim/TrustedHosts echo "$maildomain" >> /etc/opendkim.d/TrustedHosts
echo "vps._domainkey."$maildomain" "$maildomain":vps:/etc/opendkim/keys/"$maildomain"/vps.private" >> /etc/opendkim/KeyTable echo "vps._domainkey."$maildomain" "$maildomain":vps:/etc/opendkim.d/keys/"$maildomain"/vps.private" >> /etc/opendkim.d/KeyTable
if [ $webserv != nginx_nonphp ]; then if [ $webserv != nginx_nonphp ]; then
echo "php_admin_value[mail.force_extra_parameters] = \"-f$mailas -F'$maildomain'\"" >> "$phpPoolDir"/"$sitename".conf echo "php_admin_value[mail.force_extra_parameters] = \"-f$mailas -F'$maildomain'\"" >> "$phpPoolDir"/"$sitename".conf
fi fi
curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/config/opendkim-init.sh -o ~/OpenDKIMInit-$sitename.sh curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/opendkim-init.sh -o ~/OpenDKIMInit-$sitename.sh
sed -i -e 's/DOMAINname/'$domain'/' 's/SITEName/'$sitename'/' ~/OpenDKIMInit-$sitename.sh sed -i -e 's/DOMAINname/'$domain'/' 's/SITEName/'$sitename'/' ~/OpenDKIMInit-$sitename.sh
cat << EOF > /etc/update-motd.d/51-opendkim-"$sitename" cat << EOF > /etc/update-motd.d/51-opendkim-"$sitename"

25
SubModules/postfix/conf.sh
View File

@@ -37,10 +37,11 @@ EOF
##--------------## ##--------------##
adduser postfix opendkim adduser postfix opendkim
mkdir -p /etc/opendkim/keys rm -rm /etc/opendkim.d
chown opendkim:opendkim /etc/opendkim/keys -R mkdir -p /etc/opendkim.d/keys
curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/config/opendkim.conf -o /etc/opendkim.conf chown opendkim:opendkim /etc/opendkim.d/keys -R
cat <<EOF > /etc/opendkim/TrustedHosts curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/config/opendkim.conf -o /etc/opendkim.d.conf
cat <<EOF > /etc/opendkim.d/TrustedHosts
127.0.0.1 127.0.0.1
::1 ::1
localhost localhost
@@ -54,17 +55,17 @@ if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist
mkdir /var/spool/postfix/opendkim mkdir /var/spool/postfix/opendkim
sudo chown opendkim:postfix /var/spool/postfix/opendkim sudo chown opendkim:postfix /var/spool/postfix/opendkim
sed -i "/^RUNDIR=/c\RUNDIR=/var/spool/postfix/var/run/opendkim" /etc/default/opendkim sed -i "/^RUNDIR=/c\RUNDIR=/var/spool/postfix/var/run/opendkim" /etc/default/opendkim
echo "TrustAnchorFile /usr/share/dns/root.key" >> /etc/opendkim/conf echo "TrustAnchorFile /usr/share/dns/root.key" >> /etc/opendkim.d/conf
bash /lib/opendkim/opendkim.service.generate bash /lib/opendkim/opendkim.service.generate
systemctl daemon-reload systemctl daemon-reload
fi fi
odksec=$(sed 's/\..*$//' <<< $hostname) odksec=$(sed 's/\..*$//' <<< $hostname)
sudo --user opendkim mkdir /etc/opendkim/keys/"$hostname" sudo --user opendkim mkdir /etc/opendkim.d/keys/"$hostname"
sudo --user opendkim opendkim-genkey -r -D /etc/opendkim/keys/"$hostname" -d "$hostname" -s $odksec sudo --user opendkim opendkim-genkey -r -D /etc/opendkim.d/keys/"$hostname" -d "$hostname" -s $odksec
echo ""$odksec"._domainkey."$hostname" "$hostname":"$odksec":/etc/opendkim/keys/"$hostname"/"$odksec".private" >> /etc/opendkim/KeyTable echo ""$odksec"._domainkey."$hostname" "$hostname":"$odksec":/etc/opendkim.d/keys/"$hostname"/"$odksec".private" >> /etc/opendkim.d/KeyTable
curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/config/opendkim-init.sh -o ~/OpenDKIMInit-host.sh curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/opendkim-init.sh -o ~/OpenDKIMInit-host.sh
sed -i -e 's/DOMAINname/'$hostname'/' 's/SITEName/'host'/' 's/vps/'$odksec'/' ~/OpenDKIMInit-host.sh sed -i -e 's/DOMAINname/'$hostname'/' -e 's/SITEName/'host'/' 's/vps/'$odksec'/' ~/OpenDKIMInit-host.sh
unset odksec unset odksec
@@ -87,7 +88,7 @@ if [ ! -z "${postfixappended}" ]; then
for file in /etc/ICTM/sites/*; do for file in /etc/ICTM/sites/*; do
sitename="${file##*/}" sitename="${file##*/}"
domain=${sitename//_/.} domain=${sitename//_/.}
source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/appendCMS-preconf.sh) source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/CMSHook-preconf.sh)
source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/appendCMS-conf.sh) source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/CMSHook-conf.sh)
done done
fi fi

8
SubModules/postfix/config/opendkim.conf
View File

@@ -6,7 +6,7 @@ OversignHeaders From
UserID opendkim UserID opendkim
Canonicalization relaxed/simple Canonicalization relaxed/simple
Mode s Mode s
KeyTable refile:/etc/opendkim/KeyTable KeyTable refile:/etc/opendkim.d/KeyTable
SigningTable refile:/etc/opendkim/SigningTable SigningTable refile:/etc/opendkim.d/SigningTable
ExternalIgnoreList refile:/etc/opendkim/TrustedHosts ExternalIgnoreList refile:/etc/opendkim.d/TrustedHosts
InternalHosts refile:/etc/opendkim/TrustedHosts InternalHosts refile:/etc/opendkim.d/TrustedHosts

4
SubModules/postfix/opendkim-init.sh
View File

@@ -2,7 +2,7 @@ if [ -n "$1" ]; then
if [[ "$1" = "--enable" ]]; then if [[ "$1" = "--enable" ]]; then
echo "Enableing DKIM" echo "Enableing DKIM"
echo "*@DOMAINname vps._domainkey.DOMAINname" >>/etc/opendkim/SigningTable echo "*@DOMAINname vps._domainkey.DOMAINname" >>/etc/opendkim.d/SigningTable
systemctl reload opendkim systemctl reload opendkim
#Remove script #Remove script
while true; do while true; do
@@ -26,7 +26,7 @@ echo "Optional to enable dkim"
echo "ip4:$(curl -s -4 icanhazip.com) ip6:$(curl -s -6 icanhazip.com)" echo "ip4:$(curl -s -4 icanhazip.com) ip6:$(curl -s -6 icanhazip.com)"
echo "Please add the folloing TXT Record to the DNS of DOMAINname" echo "Please add the folloing TXT Record to the DNS of DOMAINname"
echo "WARNING the output is split, please combine key before inserting into DNS" echo "WARNING the output is split, please combine key before inserting into DNS"
cat /etc/opendkim/keys/DOMAINname/vps.txt cat /etc/opendkim.d/keys/DOMAINname/vps.txt
echo "" echo ""
echo "If DNS is propegated then run \"bash $0 --enable\"" echo "If DNS is propegated then run \"bash $0 --enable\""