Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Beta v7.1.2 #4308

Merged
merged 24 commits into from
Apr 28, 2021
2 changes: 1 addition & 1 deletion .conf/dps_182/unbound.conf
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ server:
do-ip6: yes
prefer-ip6: no

# DNS root server information file. Updated monthly via cronjob
# DNS root server information file. Updated monthly via cron job: /etc/cron.monthly/dietpi-unbound
root-hints: "/var/lib/unbound/root.hints"

# Maximum number of queries per second
Expand Down
5 changes: 0 additions & 5 deletions .conf/dpv/protonvpn.template
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,7 @@
client
dev tun
proto $PROTOCOL

remote $VPN_SERVER 443
remote $VPN_SERVER 80
remote $VPN_SERVER 1194
remote $VPN_SERVER 5060
remote $VPN_SERVER 4569

remote-random
ravenclaw900 marked this conversation as resolved.
Show resolved Hide resolved
resolv-retry infinite
Expand Down
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=7
G_REMOTE_VERSION_SUB=1
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=0
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ Fixes:
- DietPi-Config | Resolved an issue on Sparky SBC, where selecting the generic USB DAC sound card option failed, due to invalid amixer calls. Many thanks to @Balmoral86 for reporting this issue: https://github.com/MichaIng/DietPi/issues/4249
- DietPi-Drive_Manager | Fixed detection and visualisation of loop devices in menu.
- DietPi-Set_userdata | When dietpi_userdata was moved to another drive, the intended dietpi:dietpi ownership was not applied to the target directory as intended. This is required by some software titles, like Syncthing and file servers, to permit the creation of files and directories. Many thanks to @redschumi for reporting this issue: https://github.com/MichaIng/DietPi/issues/4228
- DietPi-Config | Worked around an issue in RPi, where selecting a sound card ended with an error prompt in certain circumstances. Many thanks to @sturbs for reporting this issue: https://github.com/MichaIng/DietPi/issues/4306
- DietPi-Software | Resolved an issue where the "uninstall" command did not work and the "reinstall" did not show the intended backup prompt. Many thanks to @Zeuskk for reporting this v7.0 regression: https://dietpi.com/phpbb/viewtopic.php?t=8729
- DietPi-Software | Resolved an issue where directory permissions could be wrong because of 7zr overriding the default umask. This lead e.g. to 403 browser error on a fresh Single File PHP Gallery install. Many thanks to @Alexgolshtein for reporting this issue: https://github.com/MichaIng/DietPi/issues/4251
- DietPi-Software | X.Org X Server: Resolved an issue on RPi where the X server start failed when the KMS device tree overlay was not enabled. Many thanks to @xthedakmanx for reporting this issue: https://github.com/MichaIng/DietPi/issues/4175
Expand All @@ -62,7 +63,7 @@ Fixes:
- DietPi-Software | Chromium: Worked around an issue on 64-bit RPi systems, where the install failed, as The Raspberry Pi repository does not ship a 64-bit build yet. The Chromium package from the Debian repository is now installed instead.
- DietPi-Software | Sonarr/Radarr: Having both now installed as v3 or later, resolves a long outstanding issue, where importing downloads to filesystems without native UNIX permissions support, including Samba/CIFS mounts, failed.

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/XXXX
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/4305

Known/Outstanding Issues:
- DietPi-Config | Enabling WiFi + Ethernet adapters, both on different subnets, breaks WiFi connection in some cases: https://github.com/MichaIng/DietPi/issues/2103
Expand Down
2 changes: 1 addition & 1 deletion dietpi/dietpi-ddns
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ Apply()
local result
if ! result=$(curl -sSfL ${http_auth:+ -u "$USERNAME:$PASSWORD"} "$url" 2>&1) ||
[[ $PROVIDER == 'DuckDNS' && $result == 'KO' ]] ||
[[ $PROVIDER == 'Dynu' && $result != 'good*' && $result != 'nochg*' ]]
[[ $PROVIDER == 'Dynu' && $result != 'good'* && $result != 'nochg'* ]]
then
G_DIETPI-NOTIFY 1 "DDNS update test failed, please check your input${result:+:\n$result}"
STATUS="DDNS update test failed, please check your input${result:+:\n$result}"
Expand Down
5 changes: 5 additions & 0 deletions dietpi/dietpi-letsencrypt
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,11 @@ _EOF_
then
G_EXEC sed -i '2d' /etc/lighttpd/conf-available/50-dietpi-https.conf
G_EXEC sed -i '/ssl.openssl.ssl-conf-cmd/c\\tssl.use-sslv2 = "disable"\n\tssl.use-sslv3 = "disable"' /etc/lighttpd/conf-available/50-dietpi-https.conf

