tweaks

setup.sh

@@ -270,12 +270,12 @@ echo "cp /usr/share/zoneinfo/$timezone /etc/localtime" >> /mnt/setup-chroot.sh
 echo "echo \"Done.\"" >> /mnt/setup-chroot.sh
 
 echo "echo \"\"" >> /mnt/setup-chroot.sh
-echo "echo \"Installing linux image, bash, screen, tmux, zfs, vim, sharutils, docker, dnsutils, dosfstools, openssh, bridge-utils, net-utils, ufw...\"" >> /mnt/setup-chroot.sh
+echo "echo \"Installing linux image, bash, screen, tmux, zfs, vim, curl, sharutils, libvirt-bin, docker, dnsutils, dosfstools, openssh, bridge-utils, net-utils, ufw...\"" >> /mnt/setup-chroot.sh
 
 # 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 $fqdn\"" >> /mnt/setup-chroot.sh
-echo "errors=\$(DEBCONF_FRONTEND='noninteractive' apt install -y --no-install-recommends linux-image-generic 2>&1 1>/dev/null && apt purge -y netplan 2>&1 1>/dev/null && apt autoremove -y 2>&1 1>/dev/null && DEBCONF_FRONTEND='noninteractive' apt install -y ifupdown dnsutils vim bridge-utils net-tools bash screen tmux zfs-initramfs dosfstools mailutils ssmtp openssh-server ufw 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 && apt purge -y netplan 2>&1 1>/dev/null && apt autoremove -y 2>&1 1>/dev/null && DEBCONF_FRONTEND='noninteractive' apt install -y ifupdown dnsutils nfs-kernel-server apparmor-profiles vim bridge-utils net-tools bash screen tmux zfs-initramfs dosfstools mailutils ssmtp openssh-server ufw 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
 
@@ -434,11 +434,16 @@ echo "usermod -a -G adm,cdrom,dip,plugdev,sudo -s /bin/bash \"$admin\"" >> /mnt/
 echo "echo '${admin}:${rootpassword}' | chpasswd" >> /mnt/setup-chroot.sh
 echo 'echo "Done."'>> /mnt/setup-chroot.sh
 
+# relax app armor for nfs kernel server
+#echo "aa-complain nfsd" >> /mnt/setup-chroot.sh
+
+
+
 #create swap space, too if necessary
 
 #sendemail -t to@example.com -m "Here is the file." -a attachmentFile
 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 "ssh-keygen -b 4096 -t rsa -q -f \"/home/${admin}/.ssh/id_rsa\" -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}\"/.ssh" >> /mnt/setup-chroot.sh
 
@@ -453,27 +458,10 @@ echo "echo \"AuthPass=${emailpassword}\" >> /etc/ssmtp/ssmtp.conf" >> /mnt/setup
 echo "echo \"mailhub=${smtp}\" >> /etc/ssmtp/ssmtp.conf" >> /mnt/setup-chroot.sh
 echo "echo \"UseSTARTTLS=YES\" >> /etc/ssmtp/ssmtp.conf" >> /mnt/setup-chroot.sh
 
-#echo "mkdir -p /var/spool/mqueue/ && mkdir -p /var/spool/mqueue-client/" >> /mnt/setup-chroot.sh
-#echo "systemctl enable " >> /mnt/setup-chroot.sh
-#echo "chown smmta: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
-
-
-#NCAkaTpIZ8uJ
-
 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/mail.rc" >> /mnt/setup-chroot.sh
-#echo "newaliases" >> /mnt/setup-chroot.sh
-#echo "systemctl unmask sendmail 2>&1 1>/dev/null && service sendmail 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\" ${admins}" >> /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}\" ${admins}" >> /mnt/setup-chroot.sh
-#echo "mailq" >> /mnt/setup-chroot.sh
-#echo "while ! [ \"\$(/usr/bin/mailq)\" = \"mailq: Mail queue is empty\" ]; do echo \"waiting for e-mail to send...\"; sleep 5; done" >> /mnt/setup-chroot.sh
-#echo "service sendmail stop 2>&1 1>/dev/null" >> /mnt/setup-chroot.sh
+if [ "$networktype" = "dhcp" ]; then connection = `hostname -I`; else; connection = "$address"; fi
+echo "(echo \"Server available at $connection\"; cat \"/home/${admin}/.ssh/id_rsa\") | mail -s \"$hostname SSH key\" -A \"/home/${admin}/.ssh/id_rsa\" --content-filename=\"${hostname}.ssh.key\" --content-name=\"${hostname}.ssh.key\" ${admins}" >> /mnt/setup-chroot.sh
 echo "echo \"Done.\"" >> /mnt/setup-chroot.sh
 
 echo "exit 0" >> /mnt/setup-chroot.sh