Skip to content

Commit

Permalink
Beta v8.0.2 (#5147)
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaIng authored Jan 8, 2022
2 parents 71d2de5 + bb36da2 commit 23ee1f4
Show file tree
Hide file tree
Showing 9 changed files with 90 additions and 120 deletions.
8 changes: 8 additions & 0 deletions .update/pre-patches
Original file line number Diff line number Diff line change
Expand Up @@ -144,5 +144,13 @@ then
G_EXEC apt-get -o 'Acquire::AllowReleaseInfoChange::Suite=true' -q update
fi

# v8.0: ARMv6: Remove Mosquitto repository: https://github.com/MichaIng/DietPi/issues/5140
if (( $G_HW_ARCH == 1 )) && (( $G_DIETPI_VERSION_CORE < 8 || ( $G_DIETPI_VERSION_CORE == 8 && $G_DIETPI_VERSION_SUB < 0 ) )) && [[ -f '/etc/apt/sources.list.d/dietpi-mosquitto.list' ]]
then
G_DIETPI-NOTIFY 2 'Removing Mosquitto APT repository as the latest builds are not compatible with ARMv6: https://github.com/MichaIng/DietPi/issues/5140'
G_EXEC rm /etc/apt/sources.list.d/dietpi-mosquitto.list
[[ -f '/etc/apt/trusted.gpg.d/dietpi-mosquitto.gpg' ]] && G_EXEC rm /etc/apt/trusted.gpg.d/dietpi-mosquitto.gpg
fi

exit 0
}
2 changes: 1 addition & 1 deletion .update/version
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Available DietPi version
G_REMOTE_VERSION_CORE=8
G_REMOTE_VERSION_SUB=0
G_REMOTE_VERSION_RC=1
G_REMOTE_VERSION_RC=2
# Minimum DietPi version to allow update
G_MIN_VERSION_CORE=6
G_MIN_VERSION_SUB=14
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ Stretch support:
- Support for Debian Stretch has now been removed, which allowed us to do a major code cleanup and migrate to some newer methods in different areas which are only available on Buster and above.

Changes:
- Network | For new images, the default DHCP timeout is not reduced to 10 seconds anymore. This could have been too short, in which case network targets of the boot sequence are reached before an IP has been actually assigned. Especially in case of AUTO_SETUP_AUTOMATED=1 this could have lead to connection test timeouts and hence abortion of the automated first run setup. Many thanks to @jpeg2600 for reporting such a case: https://github.com/MichaIng/DietPi/issues/5143
- DietPi-Config | When configuring a first WiFi slot via scanning for SSIDs, the WiFi adapter is now not brought up via "ifup" but "ip l dev wlanX up". This way no DHCP and WPA client starts are triggered, which are doomed to fail when the WiFi adapter is not connected to any access point yet. Especially in case of the default 60 seconds DHCP timeout, this would otherwise cause an unnecessary long delay.
- DietPi-Dashboard | Added an option to view multiple dashboard nodes from one frontend web interface. Related to this, the backend can now be installed only, reducing memory usage and making it impossible to manually access the node outside of the backend API.
- DietPi-Print_large | This new script has been added which can be executed or sourced from /boot/dietpi/func/dietpi-print_large to print the string passed via first argument in large figlet style fonts. It currently only supports the characters a-z, A-Z, 0-9, dot and dash, i.e. those commonly allowed in hostnames.
- DietPi-Banner | Added an option to print the system's hostname in large figlet style fonts, right below the banner header. In case it is enabled as well, the regular/small hostname line will then be skipped. Many thanks to @matellis for implementing this feature: https://github.com/MichaIng/DietPi/pull/5113
- DietPi-Automation | The automatic login on first boot, when AUTO_SETUP_AUTOMATED=1 is set, is now deferred until all network interfaces have been fully configured, including DHCP. In case of slower DHCP servers it was otherwise possible that network checks timed out, aborting the automated first run setup. Many thanks to @jpeg2600 for reporting such a case: https://github.com/MichaIng/DietPi/issues/5143
- DietPi-Software | Mono: "mono-complete" won't be installed anymore but only "mono-devel" instead. This skips the XSP4 webserver service, which listens on port 8084 by default where it conflicts with File Browser. This only affects new instals. You can manually apply this change via "apt-mark manual mono-devel && apt --autoremove purge mono-complete". Many thanks to @jaguar489 for reporting this issue: https://github.com/MichaIng/DietPi/issues/5093
- DietPi-Software | FuguHub: The outdated official installer has been replaced with a fully automated own setup, removing the obsolete or even harmful interactive dialogues. On fresh installs, an admin account "dietpi" with global software password is created as well.
- DietPi-Software | myMPD: Installation is now done via official APT repository, which means quicker install compared to compiling from source, fewer dependencies and easier updates via "apt upgrade": https://github.com/MichaIng/DietPi/issues/5115
Expand All @@ -31,6 +32,7 @@ Fixes:
- DietPi-Software | myMPD: Resolved an issue where the installation failed due to an updated dependency. Many thanks to @supersexy for reporting this issue: https://github.com/MichaIng/DietPi/issues/5115
- DietPi-Software | Python 3: Worked around an issue where the pip reinstall failed. Many thanks to @hueppinr for reporting this issue: https://github.com/MichaIng/DietPi/issues/5117
- DietPi-Software | Unbound: Resolved an issue where the "unbound-resolvconf" service applied localhost automatically as local nameserver, if the "resolvconf" package was installed. Since often Unbound is installed in combination with Pi-hole or AdGuard Home, and those are usually used by network clients only, not the server itself, "unbound-resolvconf" is disabled now on Unbound installs. If Unbound is wanted as local resolver as well, it should be explicitly configured, e.g. via dietpi-config network options. Many thanks to @Ianszh for reporting this issue: https://github.com/MichaIng/DietPi/issues/5133
- DietPi-Software | Mosquitto: Applied a workaround on ARMv6 where the latest Mosquitto packages from the official APT repository are not ARMv6-compatible. Many thanks to @thomasmockridge for reporting this issue: https://github.com/MichaIng/DietPi/issues/5140

