From 28591326abd60d882f367471ea038eac75be3511 Mon Sep 17 00:00:00 2001
From: sbennell <stewart@bennell.me>
Date: Thu, 28 May 2020 17:04:08 +1000
Subject: [PATCH] DIsable Mail For Now

---
 patch.sh | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/patch.sh b/patch.sh
index 8faf36b..4741e4e 100644
--- a/patch.sh
+++ b/patch.sh
@@ -3,8 +3,8 @@
 echo "- Apt Update and upgrade system..."
 apt update
 apt upgrade -y
-echo "- Install ifupdown2..."
-apt install ifupdown2 -y
+echo "- Install Packages."
+apt install ifupdown2 postfix sasl2-bin mailutils libsasl2-modules -y
 
 mkdir -p /usr/share/pve-patch/{images,scripts}
 echo "- patch `pveversion`..."
@@ -26,20 +26,19 @@ touch ~/.ssh/authorized_keys
 echo ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAkXk0+tC1ZMiWgTQvE/GeB9+TuPWTf8mr9zVOYdNhF+KFXxc/DjMjIPNCAUxtQErlush1GF87b7gaEIC2F5p/+xr39gnt5panjT2AJmVQm9GrSc0LwZOHducgB9SeW7F6A2hA0dtEDxOPHC88ipT9qvTZdeC+mgoNmyIAIMmnPVcZOqQm7iVUf3kJCRWVGI/csE1UYpZ1tLpkaNqjP0Iy7cQvNgodJWh8Mg//TD6ESKBQ35P3+6zT2zEpIK/hQ5eaW5Uu82kSt1ZGuNaPukfCra0cjWr2n4hC+C3E9m3K/3ZV43usaxwSbPa6R/jJE4fyqpC2hqdTKW8Z66mVTC8EpQ== Bennell IT >> ~/.ssh/authorized_keys
 chmod -R go= ~/.ssh
 
-echo "- Seting up smtp for email alerts"
-apt install postfix sasl2-bin mailutils -y
-apt install libsasl2-modules -y
-rm -f /etc/postfix/{mailtest.txt,main.cf,sasl_passwd,sender_canonical}
-wget -nc -P /etc/postfix/ https://raw.githubusercontent.com/sbennell/pve-patch/master/mail/mailtest.txt
-wget -nc -P /etc/postfix/ https://raw.githubusercontent.com/sbennell/pve-patch/master/mail/main.cf
-wget --user=bennellit --ask-password -P /etc/postfix/ https://bennellit.com.au/Files/noaccess/{sasl_passwd,sender_canonical}
-postmap hash:/etc/postfix/sasl_passwd
-postmap hash:/etc/postfix/sender_canonical
-chown root:root /etc/postfix/sasl_passwd /etc/postfix/sasl_passwd.db  
-chmod 644 /etc/postfix/sasl_passwd /etc/postfix/sasl_passwd.db  
-chown root:root /etc/postfix/sender_canonical /etc/postfix/sender_canonical.db  
-chmod 644 /etc/postfix/sender_canonical /etc/postfix/sender_canonical.db
-service postfix restart
-sendmail -v server@lab-network.xyz < /etc/postfix/mailtest.txt
+#echo "- Seting up smtp for email alerts"
 
-echo "- done!"
+#rm -f /etc/postfix/{mailtest.txt,main.cf,sasl_passwd,sender_canonical}
+#wget -nc -P /etc/postfix/ https://raw.githubusercontent.com/sbennell/pve-patch/master/mail/mailtest.txt
+#wget -nc -P /etc/postfix/ https://raw.githubusercontent.com/sbennell/pve-patch/master/mail/main.cf
+#wget --user=bennellit --ask-password -P /etc/postfix/ https://bennellit.com.au/Files/noaccess/{sasl_passwd,sender_canonical}
+#postmap hash:/etc/postfix/sasl_passwd
+#postmap hash:/etc/postfix/sender_canonical
+#chown root:root /etc/postfix/sasl_passwd /etc/postfix/sasl_passwd.db  
+#chmod 644 /etc/postfix/sasl_passwd /etc/postfix/sasl_passwd.db  
+#chown root:root /etc/postfix/sender_canonical /etc/postfix/sender_canonical.db  
+#chmod 644 /etc/postfix/sender_canonical /etc/postfix/sender_canonical.db
+#service postfix restart
+#sendmail -v server@lab-network.xyz < /etc/postfix/mailtest.txt
+
+echo "- done!"
\ No newline at end of file