From 102f3507d98a81a552fd26e2eeedfeb8c3a873ba Mon Sep 17 00:00:00 2001
From: sean <sean>
Date: Thu, 18 Jul 2019 13:16:27 -0700
Subject: [PATCH] tweaks

---
 setup.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/setup.sh b/setup.sh
index 5986c03..9785d96 100644
--- a/setup.sh
+++ b/setup.sh
@@ -434,13 +434,11 @@ echo "ssh-keygen -b 4096 -t rsa -q -f \"/home/${admin}/.ssh/id_rsa.pub\" -N '$ro
 #echo "chmod 600 \"/home/${admin}/.ssh/id_rsa\"" >> /mnt/setup-chroot.sh
 echo "chown -R ${admin}:${admin} \"/home/${admin}\"/.ssh" >> /mnt/setup-chroot.sh
 
-echo "mkdir /var/spool/mqueue/ && mkdir /var/spool/mqueue-client/" >> /mnt/setup-chroot.sh
-echo "echo \"admin: ${admins}\" >> /etc/aliases" >> /mnt/setup-chroot.sh
-echo "newaliases" >> /mnt/setup-chroot.sh
+#echo "mkdir /var/spool/mqueue/ && mkdir /var/spool/mqueue-client/" >> /mnt/setup-chroot.sh
 #echo "systemctl enable #" >> /mnt/setup-chroot.sh
-echo "chown smmsp:smmsp /var/spool/mqueue" >> /mnt/setup-chroot.sh
-echo "chmod g+w /var/spool/mqueue" >> /mnt/setup-chroot.sh
-echo "chown smmsp:smmsp /var/spool/mqueue-client" >> /mnt/setup-chroot.sh
+#echo "chown smmsp:smmsp /var/spool/mqueue" >> /mnt/setup-chroot.sh
+#echo "chmod g+w /var/spool/mqueue" >> /mnt/setup-chroot.sh
+#echo "chown smmsp:smmsp /var/spool/mqueue-client" >> /mnt/setup-chroot.sh
 echo "chmod g+w /var/spool/mqueue-client" >> /mnt/setup-chroot.sh
 echo "HOME=\"/root\"" >> /mnt/setup-chroot.sh
 echo "HOSTNAME=\"$hostname\"" >> /mnt/setup-chroot.sh
@@ -458,6 +456,8 @@ echo "echo \"UseSTARTTLS=YES\" >> /etc/ssmtp/ssmtp.conf" >> /mnt/setup-chroot.sh
 echo "echo \"\"" >> /mnt/setup-chroot.sh
 echo "echo \"Sending SSH key via e-mail...\"" >> /mnt/setup-chroot.sh
 echo "mkdir -p /var/spool/postfix 2>&1 1>/dev/null && chown postfix:postfix /var/spool/postfix 2>&1 1>/dev/null" >> /mnt/setup-chroot.sh
+echo "echo \"admin: ${admins}\" >> /etc/aliases" >> /mnt/setup-chroot.sh
+echo "newaliases" >> /mnt/setup-chroot.sh
 echo "systemctl unmask postfix 2>&1 1>/dev/null && service postfix start 2>&1 1>/dev/null" >> /mnt/setup-chroot.sh
 echo "cat \"/home/${admin}/.ssh/id_rsa.pub\" | mail -s \"$hostname SSH key\" -A \"/home/${admin}/.ssh/id_rsa.pub\" admin" >> /mnt/setup-chroot.sh
 echo "cat /home/parker/.ssh/id_rsa.pub | mail -s \"${fqdn} SSH key\" -A /home/parker/.ssh/id_rsa.pub -r \"${email}\" admin" >> /mnt/setup-chroot.sh