Add support for non-interactive install

Centralize all scripts into 'ehdd'

setup/ehdd/create_hdd.sh

@@ -1,43 +0,0 @@
-#!/bin/bash
-
-source "setup/ehdd/ehdd_funcs.sh" || exit 1
-
-if [ "$1" == "" ]; then
-    echo "usage: $0 <size-in-gb>"
-    echo -n "  hdd image location: $EHDD_IMG"
-    if [ -e "$EHDD_IMG" ]; then echo " (exists!)"; else echo ""; fi
-    exit 1
-elif [ "$1" == "-location" ]; then
-    echo "$EHDD_IMG"
-    exit 0
-elif [ "$1" == "-mountpoint" ]; then
-    echo "$EHDD_MOUNTPOINT"
-    exit 0
-fi
-
-EHDD_SIZE_GB="$1"
-
-
-if [ ! -e "$EHDD_IMG" ]; then
-    echo "Creating ${EHDD_SIZE_GB}G encryped drive: $EHDD_IMG"
-    let count="$EHDD_SIZE_GB * 1024"
-    [ $count -eq 0 ] && echo "Invalid size" && exit 1
-    apt-get -q=2 -y install cryptsetup || exit 1
-    dd if=/dev/zero of="$EHDD_IMG" bs=1M count=$count || exit 1
-    loop=$(find_unused_loop)
-    losetup $loop "$EHDD_IMG" || exit 1
-    if ! cryptsetup luksFormat -i 15000 $loop; then
-        losetup -d $loop
-        rm -f "$EHDD_IMG"
-        exit 1
-    fi
-    echo ""
-    echo "NOTE: You will need to reenter your drive encryption password a number of times"
-    cryptsetup luksOpen $loop $EHDD_LUKS_NAME  # map device to /dev/mapper/NAME
-    mke2fs -j /dev/mapper/$EHDD_LUKS_NAME
-    cryptsetup luksClose $EHDD_LUKS_NAME
-    losetup -d $loop
-else
-    echo "ERROR: $EHDD_IMG already exists!"
-    exit 1
-fi

setup/ehdd/ehdd_funcs.sh

@@ -1,20 +0,0 @@
-
-if [ -s /etc/mailinabox.conf ]; then
-    source /etc/mailinabox.conf
-    [ $? -eq 0 ] || exit 1
-else
-    STORAGE_ROOT="/home/${STORAGE_USER:-user-data}"
-fi
-
-EHDD_IMG="$STORAGE_ROOT.HDD"
-EHDD_MOUNTPOINT="$STORAGE_ROOT"
-EHDD_LUKS_NAME="c1"
-
-
-find_unused_loop() {
-    losetup -f
-}
-
-find_inuse_loop() {
-    losetup -l | awk "\$6 == \"$EHDD_IMG\" { print \$1 }"
-}

setup/ehdd/mount.sh

@@ -1,31 +0,0 @@
-#!/bin/bash
-
-. "setup/ehdd/ehdd_funcs.sh" || exit 1
-
-if [ ! -e "$EHDD_IMG" ]; then
-    echo "Warning: ecrypted HDD not found at $EHDD_IMG, not mounting"
-    exit 0
-fi
-
-if mount | grep "^/dev/mapper/$EHDD_LUKS_NAME on $EHDD_MOUNTPOINT" >/dev/null; then
-    echo "$EHDD_IMG already mounted"
-    exit 0
-fi
-
-loop=$(find_unused_loop)
-losetup $loop "$EHDD_IMG" || exit 1
-# map device to /dev/mapper/NAME
-cryptsetup luksOpen $loop $EHDD_LUKS_NAME
-code=$?
-if [ $code -ne 0 ]; then
-    echo "luksOpen failed ($code) - is $EHDD_IMG luks formatted?"
-    losetup -d $loop
-    exit 1
-fi
-
-if [ ! -e "$EHDD_MOUNTPOINT" ]; then
-   echo "Creating mount point directory: $EHDD_MOUNTPOINT"
-   mkdir -p "$EHDD_MOUNTPOINT" || exit 1
-fi
-mount /dev/mapper/$EHDD_LUKS_NAME "$EHDD_MOUNTPOINT" || exit 1
-echo "Success: mounted $EHDD_MOUNTPOINT"

setup/ehdd/postinstall.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. "setup/ehdd/ehdd_funcs.sh" || exit 1
-
-if [ -e "$EHDD_IMG" ]; then
-    
-    if [ -s /etc/mailinabox.conf ]; then
-        echo ""
-        echo "** Disabling system services **"
-        systemctl disable postfix
-        systemctl disable dovecot
-        systemctl disable cron
-        systemctl disable nginx
-        systemctl disable php7.2-fpm
-        systemctl disable mailinabox
-        systemctl disable fail2ban
-        #systemctl disable nsd
-        [ -x /usr/sbin/slapd ] && systemctl disable slapd
-
-        echo ""
-        echo "IMPORTANT:"
-        echo "    Services have been disabled at startup because the encrypted HDD will"
-        echo "    be unavailable. Run tools/startup.sh after a reboot."
-    fi
-
-fi
-
-# run local modifications
-h=$(hostname --fqdn 2>/dev/null || hostname)
-count=0
-for d in local/mods.sh local/mods-${h}.sh; do
-    if [ -e $d ]; then
-        let count+=1
-        if ! ./$d; then
-            echo "Local modification script $d failed"
-            exit 1
-        fi
-    fi
-done
-
-

setup/ehdd/umount.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-. "setup/ehdd/ehdd_funcs.sh" || exit 1
-
-if ! mount | grep "$EHDD_MOUNTPOINT" >/dev/null; then
-    # not mounted
-    exit 0
-fi
-umount "$EHDD_MOUNTPOINT" || exit 1
-cryptsetup luksClose $EHDD_LUKS_NAME
-losetup -d $(find_inuse_loop)

setup/start-encrypted.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-EHDD_IMG="$(setup/ehdd/create_hdd.sh -location)"
-
-[ -e /etc/mailinabox.conf ] && . /etc/mailinabox.conf
-
-if [ ! -e "$EHDD_IMG" -a ! -z "$STORAGE_ROOT" -a \
-       -e "$STORAGE_ROOT/ssl/ssl_private_key.pem" ]; then
-    
-    echo "System installed without encryption-at-rest"
-
-elif [ ! -e "$EHDD_IMG" ]; then
-    
-    echo "Creating a new encrypted HDD."
-    echo -n "How big should it be? Enter a number in gigabytes: "
-    read gb
-    setup/ehdd/create_hdd.sh "$gb" || exit 1
-    
-fi
-
-
-if setup/ehdd/mount.sh; then
-    setup/start.sh $@
-    if [ $? -eq 0 ]; then
-        setup/ehdd/postinstall.sh || exit 1
-    else
-        echo "setup/start.sh failed"
-    fi
-fi
-