merge master

scripts/subinstallers/check_updates.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+sudo apt-get update
+
+UPDATES=$(sudo apt-get dist-upgrade -s --quiet=2 | grep ^Inst | wc -l)
+
+if [[ "$UPDATES" -ne "0" ]]; then
+    echo "Please run updates and reboot before installing Mistborn: sudo apt-get update && sudo apt-get -y dist-upgrade"
+    exit 1;
+fi

scripts/subinstallers/docker.sh

@@ -6,7 +6,18 @@ figlet "Mistborn: Installing Docker"
 sudo apt update
 sudo -E apt install -y python python3-pip python3-setuptools libffi-dev python3-dev libssl-dev
 
-if [ "$DISTRO" == "ubuntu" ] && [ "$VERSION_ID" == "20.04" ]; then
+# Ubuntu version >= 20.04
+
+set +e
+vercomp "$VERSION_ID" "19.10"
+case $? in
+    0) op='=';;
+    1) op='>';;
+    2) op='<';;
+esac
+set -e
+
+if [ "$DISTRO" == "ubuntu" ] && [ "$op" == ">" ]; then
     echo "Automated Docker install"
     sudo -E apt-get install -y docker-compose
 else
@@ -18,3 +29,6 @@ fi
 if [ ! -f /usr/local/bin/docker-compose ]; then
     sudo -E ln -s $(which docker-compose) /usr/local/bin/docker-compose
 fi
+
+# daemon.json
+#source ./scripts/subinstallers/docker_daemon.sh

scripts/subinstallers/docker_daemon.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# daemon.json
+if [ ! -f /etc/docker/daemon.json ]; then
+    sudo -E cp ./scripts/conf/docker-daemon.json /etc/docker/daemon.json
+    sudo -E systemctl restart docker
+fi

scripts/subinstallers/docker_manual.sh

@@ -67,3 +67,8 @@ echo "Installing Docker Compose"
 sudo pip3 install cryptography==3.3.2 docker-compose
 #fi
 
+
+# check raspbian fixes
+if [ "$DISTRO" == "raspbian" ] || [ "$DISTRO" == "raspios" ]; then
+    source ./scripts/subinstallers/docker_raspbian.sh 
+fi

scripts/subinstallers/docker_raspbian.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+set +e
+
+compare_version() {
+  local versionOne="${1}"
+  local comparision="${2}"
+  local versionTwo="${3}"
+  local result=
+  local sortOpt=
+  local returncode=1
+ 
+  if [[ "${versionOne}" == "${versionTwo}" ]] ; then
+    return 3
+  fi
+ 
+  case ${comparision} in
+    lower|smaller|older|lt|"<" ) sortOpt= ;;
+    higher|bigger|newer|bt|">" ) sortOpt='r' ;;
+    * ) return 2 ;;
+  esac
+ 
+  result=($(printf "%s\n" "${versionOne}" "${versionTwo}" | sort -${sortOpt}V ))
+  if [[ "${versionOne}" == "${result[0]}" ]] ; then
+    returncode=0
+  fi
+ 
+  return ${returncode}
+} # end of function compare_version
+
+# libseccomp2
+LIBSECCOMP2_VERSION=$(sudo -E apt-cache policy libseccomp2 | egrep ^\ *Inst | awk '{print $2}')
+
+compare_version $LIBSECCOMP2_VERSION '<' '2.5.1-1'
+
+if [ $? -eq 0 ]; then
+    # this is dumb but the raspbian repo managers aren't impressive
+    echo "Installing newer libseccomp2"
+    pushd .
+    cd /tmp
+    wget http://ftp.us.debian.org/debian/pool/main/libs/libseccomp/libseccomp2_2.5.1-1_$(dpkg --print-architecture).deb
+    sudo dpkg -i libseccomp2_2.5.1-1_$(dpkg --print-architecture).deb
+    popd
+fi
+
+set -e

scripts/subinstallers/gen_prod_env.sh

@@ -4,6 +4,7 @@ figlet "Mistborn: Container Credentials"
 
 # generate production .env file for Django
 mkdir -p ./.envs/.production
