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

Mod:Postfix bugfixes

Browse Source
This commit is contained in:
Bram Prieshof
2021-02-05 20:58:24 +01:00
parent 402a4b68e5
commit 84cda6333f
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,7 @@ fi
curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/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'/g' -e 's/SITEName/'${sitename//_}'/g' ~/OpenDKIMInit-$sitename.sh sed -i -e 's/DOMAINname/'$maildomain'/g' -e 's/SITEName/'${sitename//_}'/g' ~/OpenDKIMInit-$sitename.sh
cat << EOF > /etc/update-motd.d/51-opendkim-"${sitename//_}" cat << EOF > /etc/update-motd.d/51-opendkim-"${sitename//_}"
#!/bin/sh #!/bin/sh

4
SubModules/postfix/CMSHook-preconf.sh
View File

@@ -19,8 +19,8 @@ if [ $IMODE = l ]; then
break;; break;;
[Nn]* ) [Nn]* )
echo 'Enter mail addres for sending mail? ' echo 'Enter mail addres for sending mail? '
read mail read mailas
maildomain=$(sed -e 's/[^@]*@//' <<< "$mail") maildomain=$(sed -e 's/[^@]*@//' <<< "$mailas")
break;; break;;
* )echo "Choose yes or no.";; * )echo "Choose yes or no.";;
esac esac

3
SubModules/postfix/conf.sh
View File

@@ -40,7 +40,8 @@ adduser postfix opendkim
rm -rf /etc/opendkim.d rm -rf /etc/opendkim.d
mkdir -p /etc/opendkim.d/keys mkdir -p /etc/opendkim.d/keys
chown opendkim:opendkim /etc/opendkim.d/keys -R chown opendkim:opendkim /etc/opendkim.d/keys -R
curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/config/opendkim.conf -o /etc/opendkim curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/config/opendkim.conf -o /etc/opendkim.conf
touch /etc/opendkim.d/SigningTable
cat <<EOF > /etc/opendkim.d/TrustedHosts cat <<EOF > /etc/opendkim.d/TrustedHosts
127.0.0.1 127.0.0.1
::1 ::1