# Bullseye: Keep session tickets enabled, which is safe since Lighttpd v1.4.56: https://github.com/MichaIng/DietPi/issues/4294#issuecomment-826802056
elif (( $G_DISTRO > 5 ))
then
G_EXEC sed -i 's/, "Options" => "-SessionTicket"//' /etc/lighttpd/conf-available/50-dietpi-https.conf
fi
G_EXEC lighty-enable-mod dietpi-https

Expand Down
39 changes: 23 additions & 16 deletions dietpi/dietpi-software
Original file line number Diff line number Diff line change
Expand Up @@ -1255,8 +1255,8 @@ _EOF_
#--------------------------------------------------------------------------------
software_id=69

aSOFTWARE_NAME[$software_id]='RPi.GPIO'
aSOFTWARE_DESC[$software_id]='gpio interface library for rpi (python)'
aSOFTWARE_NAME[$software_id]='Python RPi.GPIO'
aSOFTWARE_DESC[$software_id]='Control Raspberry Pi GPIO channels in Python'
aSOFTWARE_CATEGORY_INDEX[$software_id]=10
aSOFTWARE_ONLINEDOC_URL[$software_id]='https://dietpi.com/docs/software/hardware_projects/#rpigpio'
# RPi only
Expand All @@ -1268,7 +1268,7 @@ _EOF_
software_id=70

aSOFTWARE_NAME[$software_id]='WiringPi'
aSOFTWARE_DESC[$software_id]='gpio interface library (c)'
aSOFTWARE_DESC[$software_id]='GPIO interface library (C)'
aSOFTWARE_CATEGORY_INDEX[$software_id]=10
aSOFTWARE_ONLINEDOC_URL[$software_id]='https://dietpi.com/docs/software/hardware_projects/#wiringpi'
aSOFTWARE_REQUIRES_BUILDESSENTIAL[$software_id]=1
Expand All @@ -1281,7 +1281,7 @@ _EOF_
software_id=71

aSOFTWARE_NAME[$software_id]='WebIOPi'
aSOFTWARE_DESC[$software_id]='web interface to control rpi.gpio'
aSOFTWARE_DESC[$software_id]='Web interface to control RPi GPIO channels'
aSOFTWARE_CATEGORY_INDEX[$software_id]=10
aSOFTWARE_ONLINEDOC_URL[$software_id]='https://dietpi.com/docs/software/hardware_projects/#webiopi'
aSOFTWARE_REQUIRES_BUILDESSENTIAL[$software_id]=1
Expand Down Expand Up @@ -2296,6 +2296,16 @@ _EOF_

fi

# Software that requires Python RPi.GPIO
# - WebIOPi (71)
software_id=69
if (( ${aSOFTWARE_INSTALL_STATE[71]} == 1 )); then

aSOFTWARE_INSTALL_STATE[$software_id]=1
G_DIETPI-NOTIFY 2 "${aSOFTWARE_NAME[$software_id]} will be installed"

fi

#-------------------------------------------------------------------------
# WEBSERVER - Manual stack install
# - Define extra DietPi install flags for WEBSERVER_STACKS
Expand Down Expand Up @@ -4831,14 +4841,11 @@ amvdec_vp9' > /etc/modules-load.d/dietpi-c4-kodi.conf

fi

# WebIOPi requires RPi GPIO
(( ${aSOFTWARE_INSTALL_STATE[71]} == 1 )) && aSOFTWARE_INSTALL_STATE[69]=1

software_id=69 # RPi GPIO
software_id=69 # Python RPi.GPIO
if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then

Banner_Installing
G_AGI python-rpi.gpio python3-rpi.gpio
G_AGI python{3,}-rpi.gpio

fi

Expand Down Expand Up @@ -4919,7 +4926,7 @@ _EOF_

# Install as local instance for "nodered" user
G_EXEC cd /mnt/dietpi_userdata/node-red
G_EXEC_OUTPUT=1 G_EXEC sudo -u nodered npm i node-red
G_EXEC_OUTPUT=1 G_EXEC sudo -u nodered npm i --no-audit node-red
G_EXEC cd /tmp/$G_PROGRAM_NAME

