first pass of edits for PoC

dappnode · Nov 10, 2023 · 7fa27fa · 7fa27fa
1 parent d13125a
commit 7fa27fa
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/.dappnode_profile b/.dappnode_profile
@@ -1,12 +1,12 @@
 #!/bin/bash
 
 export BIND_VERSION="${BIND_VERSION:-0.2.6}"
-export IPFS_VERSION="${IPFS_VERSION:-0.2.19}"
+export IPFS_VERSION="${IPFS_VERSION:-0.2.21}"
 export VPN_VERSION="${VPN_VERSION:-0.2.8}"
-export DAPPMANAGER_VERSION="${DAPPMANAGER_VERSION:-0.2.68}"
+export DAPPMANAGER_VERSION="${DAPPMANAGER_VERSION:-0.2.77}"
 export WIFI_VERSION="${WIFI_VERSION:-0.2.8}"
 export WIREGUARD_VERSION="${WIREGUARD_VERSION:-0.1.2}"
-export HTTPS_VERSION="${HTTPS:-0.1.4}"
+export HTTPS_VERSION="${HTTPS:-0.2.1}"
 
 export DAPPNODE_DIR="/usr/src/dappnode"
 export DAPPNODE_CORE_DIR="${DAPPNODE_DIR}/DNCORE"

diff --git a/iso/preseeds/preseed.cfg b/iso/preseeds/preseed.cfg
@@ -6,9 +6,9 @@
 d-i hw-detect/load_firmware boolean true
 d-i netcfg/choose_interface select auto
 d-i netcfg/link_wait_timeout string 20
-d-i netcfg/get_hostname string dappnode
-d-i netcfg/get_hostname seen false
-d-i netcfg/hostname seen false
+d-i netcfg/get_hostname string AMD-Hyper-V
+d-i netcfg/get_hostname seen true
+d-i netcfg/hostname seen true
 d-i passwd/user-fullname string DAppNode User
 d-i netcfg/get_domain string ''
 d-i netcfg/get_domain seen true
@@ -19,7 +19,7 @@ d-i passwd/username seen false
 
 ### Package selection
 tasksel tasksel/first multiselect standard
-d-i pkgsel/include string openssh-server vim sudo iw iwd wpasupplicant intel-microcode iucode-tool build-essential linux-headers-$(uname -r) firmware-iwlwifi avahi-utils iptables
+d-i pkgsel/include string openssh-server discus speedtest vim sudo iw iwd wpasupplicant intel-microcode iucode-tool build-essential linux-headers-$(uname -r) firmware-iwlwifi avahi-utils iptables
 d-i apt-setup/use_mirror boolean false
 d-i mirror/country string manual
 d-i mirror/http/hostname string deb.debian.org

diff --git a/iso/preseeds/preseed_unattended.cfg b/iso/preseeds/preseed_unattended.cfg
@@ -12,19 +12,19 @@ d-i keyboard-configuration/xkb-keymap select us
 d-i hw-detect/load_firmware boolean true # Non-free hardware needed ?
 d-i netcfg/choose_interface select auto
 d-i netcfg/link_wait_timeout string 20
-d-i netcfg/get_hostname string dappnode
+d-i netcfg/get_hostname string Dappnode-AMD-Hyper-V
 d-i netcfg/hostname seen true
 d-i netcfg/get_domain string dappnode.eth
 d-i netcfg/get_domain seen true
 
 ### Account setup
-d-i passwd/root-login boolean false
+d-i passwd/root-login boolean true
 d-i passwd/user-fullname string DAppNode
 d-i passwd/username string dappnode
 # Use `mkpasswd -m sha-512` to  generate the hash
 # Using "dappnode.s0" as default
 d-i passwd/user-password-crypted password $6$insecur3$rnEv9Amdjn3ctXxPYOlzj/cwvLT43GjWzkPECIHNqd8Vvza5bMG8QqMwEIBKYqnj609D.4ngi4qlmt29dLE.71
