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

v158 #1232

Merged
merged 54 commits into from
Nov 12, 2017
Merged

v158 #1232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
88efc08
WORK IN PROCESS: Move PHP settings from webserver to PHP config files
MichaIng Oct 13, 2017
62f37a9
Adjust also for Nginx
MichaIng Oct 13, 2017
919602f
small Nginx conf fix
MichaIng Oct 13, 2017
fa33904
Merge branch 'testing' into patch-2
MichaIng Oct 13, 2017
28d2915
Diet-Pi | Add Gitea
cedartinkerer Oct 18, 2017
b5509d8
v158
Fourdee Oct 19, 2017
17c8c0c
Merge pull request #1196 from techdabbler/testing
Fourdee Oct 19, 2017
355eebe
v158
Fourdee Oct 19, 2017
69733c8
Merge branch 'testing' into patch-2
MichaIng Oct 19, 2017
8722073
Update Home Assistant to use python 3.6.3 as this is now required.
Oct 20, 2017
a1fdce4
Switch to Mariadb client package is stretch.
Oct 21, 2017
11651d6
[CertBot] Add Stretch Apache package and installation code cleanup
MichaIng Oct 21, 2017
a5636a3
[CertBot] Add Apache auto installation to dietpi-letsencrypt
MichaIng Oct 21, 2017
8373149
v158
Fourdee Oct 25, 2017
8a34bd3
v158
Fourdee Oct 25, 2017
1bcb91b
v158
Fourdee Oct 26, 2017
66f982d
v158
Fourdee Oct 26, 2017
bf56f98
Merge pull request #1191 from MichaIng/patch-2
Fourdee Oct 26, 2017
4255c05
v158
Fourdee Oct 26, 2017
5508bc1
Merge pull request #1203 from sytone/hapythonupdate
Fourdee Oct 26, 2017
1a0b9d7
Only create cronjob, if not auto created by stretch certbot apt package
MichaIng Oct 26, 2017
7aa36d9
Merge pull request #1206 from MichaIng/patch-1
Fourdee Oct 27, 2017
d88f7de
v158
Fourdee Oct 28, 2017
eac3e7c
[CertBot] Remove certbot stretch packages on deinstallation
MichaIng Oct 29, 2017
daec762
[CertBot] Choose correct binary, depending on $DISTRO
MichaIng Oct 29, 2017
ce5b23f
v158
Fourdee Oct 29, 2017
d5ed5d7
v158
Fourdee Oct 29, 2017
5300430
v158
Fourdee Oct 29, 2017
75fd6f2
v158
Fourdee Oct 29, 2017
80cf80c
v158
Fourdee Oct 29, 2017
a977663
Merge pull request #1217 from MichaIng/patch-1
Fourdee Oct 30, 2017
ed5b0ad
[Nextcloud] Fix database creation
MichaIng Nov 5, 2017
fbee7c7
Fix Nginx config
MichaIng Nov 5, 2017
0e9806d
v158
Fourdee Nov 7, 2017
7691558
[Nextcloud] HSTS for /nextcloud subfolder + Fix CLI URL
MichaIng Nov 7, 2017
af386dd
[Nextcloud | Nginx] Set HTTPS on, if SSL connection is available
MichaIng Nov 8, 2017
180497e
[Nextcloud | Nginx] Ignore SSL verification errors on SSL check
MichaIng Nov 9, 2017
a906504
Update README.md
k-plan Nov 9, 2017
c556749
v158
Fourdee Nov 9, 2017
35caed1
[Nextcloud] Remove obsolete database user
MichaIng Nov 10, 2017
a6c67f7
[Nextcloud] Remove obsolete MySQL user on update
MichaIng Nov 10, 2017
483bbf3
Merge branch 'testing' into patch-1
MichaIng Nov 10, 2017
6443182
Merge branch 'testing' into patch-1
MichaIng Nov 10, 2017
bd3ba78
v158
Fourdee Nov 10, 2017
73b93e3
v158
Fourdee Nov 10, 2017
7d4ef53
Merge pull request #1226 from MichaIng/patch-1
Fourdee Nov 10, 2017
aad1afe
v158
Fourdee Nov 10, 2017
4e5ed35
v158
Fourdee Nov 10, 2017
2435f1b
v158
Fourdee Nov 10, 2017
521f611
v158
Fourdee Nov 11, 2017
b796398
v158
Fourdee Nov 11, 2017
3417426
v158
Fourdee Nov 12, 2017
a9b07c4
v158
Fourdee Nov 12, 2017
0b0bf43
Merge branch 'master' into testing
Fourdee Nov 12, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,37 @@
v158
(12/11/17)

