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

Mod:Postfix Updated Config.sh

Browse Source 
fixed mkdir, various typos and existing CMS/site detection
This commit is contained in:
Bram Prieshof
2021-02-05 17:12:34 +01:00
parent 7e6be6bf72
commit 2988258ffd
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SubModules/postfix/conf.sh
View File

@@ -37,10 +37,9 @@ EOF
##--------------## ##--------------##
adduser postfix opendkim adduser postfix opendkim
mkdir /etc/opendkim/keys mkdir -p /etc/opendkim/keys
chown opendkim:opendkim /etc/opendkim/keys -R chown opendkim:opendkim /etc/opendkim/keys -R
curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/config/opendkim.conf -o /etc/opendkim.conf curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/postfix/config/opendkim.conf -o /etc/opendkim.conf
dkimname sed 's/\..*$//' <<< "$url"
cat <<EOF > /etc/opendkim/TrustedHosts cat <<EOF > /etc/opendkim/TrustedHosts
127.0.0.1 127.0.0.1
::1 ::1
@@ -60,7 +59,7 @@ if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist
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/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/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/keys/"$hostname"/"$odksec".private" >> /etc/opendkim/KeyTable
@@ -84,8 +83,9 @@ systemctl start postfix opendkim
systemctl enable postfix opendkim systemctl enable postfix opendkim
#if using Append module run for existing cms/sites #if using Append module run for existing cms/sites
if [ -z "${postfixappended}" ]; then if [ ! -z "${postfixappended}" ]; then
for sitename in /etc/ICTM/sites/*; do for file in /etc/ICTM/sites/*; do
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/appendCMS-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/appendCMS-conf.sh)