As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pull/5146

Expand Down
4 changes: 0 additions & 4 deletions PREP_SYSTEM_FOR_DIETPI.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1449,10 +1449,6 @@ _EOF_'
# ASUS TB WiFi: https://github.com/MichaIng/DietPi/issues/1760
(( $G_HW_MODEL == 52 )) && G_CONFIG_INJECT '8723bs' '8723bs' /etc/modules

G_DIETPI-NOTIFY 2 'Tweaking DHCP timeout:' # https://github.com/MichaIng/DietPi/issues/711
G_CONFIG_INJECT 'timeout[[:blank:]]' 'timeout 10;' /etc/dhcp/dhclient.conf
G_CONFIG_INJECT 'retry[[:blank:]]' 'retry 4;' /etc/dhcp/dhclient.conf

echo 'DietPi' > /etc/hostname
G_EXEC_DESC='Configuring hostname and hosts'
G_EXEC eval 'cat << _EOF_ > /etc/hosts
Expand Down
14 changes: 10 additions & 4 deletions dietpi/dietpi-letsencrypt
Original file line number Diff line number Diff line change
Expand Up @@ -276,16 +276,22 @@ _EOF_

G_DIETPI-NOTIFY 0 'MinIO S3 server detected'

# Pre-create MinIO certs dir if missing
if [[ ! -d '/mnt/dietpi_userdata/minio-data/.minio/certs' ]]
then
G_EXEC mkdir -p /mnt/dietpi_userdata/minio-data/.minio/certs
G_EXEC chown -R minio-user:minio-user /mnt/dietpi_userdata/minio-data
fi

# Ensure strict permissions while copying
G_EXEC umask 377

# Copy to MinIO home dir
[[ -d '/mnt/dietpi_userdata/minio-data/.minio/certs' ]] || G_EXEC mkdir -p /mnt/dietpi_userdata/minio-data/.minio/certs
# Copy to MinIO certs dir
G_EXEC cp "$fp_cert_dir/fullchain.pem" /mnt/dietpi_userdata/minio-data/.minio/certs/public.crt
G_EXEC cp "$fp_cert_dir/privkey.pem" /mnt/dietpi_userdata/minio-data/.minio/certs/private.key

# Own those certs!
G_EXEC chown minio-user:minio-user /mnt/dietpi_userdata/minio-data/.minio/certs/{public.crt,private.key}
G_EXEC chown minio-user:root /mnt/dietpi_userdata/minio-data/.minio/certs/{public.crt,private.key}

# Creation permissions back to default
G_EXEC umask 022
Expand All @@ -308,7 +314,7 @@ systemctl stop minio
# Ensure strict permissions while copying:
umask 377
# Copy to MinIO home dir
# Copy to MinIO certs dir
cp '$fp_cert_dir/fullchain.pem' /mnt/dietpi_userdata/minio-data/.minio/certs/public.crt
cp '$fp_cert_dir/privkey.pem' /mnt/dietpi_userdata/minio-data/.minio/certs/private.key
Expand Down
35 changes: 18 additions & 17 deletions dietpi/dietpi-software
Original file line number Diff line number Diff line change
Expand Up @@ -2665,7 +2665,7 @@ _EOF_
local soundcard=$(sed -n '/^[[:blank:]]*CONFIG_SOUNDCARD=/{s/^[^=]*=//p;q}' /boot/dietpi.txt)
soundcard=${soundcard:-none}