Changes / Improvements / Optimizations:
DietPi-Services | status: Improved this command to highlight working and detail failed services. Failed services will also be listed. 'dietpi-services status': https://github.com/Fourdee/DietPi/issues/1230
DietPi-Software | Google AIY: Now available for installation: http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&p=9486#p9486
DietPi-Software | moOde: Initial pass adding into DietPi: https://github.com/Fourdee/DietPi/issues/1223
DietPi-Software | Gitea: Now available for installation. Many thanks to @techdabbler for contributing this addition: https://github.com/Fourdee/DietPi/issues/686
DietPi-Software | Squeezelite recompiled with -DDSD, now supports DSD and DoP audio playback: https://github.com/Fourdee/DietPi/issues/1210
DietPi-Sotware | AudioPhonics Pi-SPC: Now available for installation. Power control module which lets you physically power off system using a button: http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&p=9359#p9359
DietPi-Software | Raspotify: Now available for installation. Spotify Connect client for the Raspberry Pi (and other ARMv6/v7 devices) that Just Works™: http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&p=9368#p9368
DietPi-Software | Sabnzbd: Updated to 2.3.1 for new installations only. Thanks @Invictaz : https://github.com/Fourdee/DietPi/issues/865#issuecomment-340282019
DietPi-Set_Software | Improved useradd/userdel functions. Please see sourcecode for details.

Bug Fixes:
General | Sparky SBC: Applied latest kernel (USB + ETH) stability patches, which will resolve loss of connection, audio device and URB errors. Thanks @Sudeep.
General | Fixed kill-ssh-user-sessions-before-network.service, to prevent it always generating an error.
DietPi-Config | Corrected descriptions for Auto swapfile size, and, Ondemand as recommended CPU gov. Thanks @k-plan : https://github.com/Fourdee/DietPi/issues/1205
DietPi-Config | NAS: Resolved an issue where samba client share names, which contained spaces, would cause the mount the fail: https://github.com/Fourdee/DietPi/issues/1201
DietPi-Config | Rock64: Resolved an issue with incorrect card/device indexs for HDMI/3.5mm, thanks @BryanSmithDev : https://github.com/Fourdee/DietPi/issues/1102
DietPi-Set_Hardware | Soundcard: When setting USB-DAC, and it fails detection, the soundcard will be reset to 'none'.
DietPi-Set_Software | DietPi User: Resolved an issue where /etc/sudoers was being incorrectly written with additional \.
DietPi-Software | Uninstalling DietPi-Cam, will no longer remove the motion package, shared with Motioneye, thanks @vilhelmp: https://github.com/Fourdee/DietPi/issues/1194
DietPi-Software | Resolved an issue with Emby server (ARMv7/ARMv8) failing to install, due to missing packages not available in Debian repo: https://github.com/Fourdee/DietPi/issues/1150
DietPi-Software | Resolved an issue with 404 and Owncloud: https://github.com/Fourdee/DietPi/issues/1225
DietPi-Software | Resolved an issue with Home Assistant on Native PC failing. Many thanks to @sytone : https://github.com/Fourdee/DietPi/issues/1145

Allo Web Interface v3:
Roon | Resolved an issue where Roon was not generating unique IDs, resulting in multiple devices on the same network, having issues with Roon Core detection.
Squeezelite | Now supports DSD and DoP audio playback: https://github.com/Fourdee/DietPi/issues/1210
General | Added ability to set S24_3 bit depth modes for Shairport-sync and Squeezelite. Required by some DACs

-----------------------------------------------------------------------------------------------------------

v157
(19/10/17)

Expand Down
3 changes: 2 additions & 1 deletion PREP_SYSTEM_FOR_DIETPI.sh
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ Before=network.target shutdown.target

[Service]
Type=oneshot
ExecStart=/usr/bin/killall sshd && /usr/bin/killall dropbear
ExecStart=/bin/bash -c 'killall sshd &> /dev/null; killall dropbear &> /dev/null'