# CLI alias
Expand Down Expand Up @@ -4960,8 +4967,8 @@ _EOF_
DEPS_LIST='python' Download_Install "$(curl -sSfL 'https://api.github.com/repos/blynkkk/blynk-server/releases/latest' | mawk -F\" "/\"browser_download_url\": .*\/server-[0-9.]*$java\.jar\"/{print \$4}")" /mnt/dietpi_userdata/blynk/blynkserver.jar

# Install Blynk JS libary
npm i -g --unsafe-perm onoff
npm i -g --unsafe-perm blynk-library
G_EXEC_OUTPUT=1 G_EXEC npm i -g --unsafe-perm --no-audit onoff
G_EXEC_OUTPUT=1 G_EXEC npm i -g --unsafe-perm --no-audit blynk-library

fi

Expand Down Expand Up @@ -5791,11 +5798,11 @@ Package: wireguard wireguard-dkms wireguard-tools\nPin: release n=bullseye\nPin-
G_EXEC chmod +x mineos_console.js webui.js update_webui.sh reset_webui.sh generate-sslcert.sh

# Install Node 11, as MineOS is currently not compatible with newer Node versions: https://github.com/hexparrot/mineos-node/issues/374
G_EXEC_OUTPUT=1 G_EXEC npm i -g --unsafe-perm n
G_EXEC_OUTPUT=1 G_EXEC npm i -g --unsafe-perm --no-audit n
G_EXEC_OUTPUT=1 G_EXEC n 11

# Install MineOS
G_EXEC_OUTPUT=1 G_EXEC npm i --unsafe-perm
G_EXEC_OUTPUT=1 G_EXEC npm i --unsafe-perm --no-audit
G_EXEC cd /tmp/$G_PROGRAM_NAME
fi

Expand Down Expand Up @@ -14722,11 +14729,11 @@ _EOF_

fi

software_id=69
software_id=69 # Python RPi.GPIO
if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then

Banner_Uninstalling
G_AGP python-rpi.gpio python3-rpi.gpio
G_AGP python{3,}-rpi.gpio

fi

Expand Down
4 changes: 2 additions & 2 deletions dietpi/dietpi-vpn
Original file line number Diff line number Diff line change
Expand Up @@ -357,8 +357,8 @@ _EOF_
-A OUTPUT -d 192.168.0.0/16 -j ACCEPT
-A OUTPUT -d 172.16.0.0/12 -j ACCEPT
-A OUTPUT -d 10.0.0.0/8 -j ACCEPT
-A OUTPUT -d $VPN_SERVER -p tcp -m multiport --dports 80,443,1194,4569,5060 -j ACCEPT
-A OUTPUT -d $VPN_SERVER -p udp -m multiport --dports 80,443,1194,4569,5060 -j ACCEPT
-A OUTPUT -d $VPN_SERVER -p tcp --dport 1194 -j ACCEPT
-A OUTPUT -d $VPN_SERVER -p udp --dport 1194 -j ACCEPT
-A INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
COMMIT
_EOF_
Expand Down
15 changes: 8 additions & 7 deletions dietpi/func/create_mysql_db
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@

# Import DietPi-Globals --------------------------------------------------------------
. /boot/dietpi/func/dietpi-globals
G_PROGRAM_NAME='DietPi-Create_MySQL_DB'
readonly G_PROGRAM_NAME='DietPi-Create_MySQL_DB'
G_CHECK_ROOT_USER
G_INIT
# Import DietPi-Globals --------------------------------------------------------------

# Grab input
DATABASE_NAME=$1
DATABASE_USER=$2
DATABASE_PW=$3
MESSAGE="Creating MariaDB database $DATABASE_NAME for user $DATABASE_USER"
readonly DATABASE_NAME=$1
readonly DATABASE_USER=$2
readonly DATABASE_PW=$3
readonly MESSAGE="Creating MariaDB database $DATABASE_NAME for user $DATABASE_USER"

#/////////////////////////////////////////////////////////////////////////////////////
# Main Loop
Expand All @@ -43,9 +43,10 @@
grant_privileges="grant all privileges on \`$DATABASE_NAME\`.* to \`$DATABASE_USER\`@localhost identified by '$DATABASE_PW';flush privileges"
[[ $DATABASE_USER != 'root' ]] || grant_privileges=
mysql -e "create database \`$DATABASE_NAME\`;$grant_privileges"
exit_code=$?

#-----------------------------------------------------------------------------------
G_DIETPI-NOTIFY -1 $? "$MESSAGE"
exit $?
G_DIETPI-NOTIFY -1 $exit_code "$MESSAGE"
exit $exit_code
#-----------------------------------------------------------------------------------
}
Loading