# Enable defaults, if set to "none"
# Enable defaults if set to "none"
if [[ $soundcard == 'none' ]]; then

# RPi: Onboard auto, Others: default
Expand Down Expand Up @@ -3232,7 +3232,7 @@ unix_socket_directories = '/run/postgresql'" > "$i/00dietpi.conf"

# Get latest version
local file=$(curl -sSfL 'https://golang.org/dl/?mode=json' | grep -wo "go[0-9.]*\.linux-$arch\.tar\.gz" | head -1)
[[ $file ]] || { file="go1.17.4.linux-$arch.tar.gz"; G_DIETPI-NOTIFY 1 "Automatic latest ${aSOFTWARE_NAME[$software_id]} version detection failed. \"$file\" will be installed as fallback, but a newer version might be available. Please report this at: https://github.com/MichaIng/DietPi/issues"; }
[[ $file ]] || { file="go1.17.6.linux-$arch.tar.gz"; G_DIETPI-NOTIFY 1 "Automatic latest ${aSOFTWARE_NAME[$software_id]} version detection failed. \"$file\" will be installed as fallback, but a newer version might be available. Please report this at: https://github.com/MichaIng/DietPi/issues"; }

# Reinstall: Remove previous instance
[[ -d '/usr/local/go' ]] && G_EXEC rm -R /usr/local/go
Expand Down Expand Up @@ -4502,7 +4502,7 @@ _EOF_

# Download latest version
local version=$(curl -sSfL 'https://dist.ipfs.io/go-ipfs/versions' | tail -1)
[[ $version ]] || { version='v0.11.0-rc2'; G_DIETPI-NOTIFY 1 "Automatic latest ${aSOFTWARE_NAME[$software_id]} version detection failed. Version \"$version\" will be installed as fallback, but a newer version might be available. Please report this at: https://github.com/MichaIng/DietPi/issues"; }
[[ $version ]] || { version='v0.12.0-rc1'; G_DIETPI-NOTIFY 1 "Automatic latest ${aSOFTWARE_NAME[$software_id]} version detection failed. Version \"$version\" will be installed as fallback, but a newer version might be available. Please report this at: https://github.com/MichaIng/DietPi/issues"; }
Download_Install "https://dist.ipfs.io/go-ipfs/$version/go-ipfs_${version}_linux-$arch.tar.gz"

# Install
Expand Down Expand Up @@ -5846,7 +5846,7 @@ _EOF_
G_CHECK_URL "$url"

# Latest known version
local latest='2.4.13'
local latest='2.4.14'

# ARMv7
local fallback_url="https://hndl.urbackup.org/Server/$latest/urbackup-server_${latest}_armhf.deb"
Expand Down Expand Up @@ -6791,7 +6791,7 @@ _EOF_
Download_Install 'https://github.com/airsonic-advanced/airsonic-advanced/releases/download/v10.6.0/airsonic.war' /mnt/dietpi_userdata/airsonic/airsonic.war
else
# Since v11 is not yet released, pull latest pre-release
local fallback_url='https://github.com/airsonic-advanced/airsonic-advanced/releases/download/11.0.0-SNAPSHOT.20211220002741/airsonic.war'
local fallback_url='https://github.com/airsonic-advanced/airsonic-advanced/releases/download/11.0.0-SNAPSHOT.20220104090313/airsonic.war'
Download_Install "$(curl -sSfL 'https://api.github.com/repos/airsonic-advanced/airsonic-advanced/releases' | mawk -F\" '/"browser_download_url": .*\/airsonic\.war"/{print $4;exit}')" /mnt/dietpi_userdata/airsonic/airsonic.war
fi

Expand Down Expand Up @@ -7182,7 +7182,8 @@ _EOF_
Banner_Installing

# Use official APT repository where available: https://repo.mosquitto.org/debian/pool/main/m/mosquitto/
if [[ $G_HW_ARCH != 3 ]]
# - Current builds are not ARMv6 compatible: https://github.com/MichaIng/DietPi/issues/5140
if [[ $G_HW_ARCH != [13] ]]
then
# APT key
local url='https://repo.mosquitto.org/debian/mosquitto-repo.gpg.key'
Expand Down Expand Up @@ -7983,7 +7984,7 @@ _EOF_
if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then