[Install]
WantedBy=poweroff.target halt.target reboot.target
Expand Down Expand Up @@ -438,6 +438,7 @@ sed -i "/FORCE=/c\FORCE=force" /etc/default/fake-hwclock
# echo -e "options 8188eu rtw_power_mgnt=0" > /etc/modprobe.d/8188eu.conf
# echo -e "options 8189es rtw_power_mgnt=0" > /etc/modprobe.d/8189es.conf


#Set swapfile size
echo -e "CONF_SWAPSIZE=0" > /etc/dphys-swapfile

Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,14 @@ Creator, programmer and project lead of DietPi.
* Daniel Knight (Fourdee)

Current contributors:
* JohnVick - Joined 08/06/2016 -
DietPi forum co-administrator, including managment, support, testing and valuable feedback.
* MichaIng - Joined Q3 2017
Source code contributor, bug fixes, software improvements.
* JohnVick - Joined 08/06/2016 -
DietPi forum co-administrator, including managment, support, testing and valuable feedback
* K-Plan - Joined 01/01/2016 -
Contributions to the DietPi in general, including In-depth testing, bug finding and valuable feedback. Forum moderator.
Contributions to the DietPi in general, including In-depth testing, bug finding and valuable feedback. Forum moderator.
* ZombieVirus - Joined 20/03/2016 -
DietPi forum moderator and version history maintainer on forums.
DietPi forum moderator and version history maintainer on forums.

Collaborations:
* DietPi + AmiBerry 02/09/2016 -
Expand All @@ -47,7 +49,7 @@ Contributions to the DietPi in general, including sourcecode, testing, new devic
Provided DietPi.com web hosting for 1 year until April 17th 2016, forum moderator, testing, bug reporting.
* xenfomation - Joined 01/04/2016 -
Contributions to the DietPi in general, including sourcecode, virtualBox image creation/conversion.
* AWL29 - Joined 01/10/2016 -
* AWL29 - Joined 01/10/2016 -
Created the DietPi image for NanoPi M3/T3.

Honourable mentions/thanks:
Expand Down
2 changes: 1 addition & 1 deletion dietpi/.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
157
158
2 changes: 1 addition & 1 deletion dietpi/conf/squeezelite.service
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Description=squeezelite

[Service]
Type=simple
ExecStart=/usr/bin/squeezelite -a 4096:1024:16:0 -C 5 -n 'DietPi-Squeezelite' -f /var/log/squeezelite.log
ExecStart=/usr/bin/squeezelite -D -a 4096:1024:16:0 -C 5 -n 'DietPi-Squeezelite' -f /var/log/squeezelite.log

[Install]
WantedBy=multi-user.target
1 change: 1 addition & 0 deletions dietpi/dietpi-bugreport
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ _EOF_
"lsmod"
"systemctl status *.service -l"
"systemctl status *.mount -l"
"/DietPi/dietpi/dietpi-services status"

)

Expand Down
32 changes: 17 additions & 15 deletions dietpi/dietpi-config
Original file line number Diff line number Diff line change
Expand Up @@ -1292,7 +1292,7 @@

MIN_VALUE=0
MAX_VALUE=2000
OPTION=$(whiptail --inputbox "This will set the size of your swap file in MB:\n\nSwapfile has a swapiness setting of 1. Swapfile is used only to prevent out of memory errors.\n\n - Recommended value = 1 (auto)\n - 0 = Disable swapfile\n - 1 = Auto size swapfile (1GB - RAM = size)\n - 2 - $MAX_VALUE = Manual size" 16 75 "$swap_size" --title "SwapFile Size (MB)" 3>&1 1>&2 2>&3)
OPTION=$(whiptail --inputbox "This will set the size of your swap file in MB:\n\nSwapfile has a swapiness setting of 1. Swapfile is used only to prevent out of memory errors.\n\n - Recommended value = 1 (auto)\n - 0 = Disable swapfile\n - 1 = Auto size swapfile (2GB - RAM = size)\n - 2 - $MAX_VALUE = Manual size" 16 75 "$swap_size" --title "SwapFile Size (MB)" 3>&1 1>&2 2>&3)
CHOICE=$?
if (( $CHOICE == 0 )); then