+chmod 700 ./.envs
 DJANGO_PROD_FILE="./.envs/.production/.django"
 DJANGO_SECRET_KEY=$(python3 -c "import secrets; import string; print(f''.join([secrets.choice(string.ascii_letters+string.digits) for x in range(50)]))")
 #CELERY_FLOWER_PASSWORD=$(python3 -c "import secrets; import string; print(f''.join([secrets.choice(string.ascii_letters+string.digits) for x in range(32)]))")
@@ -22,6 +23,7 @@ echo "#SENTRY_DNS=" >> $DJANGO_PROD_FILE
 echo "MISTBORN_INSTALL_COCKPIT=$MISTBORN_INSTALL_COCKPIT" >> $DJANGO_PROD_FILE
 echo "MISTBORN_PORTAL_IP=10.2.3.1" >> $DJANGO_PROD_FILE
 echo "MISTBORN_PORTAL_PORT=5000" >> $DJANGO_PROD_FILE
+chmod 600 $DJANGO_PROD_FILE
 
 # generate production .env file for postgresql
 POSTGRES_PROD_FILE="./.envs/.production/.postgres"
@@ -31,6 +33,7 @@ echo "POSTGRES_PORT=5432" >> $POSTGRES_PROD_FILE
 echo "POSTGRES_DB=mistborn" >> $POSTGRES_PROD_FILE
 echo "POSTGRES_USER=prod" >> $POSTGRES_PROD_FILE
 echo "POSTGRES_PASSWORD=$POSTGRES_PASSWORD" >> $POSTGRES_PROD_FILE
+chmod 600 $POSTGRES_PROD_FILE
 
 
 # generate production .env file for pihole
@@ -40,3 +43,4 @@ WEBPASSWORD="$1"
 echo "TZ=\"America/New York\"" > $PIHOLE_PROD_FILE
 echo "WEBPASSWORD=$WEBPASSWORD" >> $PIHOLE_PROD_FILE
 
+chmod 600 $PIHOLE_PROD_FILE

scripts/subinstallers/iptables.sh

@@ -6,7 +6,7 @@ figlet "Mistborn: Configuring Firewall"
 
 echo "stop iptables wrappers"
 if [ "$DISTRO" == "ubuntu" ]; then
-    # Disable UFW
+    echo "Disabling UFW"
     sudo systemctl stop ufw || true
     sudo systemctl disable ufw || true
 fi

scripts/subinstallers/passwd.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# INPUT default admin password
+while [ -z "${MISTBORN_DEFAULT_PASSWORD}" ]; do
+    echo
+    echo "(Mistborn) The default admin password may only container alphanumeric characters and _"
+    read -p "(Mistborn) Set default admin password: " -s MISTBORN_DEFAULT_PASSWORD
+    echo
+
+    if [[ ${MISTBORN_DEFAULT_PASSWORD} =~ ^[A-Za-z0-9_]+$ ]]; then
+    # it matches
+        echo "(Mistborn) Password is accepted"
+    else
+        unset MISTBORN_DEFAULT_PASSWORD
+        echo "(Mistborn) Try again"
+    fi
+
+done
+
+echo
+echo "MISTBORN_DEFAULT_PASSWORD is set"
+echo

scripts/subinstallers/platform.sh

@@ -15,3 +15,39 @@ fi
 figlet "UNAME: $UNAME"
 figlet "DISTRO: $DISTRO"
 figlet "VERSION: $VERSION_ID"
+
+
+vercomp () {
+    # case $? in
+    #     0) op='=';;
+    #     1) op='>';;
+    #     2) op='<';;
+    if [[ $1 == $2 ]]
+    then
+        return 0
+    fi
+    local IFS=.
+    local i ver1=($1) ver2=($2)
+    # fill empty fields in ver1 with zeros
+    for ((i=${#ver1[@]}; i<${#ver2[@]}; i++))
+    do
+        ver1[i]=0
+    done
+    for ((i=0; i<${#ver1[@]}; i++))
+    do
+        if [[ -z ${ver2[i]} ]]
+        then
+            # fill empty fields in ver2 with zeros
+            ver2[i]=0
+        fi
+        if ((10#${ver1[i]} > 10#${ver2[i]}))
+        then
+            return 1
+        fi
+        if ((10#${ver1[i]} < 10#${ver2[i]}))
+        then
+            return 2
+        fi
+    done
+    return 0
+}