Banner_Installing
local fallback_url='https://github.com/gotson/komga/releases/download/v0.134.1/komga-0.134.1.jar'
local fallback_url='https://github.com/gotson/komga/releases/download/v0.143.0/komga-0.143.0.jar'
Download_Install "$(curl -sSfL 'https://api.github.com/repos/gotson/komga/releases/latest' | mawk -F\" '/"browser_download_url": .*\/komga-[^"\/]*\.jar"/{print $4}')" /mnt/dietpi_userdata/komga/komga.jar

# User
Expand Down Expand Up @@ -8045,7 +8046,7 @@ _EOF_

# Install required PHP modules: https://sye.dk/sfpg/
DEPS_LIST="$PHP_NAME-gd"
Download_Install 'https://sye.dk/sfpg/Single_File_PHP_Gallery_4.8.0.zip' /var/www/gallery
Download_Install 'https://sye.dk/sfpg/Single_File_PHP_Gallery_4.8.1.zip' /var/www/gallery

# Enable required PHP modules
G_EXEC phpenmod gd
Expand Down Expand Up @@ -8082,7 +8083,7 @@ _EOF_
# Bullseye+
if (( $G_DISTRO > 5 ))
then
local fallback_url='https://github.com/ampache/ampache/releases/download/5.1.1/ampache-5.1.1_all.zip'
local fallback_url='https://github.com/ampache/ampache/releases/download/5.2.0/ampache-5.2.0_all.zip'
Download_Install "$(curl -sSfL 'https://api.github.com/repos/ampache/ampache/releases/latest' | mawk -F\" '/"browser_download_url": ".*\/ampache-[0-9\.]*_all.zip"/{print $4}')" ampache

# Ampache v5 requires PHP7.4, hence pull latest Ampache v4 on Buster: https://github.com/ampache/ampache/wiki/Ampache-Next-Changes
Expand Down Expand Up @@ -8908,7 +8909,7 @@ _EOF_
# APT deps: https://github.com/sabre-io/Baikal/wiki/Baïkal-dependencies
DEPS_LIST="$PHP_NAME-xml $PHP_NAME-mbstring $PHP_NAME-mysql"

local fallback_url='https://github.com/sabre-io/Baikal/releases/download/0.8.0/baikal-0.8.0.zip'
local fallback_url='https://github.com/sabre-io/Baikal/releases/download/0.9.1/baikal-0.9.1.zip'
Download_Install "$(curl -sSfL 'https://api.github.com/repos/sabre-io/Baikal/releases/latest' | mawk -F\" '/"browser_download_url": .*\/baikal-[^"\/]*\.zip"/{print $4}')"

# Reinstall: https://sabre.io/baikal/upgrade/
Expand Down Expand Up @@ -10234,7 +10235,7 @@ _EOF_

# Download
local version=$(curl -sSfL 'https://api.github.com/repos/dani-garcia/vaultwarden/releases/latest' | mawk -F\" '/"tag_name": /{print $4}')
[[ $version ]] || { version='1.23.0'; G_DIETPI-NOTIFY 1 "Automatic latest ${aSOFTWARE_NAME[$software_id]} version detection failed. Version \"$version\" will be installed as fallback, but a newer version might be available. Please report this at: https://github.com/MichaIng/DietPi/issues"; }
[[ $version ]] || { version='1.23.1'; G_DIETPI-NOTIFY 1 "Automatic latest ${aSOFTWARE_NAME[$software_id]} version detection failed. Version \"$version\" will be installed as fallback, but a newer version might be available. Please report this at: https://github.com/MichaIng/DietPi/issues"; }
Download_Install "https://github.com/dani-garcia/vaultwarden/archive/$version.tar.gz"

# Replace old instance on reinstall using new project name
Expand Down Expand Up @@ -10417,7 +10418,7 @@ _EOF_
DEPS_LIST="$PHP_NAME-bcmath $PHP_NAME-json $PHP_NAME-mbstring $PHP_NAME-xml $PHP_NAME-curl $PHP_NAME-sqlite3"

# Grab latest release
local fallback_url='https://github.com/koel/koel/releases/download/v5.1.8/koel-v5.1.8.tar.gz'
local fallback_url='https://github.com/koel/koel/releases/download/v5.1.12/koel-v5.1.12.tar.gz'
Download_Install "$(curl -sSfL 'https://api.github.com/repos/koel/koel/releases/latest' | mawk -F\" '/"browser_download_url": .*\/koel-[^"\/]*\.tar\.gz"/{print $4}')"

