From af77235f61441a21cef34c07d593f56555a4c6f5 Mon Sep 17 00:00:00 2001
From: sean <sean>
Date: Fri, 12 Jul 2019 18:25:16 -0700
Subject: [PATCH] tweaks

---
 setup.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/setup.sh b/setup.sh
index 1041972..3e47171 100644
--- a/setup.sh
+++ b/setup.sh
@@ -244,9 +244,9 @@ echo "echo \"Installing linux image, bash, screen, tmux, zfs, vim, sharutils, do
 # preconfigure postfix for no configuration
 #echo "debconf-set-selections <<< \"postfix postfix/main_mailer_type string 'No configuration'\"" >> /mnt/setup-chroot.sh
 #echo "debconf-set-selections <<< \"postfix postfix/mailname string $hostname\"" >> /mnt/setup-chroot.sh
-#echo "errors=\$(apt install -y --no-install-recommends linux-image-generic 2>&1 1>/dev/null && apt install -y vim bash screen tmux zfs-initramfs dosfstools openssh-server ufw mailutils docker.io sharutils 2>&1 1>/dev/null)" >> /mnt/setup-chroot.sh
+echo "errors=\$(DEBCONF_FRONTEND='noninteractive' apt install -y --no-install-recommends linux-image-generic 2>&1 1>/dev/null && DEBCONF_FRONTEND='noninteractive' apt install -y vim bash screen tmux zfs-initramfs dosfstools openssh-server ufw sendmail mailutils docker.io sharutils 2>&1 1>/dev/null)" >> /mnt/setup-chroot.sh
 
-echo "DEBCONF_FRONTEND='noninteractive' apt install -y --no-install-recommends linux-image-generic && apt install -y vim bash screen tmux zfs-initramfs dosfstools openssh-server ufw sendmail mailutils docker.io sharutils" >> /mnt/setup-chroot.sh
+#echo "DEBCONF_FRONTEND='noninteractive' apt install -y --no-install-recommends linux-image-generic && apt install -y vim bash screen tmux zfs-initramfs dosfstools openssh-server ufw sendmail mailutils docker.io sharutils" >> /mnt/setup-chroot.sh
 
 echo 'if ! [ "$?" = "0" ]; then '>> /mnt/setup-chroot.sh
 echo '	echo "Failed to install preliminary software - $errors"' >> /mnt/setup-chroot.sh
@@ -391,11 +391,18 @@ echo 'echo "Done."'>> /mnt/setup-chroot.sh
 echo "mkdir \"/home/${admin}/.ssh\"" >> /mnt/setup-chroot.sh
 echo "ssh-keygen -b 4096 -t rsa -q -f \"/home/${admin}/.ssh/id_rsa.pub\" -N '$rootpassword'" >> /mnt/setup-chroot.sh
 #echo "chmod 600 \"/home/${admin}/.ssh/id_rsa\"" >> /mnt/setup-chroot.sh
-echo "chown -R ${admin}:${admin} \"/home/${admin}\"" >> /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 "systemctl enable sendmail" >> /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
 echo "service sendmail start" >> /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
 # uuencode test.csv test.csv | mail -v -s "Subject test" -r no-reply@mydomain.co.uk recepient@mydomain.co.uk