punkfairie/install.fairie
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated postfix

Browse source
This commit is contained in:
Brian Zalewski 2024-05-13 03:03:40 +00:00
parent 866ce1a4fd
commit f01f38d145
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
home/dot_local/bin/post-installx/executable_post-postfix.sh
View file

@ -99,7 +99,13 @@ if [ -n "$SENDGRID_API_KEY" ] && [ "$SENDGRID_API_KEY" != "" ]; then
fi fi
### Re-generate the /etc/aliases.db file ### Re-generate the /etc/aliases.db file
if [ -f /etc/aliases ]; then if [ -f /etc/aliases ]; then
if command -v gstat > /dev/null; then
logg info 'Ensuring proper permissions on the /etc/aliases file' && sudo chown $(gstat -c "%U:%G" /etc/sudoers) /etc/aliases
elif command -v stat > /dev/null; then
logg info 'Ensuring proper permissions on the /etc/aliases file' && sudo chown $(stat -c "%U:%G" /etc/sudoers) /etc/aliases logg info 'Ensuring proper permissions on the /etc/aliases file' && sudo chown $(stat -c "%U:%G" /etc/sudoers) /etc/aliases
else
logg info 'Neither the gstat or stat command are available - cannot run sudo chown $(stat/gstat -c "%U:%G" /etc/sudoers) /etc/aliases'
fi
logg info 'Generating Postfix aliases' && sudo postalias /etc/aliases > /dev/null logg info 'Generating Postfix aliases' && sudo postalias /etc/aliases > /dev/null
else else
logg warn '/etc/aliases is missing which is required for Postfix' logg warn '/etc/aliases is missing which is required for Postfix'
@ -116,7 +122,11 @@ if [ -n "$SENDGRID_API_KEY" ] && [ "$SENDGRID_API_KEY" != "" ]; then
if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/postfix/com.apple.postfix.master.plist" ] && ! sudo launchctl list | grep 'postfix.master' > /dev/null; then if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/postfix/com.apple.postfix.master.plist" ] && ! sudo launchctl list | grep 'postfix.master' > /dev/null; then
logg info 'Copying com.apple.postfix.master.plist' logg info 'Copying com.apple.postfix.master.plist'
sudo cp -f "${XDG_CONFIG_HOME:-$HOME/.config}/postfix/com.apple.postfix.master.plist" /System/Library/LaunchDaemons/com.apple.postfix.master.plist sudo cp -f "${XDG_CONFIG_HOME:-$HOME/.config}/postfix/com.apple.postfix.master.plist" /System/Library/LaunchDaemons/com.apple.postfix.master.plist
sudo launchctl load /System/Library/LaunchDaemons/com.apple.postfix.master.plist && logg success 'launchctl load of com.apple.postfix.master successful' if sudo launchctl list | grep 'com.apple.postfix.master' > /dev/null; then
logg info 'Unloading previous Postfix launch configuration'
sudo launchctl unload /System/Library/LaunchDaemons/com.apple.postfix.master.plist
fi
sudo launchctl load -w /System/Library/LaunchDaemons/com.apple.postfix.master.plist && logg success 'launchctl load of com.apple.postfix.master successful'
fi fi
if ! sudo postfix status > /dev/null; then if ! sudo postfix status > /dev/null; then
logg info 'Starting postfix' logg info 'Starting postfix'
@ -137,4 +147,6 @@ if [ -n "$SENDGRID_API_KEY" ] && [ "$SENDGRID_API_KEY" != "" ]; then
else else
logg info 'Skipping Postfix configuration because Postfix is not installed' logg info 'Skipping Postfix configuration because Postfix is not installed'
fi fi
else
logg info 'SENDGRID_API_KEY is undefined so skipping Postfix configuration'
fi fi

2
home/dot_local/etc/cloudflared/config.yml.tmpl
View file

@ -19,7 +19,7 @@ ingress:
- hostname: rdp.{{ $baseDomain }} - hostname: rdp.{{ $baseDomain }}
service: rdp://localhost:3389 service: rdp://localhost:3389
- hostname: samba.{{ $baseDomain }} - hostname: samba.{{ $baseDomain }}
service: localhost:8445 service: tcp://localhost:8445
- hostname: sftp.{{ $baseDomain }} - hostname: sftp.{{ $baseDomain }}
service: tcp://localhost:2022 service: tcp://localhost:2022
- hostname: sftpgo.{{ $baseDomain }} - hostname: sftpgo.{{ $baseDomain }}