Expand Down Expand Up @@ -1910,19 +1910,20 @@

local Description="Change CPU Governor:"
local whiptail_menu_array=()
if (( $(cat "$FP_CPU_SCALING_GOV" | grep -ci -m1 'interactive') == 1 )); then

whiptail_menu_array+=("interactive" "Scales CPU frequency between $frequency_min_cpu_governor MHz and $frequency_max_cpu_governor MHz.")
Description+="\nInteractive | Dynamic CPU frequency based on usage (recommended)"

fi

# - C1 | disable ondemand: https://github.com/Fourdee/DietPi/issues/248
if (( $(cat "$FP_CPU_SCALING_GOV" | grep -ci -m1 'ondemand') == 1 )) &&
(( $HW_MODEL != 10 )); then

whiptail_menu_array+=("ondemand" "Scales CPU frequency between $frequency_min_cpu_governor MHz and $frequency_max_cpu_governor MHz.")
Description+="\nOndemand | Dynamic CPU frequency based on usage."
Description+="\nOndemand | Dynamic CPU frequency based on usage (recommended)."

fi

if (( $(cat "$FP_CPU_SCALING_GOV" | grep -ci -m1 'interactive') == 1 )); then

whiptail_menu_array+=("interactive" "Scales CPU frequency between $frequency_min_cpu_governor MHz and $frequency_max_cpu_governor MHz.")
Description+="\nInteractive | Dynamic CPU frequency based on usage."

fi

Expand Down Expand Up @@ -4415,8 +4416,8 @@ _EOF_

whiptail_menu_array+=("none" "Disables HDMI + 3.5mm Analogue")

# NanoPi M2/M3, BPi Pro, OPi Zero, Rock64
elif (( $HW_MODEL == 32 || $HW_MODEL == 43 || $HW_MODEL == 51 || $HW_MODEL == 61 || $HW_MODEL == 62 )); then
# NanoPi M2/M3, BPi Pro, OPi Zero
elif (( $HW_MODEL == 32 || $HW_MODEL == 51 || $HW_MODEL == 61 || $HW_MODEL == 62 )); then

whiptail_menu_array+=("default" "3.5mm Analogue")

Expand Down Expand Up @@ -4474,7 +4475,8 @@ _EOF_
whiptail_menu_array+=("allo-boss-dac-pcm512x-audio" "Allo Mini Boss DAC")
whiptail_menu_array+=("allo-digione" "Allo DigiOne")
whiptail_menu_array+=("allo-piano-dac-pcm512x-audio" "Allo Piano DAC")
whiptail_menu_array+=("allo-piano-dac-plus-pcm512x-audio" "Allo Piano DAC 2.1")
whiptail_menu_array+=("allo-piano-dac-pcm512x-audio" "Allo Piano DAC")
whiptail_menu_array+=("googlevoicehat-soundcard" "Google AIY voice kit")
whiptail_menu_array+=("hifiberry-amp" "HifiBerry AMP / AMP+")
whiptail_menu_array+=("hifiberry-dac" "HifiBerry DAC / MiniAMP")
whiptail_menu_array+=("hifiberry-dacplus" "HifiBerry DAC+ / DAC+ Pro")
Expand Down Expand Up @@ -4503,7 +4505,7 @@ _EOF_
# - Rock64
elif (( $HW_MODEL == 43 )); then

whiptail_menu_array+=("rock64-hdmi" "HDMI")
whiptail_menu_array+=("rock64-analogue" "3.5MM")

# NanoPi M2/M3
elif (( $HW_MODEL == 61 || $HW_MODEL == 62 )); then
Expand Down Expand Up @@ -4754,9 +4756,9 @@ _EOF_
if (( $(df -h | grep -ci -m1 '/mnt/samba') == 1 )); then

#Get stats
sambaclient_mounted_size=$(df -h | grep -m1 '/mnt/samba' | awk '{ print $2 }')
sambaclient_mounted_used=$(df -h | grep -m1 '/mnt/samba' | awk '{ print $3 }')
sambaclient_mounted_free=$(df -h | grep -m1 '/mnt/samba' | awk '{ print $4 }')
sambaclient_mounted_size=$(df -h | grep -m1 '/mnt/samba' | awk '{print $(NF-4)}')
sambaclient_mounted_used=$(df -h | grep -m1 '/mnt/samba' | awk '{print $(NF-3)}')
sambaclient_mounted_free=$(df -h | grep -m1 '/mnt/samba' | awk '{print $(NF-2)}')
sambaclient_status="/mnt/samba | Size $sambaclient_mounted_size | Used $sambaclient_mounted_used | Free $sambaclient_mounted_free"