# Reinstall: Clear previous install, but keep existing config file
Expand Down Expand Up @@ -10940,7 +10941,7 @@ _EOF_

# - ARMv6: Requires Mono: https://github.com/Jackett/Jackett#installation-on-linux-armv6-or-below
local url=$(curl -sSfL 'https://api.github.com/repos/Jackett/Jackett/releases/latest' | mawk -F\" '/"browser_download_url": .*\/Jackett\.Binaries\.Mono\.tar\.gz"/{print $4}')
local fallback_url='https://github.com/Jackett/Jackett/releases/download/v0.20.123/Jackett.Binaries.Mono.tar.gz'
local fallback_url='https://github.com/Jackett/Jackett/releases/download/v0.20.266/Jackett.Binaries.Mono.tar.gz'

# - ARMv7
if (( $G_HW_ARCH == 2 )); then
Expand Down Expand Up @@ -11540,7 +11541,7 @@ _EOF_
arch='amd64'
fi

local fallback_url="https://github.com/go-gitea/gitea/releases/download/v1.15.7/gitea-1.15.7-linux-$arch"
local fallback_url="https://github.com/go-gitea/gitea/releases/download/v1.15.9/gitea-1.15.9-linux-$arch"
Download_Install "$(curl -sSfL 'https://api.github.com/repos/go-gitea/gitea/releases/latest' | mawk -F\" "/\"browser_download_url\": .*\/gitea-[^\"\/]*-linux-$arch\"/{print \$4}")" /mnt/dietpi_userdata/gitea/gitea

# User
Expand Down Expand Up @@ -12352,7 +12353,7 @@ _EOF_
local arch='armhf'
(( $G_HW_ARCH == 10 )) && arch='amd64'

local fallback_url="https://github.com/badaix/snapcast/releases/download/v0.25.0/snapserver_0.25.0-1_$arch.deb"
local fallback_url="https://github.com/badaix/snapcast/releases/download/v0.26.0/snapserver_0.26.0-1_$arch.deb"
Download_Install "$(curl -sSfL 'https://api.github.com/repos/badaix/snapcast/releases/latest' | mawk -F\" "/\"browser_download_url\": .*\/snapserver_[^\"\/]*_$arch.deb\"/{print \$4}")"
G_EXEC systemctl stop snapserver

Expand All @@ -12369,7 +12370,7 @@ _EOF_
local arch='armhf'
(( $G_HW_ARCH == 10 )) && arch='amd64'

local fallback_url="https://github.com/badaix/snapcast/releases/download/v0.25.0/snapclient_0.25.0-1_without-pulse_$arch.deb"
local fallback_url="https://github.com/badaix/snapcast/releases/download/v0.26.0/snapclient_0.26.0-1_without-pulse_$arch.deb"
Download_Install "$(curl -sSfL 'https://api.github.com/repos/badaix/snapcast/releases/latest' | mawk -F\" "/\"browser_download_url\": .*\/snapclient_[^\"\/]*_without-pulse_$arch.deb\"/{print \$4}")"
G_EXEC systemctl stop snapclient

Expand Down Expand Up @@ -12427,7 +12428,7 @@ _EOF_

fi

local fallback_url="https://github.com/filebrowser/filebrowser/releases/download/v2.19.0/linux-$arch-filebrowser.tar.gz"
local fallback_url="https://github.com/filebrowser/filebrowser/releases/download/v2.20.1/linux-$arch-filebrowser.tar.gz"
Download_Install "$(curl -sSfL 'https://api.github.com/repos/filebrowser/filebrowser/releases/latest' | mawk -F\" "/\"browser_download_url\": .*\/linux-$arch-filebrowser\.tar\.gz\"/{print \$4}")" ./filebrowser/

# Reinstall
Expand Down
2 changes: 1 addition & 1 deletion dietpi/func/dietpi-globals
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
# - Assign defaults/code version as fallback
[[ $G_DIETPI_VERSION_CORE ]] || G_DIETPI_VERSION_CORE=8
[[ $G_DIETPI_VERSION_SUB ]] || G_DIETPI_VERSION_SUB=0
[[ $G_DIETPI_VERSION_RC ]] || G_DIETPI_VERSION_RC=1
[[ $G_DIETPI_VERSION_RC ]] || G_DIETPI_VERSION_RC=2
[[ $G_GITBRANCH ]] || G_GITBRANCH='master'
[[ $G_GITOWNER ]] || G_GITOWNER='MichaIng'
# - Save current version and Git branch
Expand Down
Loading

0 comments on commit 23ee1f4

Please sign in to comment.