Beta v6.32.0 (#3733)

.conf/dps_114/apache.nextcloud.conf

@@ -1,6 +1,7 @@
+# Location: /etc/apache2/sites-available/dietpi-nextcloud.conf
 # 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 OCM/OCS provider requests to Nextcloud endpoint
 Redirect permanent /ocm-provider /nextcloud/ocm-provider
 Redirect permanent /ocs-provider /nextcloud/ocs-provider
 
@@ -13,4 +14,7 @@ Redirect permanent /ocs-provider /nextcloud/ocs-provider
  Dav off
  </IfModule>
 
+ # https://github.com/MichaIng/DietPi/issues/3694
+ Header unset Content-Security-Policy
+ Header always unset Content-Security-Policy
 </Directory>

.conf/dps_6/xorg_c2.conf

@@ -1,9 +1,8 @@
-# Provided by @Meveric's setup-odroid: http://fuzon.co.uk/meveric/pool/main/s/setup-odroid/
+# Provided by @Meveric's setup-odroid: https://dietpi.com/meveric/pool/main/s/setup-odroid/
 Section "Device"
  Identifier "FBTURBO"
  Driver "fbturbo"
  Option "fbdev" "/dev/fb0"
-
  Option "SwapbuffersWait" "true"
  Option "alpha_swap" "true"
 EndSection

.conf/dps_85/nginx.conf

@@ -25,8 +25,8 @@ http {
 
  charset utf-8;
 
- # + Nginx - To avoid 2MB upload error: https://github.com/MichaIng/DietPi/issues/546
- client_max_body_size 2000M;
+ # Avoid > 2 MiB upload error: https://github.com/MichaIng/DietPi/issues/546
+ client_max_body_size 512M;
 
  # Upstream to abstract back-end connection(s) for PHP
  upstream php {

.conf/dps_93/apache.pihole.conf

@@ -2,6 +2,12 @@
 
 # Admin panel
 <Directory ~ /var/www(/html)?/admin>
+ # Assure Referrer-Policy is not set to "no-referrer" since
+ # HTTP_ORIGIN != null is required for CORS check: https://github.com/MichaIng/DietPi/issues/3675
+ # In case it's set, replace by second strict policy "same-origin".
+ Header edit Referrer-Policy "no-referrer" "same-origin"
+ Header always edit Referrer-Policy "no-referrer" "same-origin"
+
  # Create response header for Pi-hole debugger
  Header set X-Pi-hole "The Pi-hole Web interface is working!"
  Header set X-Frame-Options "DENY"

.conf/dps_94/conf

@@ -1,50 +1,53 @@
-# D I E T - P I
-# File Location
-# /etc/proftpd/proftpd.conf
+# DietPi ProFTPD default config
+# Location: /etc/proftpd/proftpd.conf
+# Docs: http://www.proftpd.org/docs/directives/linked/configuration.html
 
 # Includes DSO modules
 Include /etc/proftpd/modules.conf
 
-# Set off to disable IPv6 support which is problematic on IPv4 only boxes.
-UseIPv6 on
-# If set on you can experience a longer connection delay in many cases.
-IdentLookups off
+# Set "off" to disable IPv6 support which is problematic on IPv4 only boxes.
+UseIPv6 on
+# If set "on" you can experience a longer connection delay in many cases.
+IdentLookups off
+UseReverseDNS off
 
-ServerName  "DietPi FTP"
-ServerType  standalone
-DeferWelcome  off
+ServerName "DietPi FTP"
+ServerType standalone
+DeferWelcome off
 
-MultilineRFC2228  on
-DefaultServer  on
-ShowSymlinks  on
+MultilineRFC2228 on
+DefaultServer on
+ShowSymlinks on
 
-TimeoutNoTransfer 120
-TimeoutStalled 120
-TimeoutIdle 240
-DisplayLogin welcome.msg
-DisplayChdir .message true
-ListOptions "-l"
+# Permit resuming downloads
+AllowRetrieveRestart On
+# Permit resuming uploads
+AllowStoreRestart On
+TimeoutNoTransfer 120
+TimeoutStalled 120
+TimeoutIdle 240
+DisplayLogin welcome.msg
+DisplayChdir .message true
+ListOptions "-l"
 
-DenyFilter  \*.*/
+DenyFilter \*.*/
 
-DefaultRoot  /mnt/dietpi_userdata
+DefaultRoot /mnt/dietpi_userdata
 
-Port 21
+Port 21
+MaxInstances 8
 
-MaxInstances 8
+RootLogin off
+User dietpi
+Group dietpi
+Umask 002 002
+AllowOverwrite on
 
-RootLogin off
-User dietpi
-Group dietpi
-
-Umask 022 022
-AllowOverwrite on
 TransferLog /var/log/proftpd/xferlog
-SystemLog /var/log/proftpd/proftpd.log
-
-# to stop logging wtmp /var/log/wtmp: No such file or directory -Gordon Williams change
+SystemLog /var/log/proftpd/proftpd.log
+# Stop /var/log/wtmp logging: No such file or directory -Gordon Williams change
 WtmpLog off
-
+# /var/log/lastlog logging
 #UseLastlog on
 
 <IfModule mod_quotatab.c>
@@ -60,11 +63,11 @@ DelayEngine on
 </IfModule>
 
 <IfModule mod_ctrls.c>
-ControlsEngine  off
-ControlsMaxClients  2
-ControlsLog  /var/log/proftpd/controls.log
-ControlsInterval  5
-ControlsSocket  /var/run/proftpd/proftpd.sock
+ControlsEngine off
+ControlsMaxClients 2
+ControlsLog /var/log/proftpd/controls.log
+ControlsInterval 5
+ControlsSocket /run/proftpd/proftpd.sock
 </IfModule>
 
 <IfModule mod_ctrls_admin.c>

.meta/dietpi-fan_control

@@ -465,6 +465,6 @@ EG: To run the fan at 50%, enter\n \"60\"" && STATIC_SPEED=$G_WHIP_RETURNED_
  fi
 
  #-----------------------------------------------------------------------------------
- G_DIETPI-NOTIFY -1 0 "$G_PROGRAM_NAME |" && exit 0
+ G_DIETPI-NOTIFY -1 0 "$G_PROGRAM_NAME" && exit 0
  #-----------------------------------------------------------------------------------
 }