Skip to content

Commit

Permalink
v6.22 (#2640)
Browse files Browse the repository at this point in the history 
Beta v6.22.1
  • Loading branch information
@MichaIng
MichaIng authored Mar 16, 2019
2 parents eb1bff6 + 14471cb commit fd61fca
Show file tree
Hide file tree
Showing 25 changed files with 722 additions and 747 deletions.
4 changes: 4 additions & 0 deletions .conf/dps_114/apache.nextcloud.conf
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Based on: https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#apache-web-server-configuration

# Redirect OCM/OCS provider requests to Nextcloud endpoint:
Redirect permanent /ocm-provider /nextcloud/ocm-provider
Redirect permanent /ocs-provider /nextcloud/ocs-provider

<Directory /var/www/nextcloud/>
Options +FollowSymlinks
AllowOverride All
Expand Down
6 changes: 6 additions & 0 deletions .conf/dps_114/lighttpd.nextcloud.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
# - Apache: https://github.com/nextcloud/server/blob/master/.htaccess
# - Nginx: https://docs.nextcloud.com/server/stable/admin_manual/installation/nginx.html

# Redirect OCM/OCS provider requests to Nextcloud endpoint:
url.redirect += (
"^/ocm-provider" => "/nextcloud/ocm-provider",
"^/ocs-provider" => "/nextcloud/ocs-provider"
)

$HTTP["url"] =~ "^/nextcloud($|/)" {

# Hardening
Expand Down
21 changes: 13 additions & 8 deletions .conf/dps_114/nginx.nextcloud.conf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# Based on: https://docs.nextcloud.com/server/stable/admin_manual/installation/nginx.html
# Based on: https://docs.nextcloud.com/server/stable/admin_manual/installation/nginx.html#nextcloud-in-a-subdir-of-nginx

# Redirect OCM/OCS provider requests to Nextcloud endpoint:
location ~ ^\/(?:ocm-provider|ocs-provider).* {
rewrite ^ /nextcloud$request_uri;
}

location ^~ /nextcloud {

Expand Down Expand Up @@ -34,15 +39,15 @@ location ^~ /nextcloud {
rewrite ^ /nextcloud/index.php$request_uri;
}

location ~ ^/nextcloud/(?:build|tests|config|lib|3rdparty|templates|data)/ {
location ~ ^\/nextcloud\/(?:build|tests|config|lib|3rdparty|templates|data)\/ {
deny all;
}
location ~ ^/nextcloud/(?:\.|autotest|occ|issue|indie|db_|console) {
location ~ ^\/nextcloud\/(?:\.|autotest|occ|issue|indie|db_|console) {
deny all;
}

location ~ ^/nextcloud/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+)\.php(?:$|/) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
location ~ ^\/nextcloud\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|ocm-provider\/.+)\.php(?:$|\/) {
fastcgi_split_path_info ^(.+?\.php)(\/.*|)$;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info;
Expand All @@ -59,14 +64,14 @@ location ^~ /nextcloud {
fastcgi_param PHP_ADMIN_VALUE "opcache.memory_consumption=128";
}

location ~ ^/nextcloud/(?:updater|ocs-provider)(?:$|/) {
location ~ ^\/nextcloud\/(?:updater|ocs-provider|ocm-provider)(?:$|\/) {
try_files $uri/ =404;
index index.php;
}

# Adding the cache control header for js and css files
# Make sure it is BELOW the PHP block
location ~ \.(?:css|js|woff|svg|gif)$ {
location ~ ^\/nextcloud\/.+[^\/]\.(?:css|js|woff2?|svg|gif)$ {
try_files $uri /nextcloud/index.php$request_uri;
add_header Cache-Control "public, max-age=15778463";
# Add headers to serve security related headers (It is intended
Expand All @@ -83,7 +88,7 @@ location ^~ /nextcloud {
access_log off;
}

location ~ \.(?:png|html|ttf|ico|jpg|jpeg)$ {
location ~ ^\/nextcloud\/.+[^\/]\.(?:png|html|ttf|ico|jpg|jpeg)$ {
try_files $uri /nextcloud/index.php$request_uri;
# Optional: Don't log access to other assets
access_log off;
Expand Down
6 changes: 0 additions & 6 deletions .conf/dps_85/nginx.default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ server {
try_files $uri $uri/ =404;
}

error_page 404 /404.html;
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root /var/www;
}

location ~ \.php(?:$|/) {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_param PATH_INFO $fastcgi_path_info;
Expand Down
203 changes: 51 additions & 152 deletions .meta/dietpi-survey_report
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,9 @@
aSOFTWARE_NAME[106]='Lidarr'
aSOFTWARE_NAME[107]='rTorrent'
aSOFTWARE_NAME[108]='AmiBerry'
aSOFTWARE_NAME[109]='NFS'
aSOFTWARE_NAME[109]='NFS Server'
aSOFTWARE_NAME[110]='NFS Client'
aSOFTWARE_NAME[111]='UrBackup server'
aSOFTWARE_NAME[111]='UrBackup Server'
aSOFTWARE_NAME[112]='DXX-Rebirth'
aSOFTWARE_NAME[113]='Chromium'
aSOFTWARE_NAME[114]='Nextcloud'
Expand Down Expand Up @@ -320,7 +320,7 @@
aSOFTWARE_NAME[160]='Allo_update'
aSOFTWARE_NAME[161]='FuguHub'
aSOFTWARE_NAME[162]='Docker'
aSOFTWARE_NAME[163]='Gmediarender'
aSOFTWARE_NAME[163]='GMediaRender'
aSOFTWARE_NAME[164]='Nukkit'
aSOFTWARE_NAME[165]='Gitea'
aSOFTWARE_NAME[166]='PI-SPC'
Expand Down Expand Up @@ -406,7 +406,7 @@

fi

# v6.10+: files can be sourced:
# Source survey files
if grep -q '^#!/bin/bash' $file; then

. $file
Expand Down Expand Up @@ -474,8 +474,6 @@

fi

continue

fi

done
Expand Down Expand Up @@ -765,7 +763,7 @@
<h4>DietPi versions:</h4>
<table>
$(for i in "${!aDIETPI_VERSION[@]}"; do echo "<tr><td>DietPi v${i//6.9/6.09}</td><td align=\"right\"> ${aDIETPI_VERSION[$i]}</td></tr>"; done | sort -nrk 1.17,1.20 -t ' ')
$(for i in "${!aDIETPI_VERSION[@]}"; do echo "<tr><td>DietPi v$i</td><td align=\"right\"> ${aDIETPI_VERSION[$i]}</td></tr>"; done | sort -nrk 1.17,1.20 -t ' ')
</table>
<h4>Git branches:</h4>
Expand Down Expand Up @@ -800,7 +798,7 @@
<h4>DietPi-Automation:</h4>
<table>
<tr><td>Used by</td><td align="right">${aAUTO_SETUP_AUTOMATED[1]} of $((${aAUTO_SETUP_AUTOMATED[1]} + ${aAUTO_SETUP_AUTOMATED[0]})) users</td></tr>
<tr><td>Used by</td><td align="right">${aAUTO_SETUP_AUTOMATED[1]} of $((${aAUTO_SETUP_AUTOMATED[1]} + ${aAUTO_SETUP_AUTOMATED[0]})) installs</td></tr>
</table>
<h4>Network interfaces:</h4>
Expand All @@ -813,172 +811,73 @@
$(for i in "${!aSOFTWARE[@]}"; do echo "<tr><td>$i</td><td align=\"right\"> ${aSOFTWARE[$i]}</td></tr>"; done | sort -nrk 2 -t ' ')
</table>
<h4 id="benchmark">DietPi-Benchmarks | CPU:</h4>
<table>
<tr>
<td colspan="2">
</td>
<td colspan="3" bgcolor="#5B5B5B">
CPU time (seconds, lower is faster):
</td>
<td colspan="3" bgcolor="#5B5B5B">
CPU idle temp ('c):
</td>
<td colspan="3" bgcolor="#5B5B5B">
CPU full load temp ('c):
</td>
</td>
<td colspan="2"/>
<td colspan="3" bgcolor="#5B5B5B">CPU time (seconds, lower is faster):</td>
<td colspan="3" bgcolor="#5B5B5B">CPU idle temp ('c):</td>
<td colspan="3" bgcolor="#5B5B5B">CPU full load temp ('c):</td>
</tr>
<tr>
<td bgcolor="#5B5B5B">
Device:
</td>
<td bgcolor="#5B5B5B">
Total benchmarks:
</td>
<td bgcolor="#4C5100">
Average:
</td>
<td bgcolor="#135100">
Fastest:
</td>
<td bgcolor="#510000">
Slowest:
</td>
<td bgcolor="#4C5100">
Average:
</td>
<td bgcolor="#135100">
Lowest:
</td>
<td bgcolor="#510000">
Highest:
</td>
<td bgcolor="#4C5100">
Average:
</td>
<td bgcolor="#135100">
Lowest:
</td>
<td bgcolor="#510000">
Highest:
</td>
<td bgcolor="#5B5B5B">Device:</td>
<td bgcolor="#5B5B5B">Total benchmarks:</td>
<td bgcolor="#4C5100">Average:</td>
<td bgcolor="#135100">Fastest:</td>
<td bgcolor="#510000">Slowest:</td>
<td bgcolor="#4C5100">Average:</td>
<td bgcolor="#135100">Lowest:</td>
<td bgcolor="#510000">Highest:</td>
<td bgcolor="#4C5100">Average:</td>
<td bgcolor="#135100">Lowest:</td>
<td bgcolor="#510000">Highest:</td>
</tr>
$(for i in "${!aBENCH_COMMON_INDEX[@]}"; do echo "<tr><td>${aHW_NAME[$i]:=$i}</td> <td>${aBENCH_COMMON_INDEX[$i]}</td> <td>${aBENCH_RESULT_CPU_AVG[$i]}</td> <td>${aBENCH_RESULT_CPU_MIN[$i]}</td> <td>${aBENCH_RESULT_CPU_MAX[$i]}</td> <td>${aBENCH_RESULT_CPU_TEMP_START_AVG[$i]}</td> <td>${aBENCH_RESULT_CPU_TEMP_START_MIN[$i]}</td> <td>${aBENCH_RESULT_CPU_TEMP_START_MAX[$i]}</td> <td>${aBENCH_RESULT_CPU_TEMP_END_AVG[$i]}</td> <td>${aBENCH_RESULT_CPU_TEMP_END_MIN[$i]}</td> <td>${aBENCH_RESULT_CPU_TEMP_END_MAX[$i]}</td> </tr>"; done | sort -nk 1 -t ' ')
</table>
<h4>DietPi-Benchmarks | IO (Filesystem & RAM):</h4>
<table>
<tr>
<td colspan="2">
</td>
<td colspan="3" bgcolor="#5B5B5B">
RootFS write (MB/s):
</td>
<td colspan="3" bgcolor="#5B5B5B">
RootFS read (MB/s):
</td>
<td colspan="3" bgcolor="#5B5B5B">
RAM write (MB/s):
</td>
<td colspan="3" bgcolor="#5B5B5B">
RAM read (MB/s):
</td>
</td>
<td colspan="2"/>
<td colspan="3" bgcolor="#5B5B5B">RootFS write (MB/s):</td>
<td colspan="3" bgcolor="#5B5B5B">RootFS read (MB/s):</td>
<td colspan="3" bgcolor="#5B5B5B">RAM write (MB/s):</td>
<td colspan="3" bgcolor="#5B5B5B">RAM read (MB/s):</td>
</tr>
<tr>
<td bgcolor="#5B5B5B">
Device:
</td>
<td bgcolor="#5B5B5B">
Total benchmarks:
</td>
<td bgcolor="#4C5100">
Average:
</td>
<td bgcolor="#135100">
Fastest:
</td>
<td bgcolor="#510000">
Slowest:
</td>
<td bgcolor="#4C5100">
Average:
</td>
<td bgcolor="#135100">
Fastest:
</td>
<td bgcolor="#510000">
Slowest:
</td>
<td bgcolor="#4C5100">
Average:
</td>
<td bgcolor="#135100">
Fastest:
</td>
<td bgcolor="#510000">
Slowest:
</td>
<td bgcolor="#4C5100">
Average:
</td>
<td bgcolor="#135100">
Fastest:
</td>
<td bgcolor="#510000">
Slowest:
</td>
<td bgcolor="#5B5B5B">Device:</td>
<td bgcolor="#5B5B5B">Total benchmarks:</td>
<td bgcolor="#4C5100">Average:</td>
<td bgcolor="#135100">Fastest:</td>
<td bgcolor="#510000">Slowest:</td>
<td bgcolor="#4C5100">Average:</td>
<td bgcolor="#135100">Fastest:</td>
<td bgcolor="#510000">Slowest:</td>
<td bgcolor="#4C5100">Average:</td>
<td bgcolor="#135100">Fastest:</td>
<td bgcolor="#510000">Slowest:</td>
<td bgcolor="#4C5100">Average:</td>
<td bgcolor="#135100">Fastest:</td>
<td bgcolor="#510000">Slowest:</td>
</tr>
$(for i in "${!aBENCH_COMMON_INDEX[@]}"; do echo "<tr><td>${aHW_NAME[$i]:=$i}</td> <td>${aBENCH_COMMON_INDEX[$i]}</td> <td>${aBENCH_RESULT_ROOTFS_WRITE_AVG[$i]}</td> <td>${aBENCH_RESULT_ROOTFS_WRITE_MAX[$i]}</td> <td>${aBENCH_RESULT_ROOTFS_WRITE_MIN[$i]}</td> <td>${aBENCH_RESULT_ROOTFS_READ_AVG[$i]}</td> <td>${aBENCH_RESULT_ROOTFS_READ_MAX[$i]}</td> <td>${aBENCH_RESULT_ROOTFS_READ_MIN[$i]}</td> <td>${aBENCH_RESULT_RAM_WRITE_AVG[$i]}</td> <td>${aBENCH_RESULT_RAM_WRITE_MAX[$i]}</td> <td>${aBENCH_RESULT_RAM_WRITE_MIN[$i]}</td> <td>${aBENCH_RESULT_RAM_READ_AVG[$i]}</td> <td>${aBENCH_RESULT_RAM_READ_MAX[$i]}</td> <td>${aBENCH_RESULT_RAM_READ_MIN[$i]}</td> </tr>"; done | sort -nk 1 -t ' ')
</table>
<h4 id="benchmark">DietPi-Benchmarks | Network LAN throughput:</h4>
<h4>DietPi-Benchmarks | Network LAN throughput:</h4>
<table>
<tr>
<td colspan="2">
</td>
<td colspan="3" bgcolor="#5B5B5B">
Transfer rate (MB/s):
</td>
</td>
<td colspan="2"/>
<td colspan="3" bgcolor="#5B5B5B">Transfer rate (MB/s):</td>
</tr>
<tr>
<td bgcolor="#5B5B5B">
Device:
</td>
<td bgcolor="#5B5B5B">
Total benchmarks:
</td>
<td bgcolor="#4C5100">
Average:
</td>
<td bgcolor="#135100">
Fastest:
</td>
<td bgcolor="#510000">
Slowest:
</td>
<td bgcolor="#5B5B5B">Device:</td>
<td bgcolor="#5B5B5B">Total benchmarks:</td>
<td bgcolor="#4C5100">Average:</td>
<td bgcolor="#135100">Fastest:</td>
<td bgcolor="#510000">Slowest:</td>
</tr>
$(for i in "${!aBENCH_LAN_INDEX[@]}"; do echo "<tr><td>${aHW_NAME[$i]:=$i}</td> <td>${aBENCH_LAN_INDEX[$i]}</td> <td>${aBENCH_RESULT_NET_LAN_SPEED_AVG[$i]}</td> <td>${aBENCH_RESULT_NET_LAN_SPEED_MAX[$i]}</td> <td>${aBENCH_RESULT_NET_LAN_SPEED_MIN[$i]}</td> </tr>"; done | sort -nk 1 -t ' ')
</table>
</body>
</html>
_EOF_
Expand Down
9 changes: 8 additions & 1 deletion CHANGELOG.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ v6.22

Changes / Improvements / Optimisations:
- Security | The DietPi-Software global password is now stored with enhanced security which also resolves a warning on Buster systems: https://github.com/MichaIng/DietPi/issues/2213
- System | /etc/bashrc.d/ now allows ".bash" file ending as well. Merged all contained DietPi scripts into one: /etc/bashrc.d/dietpi.bash. https://github.com/MichaIng/DietPi/pull/2636
- General | DietPi scripts now use the lightweight standalone "7zr" command to handle 7z archives. This allows us to lower DietPi core package dependencies from "p7zip-full" to "p7zip".
- General | CPU temps are now displayed in the login banners. If unsupported by current device, free space on RootFS is shown instead. Many thanks to esturniolo for the suggestion: https://twitter.com/esturniolo/status/1104912062298423297
- RPi | DietPi does not set or change "framebuffer_depth" in config.txt anymore which defaults to 16 which works in every known case. It will be re-added as fast as we find a case where another value is required.
- DietPi-NordVPN | Added sent/received usage stats for VPN tunnel.
- DietPi-Sync | Sync will now abort if the source dir is empty. Merged dry run into real sync, as this was performed anyway to do required free space check. When "Sync" is selected, after dry run the user is presented a summary and given the option to view the detailed dry run log, cancel or continue with real sync. Some other minor fixes and enhancements have been applied as well. Many thanks to @midnightwatcher for doing this request: https://dietpi.com/phpbb/viewtopic.php?f=12&t=5588
- DietPi-Software | Emby Server: Now installs the latest version automatically (currently 4.0.2) which as well offers a native ARMv8 package: https://github.com/MichaIng/DietPi/pull/2525
Expand All @@ -18,6 +21,9 @@ Changes / Improvements / Optimisations:
- DietPi-Software | AmiBerry: Updated to latest version (2.25), thanks @midwan: https://github.com/MichaIng/DietPi/issues/2599
- DietPi-Software | Netdata: On Debian Stretch/Buster and Raspbian Buster an up-to-date APT package is available, which will now be installed instead of our custom build. Many thanks to @74cmonty for this information: https://github.com/MichaIng/DietPi/issues/2446
- DietPi-Software | DietPi-RAMlog: When installing/enabling RAMlog, the /var/log mountpoint will be now cleaned before mounting the tmpfs on it, while preserving the existing logs metadata. This resolves a warning on early boot stage and frees the disk space consumed by the disk log before.
- DietPi-Software | rTorrent: Runs now as user "rtorrent" and creates files as group "dietpi" with 775/664 permissions. Enabled Buster support and enhanced config file handling on reinstall: https://github.com/MichaIng/DietPi/pull/2633
- DietPi-Software | Plex Media Server: Now installs the latest version automatically (currently 1.15) which as well includes official ARM binaries. Many thanks to @WolfganP for informing us about this new release: https://github.com/MichaIng/DietPi/issues/2553
- DietPi-Software | Nextcloud: Resolved an admin panel warning about missing ocm/ocs-provider redirects. Many thanks to @minnux for reporting this issue: https://github.com/MichaIng/DietPi/issues/2638

Bug Fixes:
- System | Resolved an issue where /etc/bashrc.d entries could be run multiple times. Many thanks to @jonare77 for reporting this issue: https://github.com/MichaIng/DietPi/issues/2529
Expand All @@ -39,7 +45,8 @@ Bug Fixes:
- DietPi-Software | Pi-hole: Resolved an issue where "pihole -up" fails because of wrong file permissions. Many thanks to @jonare77 for resporting this issue: https://github.com/MichaIng/DietPi/issues/2516
- DietPi-Software | MPD: Resolved an issue with failed playback due to permissions. Permissions are now set via systemd service to ensure the MPD user can use both dietpi and audio groups: https://github.com/MichaIng/DietPi/issues/2462
- DietPi-Software | Airsonic: Resolved an issue where during install the FFmpeg transcoder symlink could be placed wrong, leading to a failing Airsonic start. Many thanks to @pecan_pie for reporting this issue: https://dietpi.com/phpbb/viewtopic.php?f=11&t=5637
- DietPi-Software | DietPi-RAMlog: Fixed an issue where logging mode could be set wrong when uninstalling and reinstalling RAMlog. Many thanks to @abecvar for reporting this issue: https://dietpi.com/phpbb/viewtopic.php?f=9&t=5666
- DietPi-Software | DietPi-RAMlog: Fixed an issue where logging mode could be set wrong when uninstalling and reinstalling RAMlog. Many thanks to @abecvar for reporting this issue: https://dietpi.com/phpbb/viewtopic.php?f=9&t=5666
- DietPi-Software | rTorrent: Resolved an issue where the ruTorrent web UI could not connect to the rTorrent daemon. Many thanks to @Chester007 for reporting this issue: https://dietpi.com/phpbb/viewtopic.php?f=11&t=5656

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/pulls?q=is%3Aclosed+base%3Amaster

Expand Down
Loading

0 comments on commit fd61fca

Please sign in to comment.