fi
Expand Down
43 changes: 19 additions & 24 deletions dietpi/dietpi-letsencrypt
Original file line number Diff line number Diff line change
Expand Up @@ -45,36 +45,25 @@
DP_LOGFILE="/var/log/dietpi-letsencrypt.log"
DP_MONTHLY_CRON="/etc/cron.monthly/dietpi-letsencrypt"
DP_LETSENCRYPT_BINARY="/usr/bin/certbot"
DP_LETSENCRYPT_SCRIPTS="/etc/certbot_scripts"
if (( $DISTRO < 4 )); then
DP_LETSENCRYPT_BINARY="/etc/certbot_scripts/certbot-auto"
fi
DP_WEBSERVER_INDEX=0 #0=apache2 1=lighttpd 2=nginx 3=minio

LETSENCRYPT_INSTALLED=0
if [[ $DISTRO == 4 ]]; then
if [ -f "$DP_LETSENCRYPT_BINARY" ]; then
LETSENCRYPT_INSTALLED=1
fi
else
if [ -d "$DP_LETSENCRYPT_SCRIPTS" ]; then
LETSENCRYPT_INSTALLED=1
fi
if [ -f "$DP_LETSENCRYPT_BINARY" ]; then
LETSENCRYPT_INSTALLED=1
fi

LETSENCRYPT_DOMAIN="mydomain.com"
LETSENCRYPT_EMAIL="[email protected]"
LETSENCRYPT_REDIRECT=0
LETSENCRYPT_AUTORENEW=0
LETSENCRYPT_KEYSIZE=2048
LETSENCRYPT_KEYSIZE=4096