-# d-i passwd/root-password-crypted password $6$insecur3$rnEv9Amdjn3ctXxPYOlzj/cwvLT43GjWzkPECIHNqd8Vvza5bMG8QqMwEIBKYqnj609D.4ngi4qlmt29dLE.71
+d-i passwd/root-password-crypted password $6$insecur3$rnEv9Amdjn3ctXxPYOlzj/cwvLT43GjWzkPECIHNqd8Vvza5bMG8QqMwEIBKYqnj609D.4ngi4qlmt29dLE.71
 
 ### Clock and time zone setup
 d-i clock-setup/utc boolean true
@@ -56,7 +56,7 @@ d-i grub-installer/bootdev string default
 
 ### Package selection
 tasksel tasksel/first multiselect standard
-d-i pkgsel/include string openssh-server vim sudo build-essential linux-headers-$(uname -r) iw iwd wpasupplicant intel-microcode iucode-tool firmware-misc-nonfree firmware-iwlwifi avahi-utils iptables
+d-i pkgsel/include string openssh-server vim sudo build-essential discus speedtest linux-headers-$(uname -r) iw iwd wpasupplicant intel-microcode iucode-tool firmware-misc-nonfree firmware-iwlwifi avahi-utils iptables
 d-i apt-setup/use_mirror boolean false
 d-i mirror/country string manual
 d-i mirror/http/hostname string deb.debian.org

diff --git a/iso/scripts/download_core.sh b/iso/scripts/download_core.sh
@@ -14,7 +14,7 @@ IPFS_ENDPOINT=${IPFS_ENDPOINT:-"http://ipfs.io"}
 SWGET="wget -q -O-"
 WGET="wget"
 
-components=(BIND IPFS WIREGUARD DAPPMANAGER WIFI HTTPS)
+components=(BIND IPFS WIREGUARD DAPPMANAGER HTTPS)
 
 # The indirect variable expansion used in ${!ver##*:} allows us to use versions like 'dev:development'
 # If such variable with 'dev:'' suffix is used, then the component is built from specified branch or commit.

diff --git a/scripts/dappnode_install.sh b/scripts/dappnode_install.sh
@@ -66,15 +66,15 @@ determine_packages() {
     is_port_used
     if [ "$IS_ISO_INSTALL" == "false" ]; then
         if [ "$IS_PORT_USED" == "true" ]; then
-            PKGS=(BIND IPFS VPN WIREGUARD DAPPMANAGER WIFI)
+            PKGS=(BIND IPFS WIREGUARD DAPPMANAGER)
         else
-            PKGS=(HTTPS BIND IPFS WIREGUARD DAPPMANAGER WIFI)
+            PKGS=(HTTPS BIND IPFS WIREGUARD DAPPMANAGER)
         fi
     else
         if [ "$IS_PORT_USED" == "true" ]; then
-            PKGS=(BIND IPFS WIREGUARD DAPPMANAGER WIFI)
+            PKGS=(BIND IPFS WIREGUARD DAPPMANAGER)
         else
-            PKGS=(HTTPS BIND IPFS WIREGUARD DAPPMANAGER WIFI)
+            PKGS=(HTTPS BIND IPFS WIREGUARD DAPPMANAGEr)
         fi
     fi
     echo -e "\e[32mPackages to be installed: ${PKGS[*]}\e[0m" 2>&1 | tee -a $LOGFILE

diff --git a/scripts/dappnode_test_install.sh b/scripts/dappnode_test_install.sh
@@ -22,7 +22,7 @@ detect_installation_type() {
     fi
 }
 
-components=(BIND IPFS VPN DAPPMANAGER WIFI)
+components=(BIND IPFS HTTPS DAPPMANAGER WIFI)
 detect_installation_type
 if ping -c 1 -q google.com >&/dev/null; then
     echo -e "\e[32m Connectivity OK\n \e[0m"