Merge branch 'node' into 'master'

Node

See merge request cyber5k/mistborn!2

base.yml

@@ -6,7 +6,7 @@ volumes:
   production_traefik: {}
 
 services:
-  django: &django
+  django:
     image: cyber5k/mistborn:latest 
     container_name: mistborn_production_django
     depends_on:

scripts/install.sh

@@ -57,19 +57,6 @@ echo -e "| |  | | \__ \ |_| |_) | (_) | |  | | | |"
 echo -e "|_|  |_|_|___/\__|_.__/ \___/|_|  |_| |_|"
 echo -e ""
 
-# Get OS info
-# Determine OS platform
-UNAME=$(uname | tr "[:upper:]" "[:lower:]")
-DISTRO=""
-# If Linux, try to determine specific distribution
-if [ "$UNAME" == "linux" ]; then
-    # use /etc/os-release to get distro 
-    DISTRO=$(cat /etc/os-release | awk -F= '/^ID=/{print $2}')
-fi
-
-echo "UNAME: $UNAME"
-echo "DISTRO: $DISTRO"
-
 # INPUT default admin password
 if [ -z "${MISTBORN_DEFAULT_PASSWORD}" ]; then
     read -p "(Mistborn) Set default admin password: " -s MISTBORN_DEFAULT_PASSWORD
@@ -99,6 +86,10 @@ pushd .
 cd /opt/mistborn
 git submodule update --init --recursive
 
+# get os and distro
+source ./scripts/subinstallers/platform.sh
+
+
 # iptables
 echo "Setting up firewall (iptables)"
 if [ ! -f "/etc/iptables/rules.v4" ]; then

scripts/subinstallers/platform.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Get OS info
+# Determine OS platform
+UNAME=$(uname | tr "[:upper:]" "[:lower:]")
+DISTRO=""
+# If Linux, try to determine specific distribution
+if [ "$UNAME" == "linux" ]; then
+    # use /etc/os-release to get distro 
+    DISTRO=$(cat /etc/os-release | awk -F= '/^ID=/{print $2}')
+fi
+
+echo "UNAME: $UNAME"
+echo "DISTRO: $DISTRO"