Run_Lets_Encrypt(){

/DietPi/dietpi/func/dietpi-notify 3 "$PROGRAM_NAME" "Running cert"

if [[ ! $DISTRO == 4 ]]; then

cd "$DP_LETSENCRYPT_SCRIPTS"

fi

#Conditions that must be met before allowing run
local run_conditions_met=1

Expand All @@ -85,6 +74,9 @@

DP_WEBSERVER_INDEX=0
/DietPi/dietpi/func/dietpi-notify 0 "Apache2 webserver detected"
if (( $DISTRO >= 4 )); then
DP_LETSENCRYPT_BINARY="$DP_LETSENCRYPT_BINARY --apache"
fi

elif (( $(ps aux | grep -ci -m1 '[l]ighttpd') )); then

Expand All @@ -95,6 +87,9 @@

DP_WEBSERVER_INDEX=2
/DietPi/dietpi/func/dietpi-notify 0 "Nginx webserver detected"
if (( $DISTRO >= 4 )); then
DP_LETSENCRYPT_BINARY="$DP_LETSENCRYPT_BINARY --nginx"
fi

elif (( $(ps aux | grep -ci -m1 '[m]inio') )); then

Expand Down Expand Up @@ -150,7 +145,7 @@
fi

#Cert me up Apache2
./certbot-auto --duplicate --agree-tos $cli_redirect --rsa-key-size $LETSENCRYPT_KEYSIZE --email $LETSENCRYPT_EMAIL -d $LETSENCRYPT_DOMAIN
$DP_LETSENCRYPT_BINARY --duplicate --agree-tos $cli_redirect --rsa-key-size $LETSENCRYPT_KEYSIZE --email $LETSENCRYPT_EMAIL -d $LETSENCRYPT_DOMAIN

#------------------------------------------------------------------------------------------------------
#Lighttpd
Expand All @@ -159,7 +154,7 @@
# - Cert me up
/DietPi/dietpi/dietpi-services stop

./certbot-auto certonly --standalone --duplicate --agree-tos $cli_redirect --rsa-key-size $LETSENCRYPT_KEYSIZE --email $LETSENCRYPT_EMAIL -d $LETSENCRYPT_DOMAIN
$DP_LETSENCRYPT_BINARY certonly --standalone --duplicate --agree-tos $cli_redirect --rsa-key-size $LETSENCRYPT_KEYSIZE --email $LETSENCRYPT_EMAIL -d $LETSENCRYPT_DOMAIN

# - Create combined key
cd /etc/letsencrypt/live/"$LETSENCRYPT_DOMAIN"
Expand Down Expand Up @@ -219,7 +214,7 @@ _EOF_
fi

#Cert me up Nginx
certbot --nginx --duplicate --agree-tos $cli_redirect --rsa-key-size $LETSENCRYPT_KEYSIZE --email $LETSENCRYPT_EMAIL -d $LETSENCRYPT_DOMAIN
$DP_LETSENCRYPT_BINARY --duplicate --agree-tos $cli_redirect --rsa-key-size $LETSENCRYPT_KEYSIZE --email $LETSENCRYPT_EMAIL -d $LETSENCRYPT_DOMAIN


#------------------------------------------------------------------------------------------------------
Expand All @@ -228,7 +223,7 @@ _EOF_
# - Cert me up
/DietPi/dietpi/dietpi-services stop

./certbot-auto certonly --standalone --preferred-challenges tls-sni --staple-ocsp --agree-tos $cli_redirect --rsa-key-size $LETSENCRYPT_KEYSIZE --email $LETSENCRYPT_EMAIL -d $LETSENCRYPT_DOMAIN
$DP_LETSENCRYPT_BINARY certonly --standalone --preferred-challenges tls-sni --staple-ocsp --agree-tos $cli_redirect --rsa-key-size $LETSENCRYPT_KEYSIZE --email $LETSENCRYPT_EMAIL -d $LETSENCRYPT_DOMAIN

# Locate them correctly (THIS didn't work as symlinks)
cp /etc/letsencrypt/live/$LETSENCRYPT_DOMAIN/fullchain.pem /home/minio-user/.minio/certs/public.crt
Expand Down Expand Up @@ -274,7 +269,7 @@ _EOF_

#------------------------------------------------------------------------------------------------------
#ALL | Create cron job
if (( $LETSENCRYPT_AUTORENEW )); then
if (( $LETSENCRYPT_AUTORENEW && $DISTRO < 4 )); then

cat << _EOF_ > "$DP_MONTHLY_CRON"
#!/bin/bash
Expand Down Expand Up @@ -483,13 +478,13 @@ _EOF_
#Menu
if (( $INPUT == 0 )); then

/DietPi/dietpi/func/dietpi-notify 1 "Certbot scripts not found ( $DP_LETSENCRYPT_SCRIPTS )"
/DietPi/dietpi/func/dietpi-notify 1 "Certbot binary not found ( $DP_LETSENCRYPT_BINARY )"
/DietPi/dietpi/func/dietpi-notify 2 "Please install Certbot with DietPi-Software before running this program."
read -p "Press any key to continue....."

else

echo -e "Error: Lets encrypt scripts not installed ( $DP_LETSENCRYPT_SCRIPTS )." >> "$DP_LOGFILE"
echo -e "Error: Letsencrypt binary not installed ( $DP_LETSENCRYPT_BINARY )." >> "$DP_LOGFILE"

fi

Expand Down
6 changes: 6 additions & 0 deletions dietpi/dietpi-obtain_hw_model
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
# HW_MODEL 100 Asus Tinker Board
# HW_MODEL 90 A20-OLinuXino-MICRO
# HW_MODEL 80 Cubieboard 3
# HW_MODEL 71 Beagle Bone Black
# HW_MODEL 70 Sparky SBC
# HW_MODEL 66 NanoPi M1 Plus
# HW_MODEL 65 NanoPi NEO 2
Expand Down Expand Up @@ -397,6 +398,11 @@
HW_MODEL_DESCRIPTION='Cubieboard 3'
IMAGE_ADDITIONAL_CREDITS='ARMbian'

#Beagle Bone Black
elif (( $HW_MODEL == 71 )); then

HW_MODEL_DESCRIPTION='BBB'

#Sparky SBC
elif (( $HW_MODEL == 70 )); then

Expand Down
5 changes: 5 additions & 0 deletions dietpi/dietpi-process_tool
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,9 @@
aNAME[$index]='Emby Server';aPROCESS_NAME[$index]='emby-server';((index++))
aNAME[$index]='EmonHUB';aPROCESS_NAME[$index]='emonhub';((index++))
aNAME[$index]='FuguHub';aPROCESS_NAME[$index]='bdd';((index++))
aNAME[$index]='Gitea';aPROCESS_NAME[$index]='gitea';((index++))
aNAME[$index]='Gogs';aPROCESS_NAME[$index]='gogs';((index++))
aNAME[$index]='Google AIY';aPROCESS_NAME[$index]='main.py';((index++))
aNAME[$index]='Gmediarender';aPROCESS_NAME[$index]='gmediarender';((index++))
aNAME[$index]='Home Assistant';aPROCESS_NAME[$index]='hass';((index++))
aNAME[$index]='HTPC Manager';aPROCESS_NAME[$index]='Htpc.py';((index++))
Expand All @@ -231,6 +233,7 @@
aNAME[$index]='Jconvolver';aPROCESS_NAME[$index]='jconvolver';((index++))
aNAME[$index]='Minio';aPROCESS_NAME[$index]='minio';((index++))
aNAME[$index]='MiniDLNA';aPROCESS_NAME[$index]='minidlna';((index++))
#aNAME[$index]='moOde (worker.php)';aPROCESS_NAME[$index]='worker.php';((index++))
aNAME[$index]='Mopidy';aPROCESS_NAME[$index]='mopidy';((index++))
aNAME[$index]='Mosquitto';aPROCESS_NAME[$index]='mosquitto';((index++))
aNAME[$index]='MotionEye';aPROCESS_NAME[$index]='motioneye';((index++))
Expand All @@ -246,11 +249,13 @@
aNAME[$index]='Open Media Vault';aPROCESS_NAME[$index]='omv-engined';((index++))
aNAME[$index]='OpenSSH Server';aPROCESS_NAME[$index]='sshd';((index++))
aNAME[$index]='OpenVPN Server';aPROCESS_NAME[$index]='openvpn';((index++))
aNAME[$index]='Pi-SPC';aPROCESS_NAME[$index]='sds.sh';((index++))
aNAME[$index]='Pi-hole';aPROCESS_NAME[$index]='dnsmasq';((index++))
aNAME[$index]='Pi-hole FTL';aPROCESS_NAME[$index]='pihole-FTL';((index++))
aNAME[$index]='ProFTP';aPROCESS_NAME[$index]='proftpd';((index++))
aNAME[$index]='qBitTorrent';aPROCESS_NAME[$index]='qbittorrent-nox';((index++))
aNAME[$index]='Radarr';aPROCESS_NAME[$index]='Radarr.exe';((index++))
aNAME[$index]='Raspotify';aPROCESS_NAME[$index]='librespot';((index++))
aNAME[$index]='RoonBridge';aPROCESS_NAME[$index]='RoonBridge';((index++))
aNAME[$index]='RoonBridge (Helper)';aPROCESS_NAME[$index]='RoonBridgeHelper';((index++))
aNAME[$index]='RoonBridge/Server (RAATServer)';aPROCESS_NAME[$index]='RAATServer';((index++))
Expand Down
19 changes: 18 additions & 1 deletion dietpi/dietpi-services
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@
'minio'
'gmrender'
'nukkit'
'gitea'
'pi-spc'
'raspotify'
#'moode-worker'
'voice-recognizer'
'alsa-init'
)

# - User: read custom services file
Expand Down Expand Up @@ -230,7 +236,18 @@
#Apply
if (( ${aSERVICE_AVAILABLE[$i]} == 1 )); then

echo -e "${aSERVICE_NAME[$i]}\t$(systemctl status "${aSERVICE_NAME[$i]}" | grep Active | cut -c12-)"
STATUS="${aSERVICE_NAME[$i]}\t$(systemctl status ${aSERVICE_NAME[$i]} | grep -m1 'Active' | cut -c12-)"

if [[ "$STATUS" =~ .*'failed'.* ]]; then

/DietPi/dietpi/func/dietpi-notify 1 "$STATUS"
systemctl status "${aSERVICE_NAME[$i]}" -l --no-pager

else

/DietPi/dietpi/func/dietpi-notify 0 "$STATUS"

fi

fi

Expand Down
Loading