v6.22

.conf/dps_114/apache.nextcloud.conf

@@ -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

.conf/dps_114/lighttpd.nextcloud.conf

@@ -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

.conf/dps_114/nginx.nextcloud.conf

@@ -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 {
 
@@ -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;
@@ -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
@@ -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;

.conf/dps_128/mpd.conf

@@ -6,8 +6,8 @@ pid_file "/var/run/mpd/pid"
 state_file "/mnt/dietpi_userdata/.mpd_cache/state"
 sticker_file "/mnt/dietpi_userdata/.mpd_cache/sticker.sql"
 
-user "mpd"
-group "dietpi"
+#user "mpd" #Set via service to allow for mpd user to use assigned groups "audio" and "dietpi"
+#group "dietpi" #Set via service to allow for mpd user to use assigned groups "audio" and "dietpi"
 
 bind_to_address "localhost"
 

.conf/dps_6/xorg_xu4.conf

@@ -1,30 +1,36 @@
-Section "Device"
+# X.Org X server configuration file for xf86-video-armsoc-odroid
 
-	Identifier 	"Mali-Fbdev"
+Section "Device"
+	Identifier	"Mali-Fbdev"
 	Driver		"armsoc"
-	Option		"fbdev"           	"/dev/fb0"
-	Option  	"Debug" 		"false"
+	Option		"fbdev"			"/dev/fb0"
+	Option		"Debug"			"false"
 	Option		"DPMS"			"false"
-	Option		"Fimg2DExa"		"true"
-	Option		"DRI2"			"true"
-	Option		"DRI2_PAGE_FLIP"	"false"
-#	Option		"Fimg2DExaSolid"	"false"
-#	Option		"Fimg2DExaCopy"		"false"
-	Option		"Fimg2DExaComposite"	"true"
-    Option          "SWcursorLCD"           "false"
-
+	Option		"NoFlip"		"true"
+	Option		"NoHardwareMouse"	"true"
+	Option		"NoG2D"			"false"
 EndSection
 
 Section "Screen"
-
-	Identifier   "Default Screen"
-	Device       "Mali-Fbdev"
-	DefaultDepth 24
-
+	Identifier	"Default Screen"
+	Device		"Mali-Fbdev"
+	DefaultDepth	24
 EndSection
 
 Section "DRI"
-
 	Mode 0666
+EndSection
+
+Section "Monitor"
+	Identifier	"Generic Monitor"
+	Option		"DPMS"			"Off"
+EndSection
 
+## disable automatic HDMI turn off
+Section "ServerLayout"
+	Identifier	"DefaultLayout"
+	Option		"BlankTime"		"0"
+	Option		"StandbyTime"		"0"
+	Option		"SuspendTime"		"0"
+	Option		"OffTime"		"0"
 EndSection

.conf/dps_65/netdata.service

@@ -3,8 +3,11 @@
 [Unit]
 Description=Real time performance monitoring
 
+# Pull in non-static network-online.target
+Wants=network-online.target
+
 # append here other services you want netdata to wait for them to start
-After=network-online.target httpd.service squid.service nfs-server.service mysqld.service mysql.service named.service postfix.service chronyd.service
+After=network-online.target httpd.service squid.service nfs-server.service mysqld.service mysql.service mariadb.service named.service postfix.service chronyd.service
 
 [Service]
 Type=simple

.conf/dps_85/nginx.conf

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

.conf/dps_85/nginx.default

@@ -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;

.github/ISSUE_TEMPLATE/feature_request.md

@@ -21,3 +21,6 @@ about: Suggest an idea for this project
 #### Additional context
 <!-- Add any other context or screenshots about the feature request here.-->
 - ...
+
+#### Vote for this feature on FeatHub: https://feathub.com/MichaIng/DietPi/
+<!-- Optional: Add your request to our FeatHub page as well and replace the above link accordinly.-->

.github/ISSUE_TEMPLATE/image_request.md

@@ -21,3 +21,6 @@ about: Suggest a new SBC to be added to the offial support and image list of Die
 #### If not, are there install instructions for Debian available?
 <!-- EG: https://github.com/drtyhlpr/rpi23-gen-image/https://github.com/Debian/raspi3-image-spec -->
 - ...
+
+#### Vote for this iamge on FeatHub: https://feathub.com/MichaIng/DietPi/
+<!-- Optional: Add your request to our FeatHub page as well and replace the above link accordinly.-->

.github/ISSUE_TEMPLATE/software_request.md

@@ -35,3 +35,6 @@ about: Suggest a software title to be added to DietPi-Software
 #### Are you willing to help maintaining the software installation, e.g. in case of needed setup changes due to updates etc.? This is not needed, but could speed up our decision to implement it, as man power is always a topic :wink:.
 <!-- EG: Yes, I could help out with this, e.g. if I experience issues. / Sorry, I am totally unexperienced in bash coding. -->
 - ...
+
+#### Vote for this software on FeatHub: https://feathub.com/MichaIng/DietPi/
+<!-- Optional: Add your request to our FeatHub page as well and replace the above link accordinly.-->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,12 +1,12 @@
 <!--
 Before submitting a pull request:
-- Please ensure the target branch is "dev" (active development): https://github.com/Fourdee/DietPi/tree/dev
+- Please ensure the target branch is "dev" (active development): https://github.com/MichaIng/DietPi/tree/dev
 - Please ensure changes have been tested and verified functional.
 -->
 **Status**: WIP | Testing | Ready | ?
 - [ ] Example task 1
 
-**Reference**: https://github.com/Fourdee/DietPi/issues/XXXX
+**Reference**: https://github.com/MichaIng/DietPi/issues/XXXX
 
 **Commit list/description**:
 <!--

.meta/dietpi-cloud-migration

@@ -1,79 +1,70 @@
 #!/bin/bash
 
-(( $UID )) && echo -e '[\e[31mFAILED\e[0m] Root privileges required. Please run the command with "sudo".\n' && exit 1
+(( $UID )) && echo -e '[\e[31mFAILED\e[0m] Root privileges required. Please run the script with "sudo".\n' && exit 1
 echo -e '[\e[32m  OK  \e[0m] Root privileges verified.'
 
-apt-get install -y rsync
-(( $? )) && echo -e '[\e[31mFAILED\e[0m] Installation of rsync failed. Please check your internet connection, proper apt-get function or try to install it manually: "apt-get install -y rsync"\n' && exit 1
+! apt-get install -y rsync && echo -e '[\e[31mFAILED\e[0m] "rsync" install failed. Please check your internet connection, proper apt-get function or try to install it manually: "apt-get install -y rsync"\n' && exit 1
 echo -e '[\e[32m  OK  \e[0m] Successfully installed rsync.'
 
 run_backup(){
 
-	echo '[ INFO ] Enabling maintenance mode...'
-	sudo -u www-data php /var/www/$1/occ maintenance:mode --on
-	(( $? )) && echo -e '[\e[31mFAILED\e[0m] Could not enable maintenance mode, please check running state of your instance and PHP functionality.\n' && exit 1
-
 	fp_config="/var/www/$1/config/config.php"
 
-	echo "[ INFO ] Scanning $fp_config for necessary information..."
-	[[ ! -f $fp_config ]] && echo -e "[\e[31mFAILED\e[0m] File $fp_config not found, please check your installation.\n" && exit 1
+	echo '[ INFO ] Enabling maintenance mode...'
+	! sudo -u www-data php /var/www/$1/occ maintenance:mode --on && echo -e '[\e[31mFAILED\e[0m] Could not enable maintenance mode, please check running state of your instance and PHP functionality.\n' && exit 1
 
-	local fp_datadir=$(grep -m1 "^[[:blank:]]*'datadirectory'" $fp_config | mawk '{print $3}' | sed "s/[',]//g")
-	local dbname=$(grep -m1 "^[[:blank:]]*'dbname'" $fp_config | mawk '{print $3}' | sed "s/[',]//g")
-	local dbhost=$(grep -m1 "^[[:blank:]]*'dbhost'" $fp_config | mawk '{print $3}' | sed "s/[',]//g")
-	local dbuser=$(grep -m1 "^[[:blank:]]*'dbuser'" $fp_config | mawk '{print $3}' | sed "s/[',]//g")
-	local dbpass=$(grep -m1 "^[[:blank:]]*'dbpassword'" $fp_config | mawk '{print $3}' | sed "s/[',]//g")
+	echo "[ INFO ] Scanning $fp_config for necessary information..."
+	local fp_datadir=$(grep -m1 "^[[:blank:]]*'datadirectory'" $fp_config | cut -d \' -f 4)
+	local dbname=$(grep -m1 "^[[:blank:]]*'dbname'" $fp_config | cut -d \' -f 4)
+	local dbhost=$(grep -m1 "^[[:blank:]]*'dbhost'" $fp_config | cut -d \' -f 4)
+	local dbuser=$(grep -m1 "^[[:blank:]]*'dbuser'" $fp_config | cut -d \' -f 4)
+	local dbpass=$(grep -m1 "^[[:blank:]]*'dbpassword'" $fp_config | cut -d \' -f 4)
 	echo -e " - data directory:	$fp_datadir
  - database name:	$dbname
  - database hostname:	$dbhost
  - database username:	$dbuser
  - database password:	$dbpass"
 
 	echo '[ INFO ] Backup database to data directory...'
-	mysqldump -u"$dbuser" -h"$dbhost" -p"$dbpass" "$dbname" > "$fp_datadir"/dietpi-$1-database-backup.sql
-	(( $? )) && echo -e '[\e[31mFAILED\e[0m] Database backup seems to have failed. Check state of your database server, check logs and in case repair table corruptions.\n' && exit 1
+	! mysqldump -u"$dbuser" -h"$dbhost" -p"$dbpass" "$dbname" > "$fp_datadir"/dietpi-$1-database-backup.sql && echo -e '[\e[31mFAILED\e[0m] Database backup failed, please check state of your database server, check logs and in case repair table corruptions.\n' && exit 1
 	echo -e "[\e[32m  OK  \e[0m] Successfully finished database backup to: $fp_datadir/dietpi-$1-database-backup.sql"
 
 	echo '[ INFO ] Backup installation folder to data directory...'
-	rsync -aHp --delete /var/www/$1/ "$fp_datadir"/dietpi-$1-installation-backup
-	(( $? )) && echo -e '[\e[31mFAILED\e[0m] Rsync failed, check for error reasons and try again.\n' && exit 1
+	! rsync -aHp --delete /var/www/$1/ "$fp_datadir"/dietpi-$1-installation-backup && echo -e '[\e[31mFAILED\e[0m] "rsync" failed, please check for error reasons and try again.\n' && exit 1
 	echo -e "[\e[32m  OK  \e[0m] Successfully finished installation backup to: $fp_datadir/dietpi-$1-installation-backup/"
 
 	if [[ $2 ]]; then
 
 		echo '[ INFO ] You provided an additional backup location. Moving data directory...'
-		[[ ! -d $2 ]] && echo -e "[\e[31mFAILED\e[0m] $2 is no directory, please check spelling and mount status of your desired backup location.\n" && exit 1
+		[[ ! -d $2 ]] && echo -e "[\e[31mFAILED\e[0m] $2 is no existing directory, please check spelling and mount status of your desired backup drive.\n" && exit 1
 
-		rsync -aHp --delete "$fp_datadir"/ "$2"
-		(( $? )) && echo -e '[\e[31mFAILED\e[0m] Rsync failed, check for error reasons and try again.\n' && exit 1
+		! rsync -aHp --delete "$fp_datadir"/ "$2" && echo -e '[\e[31mFAILED\e[0m] "rsync" failed, please check for error reasons and try again.\n' && exit 1
 		echo -e "[\e[32m  OK  \e[0m] Successfully synced data directory to: $2"
 
 	else
 
-		echo '[ INFO ] You did not provide an additional backup location. We assume your data directory is already on an external drive, ready for migration? If not, move it there or rerun this script, providing the external backup location as argument.'
+		echo '[ INFO ] You did not provide an additional backup location. We assume your data directory is already on an external drive, ready for migration? If not, move it there, or, rerun this script with the desired external backup path as argument.'
 
 	fi
 
-	echo -e "[\e[32m  OK  \e[0m] Backup successfully completed. On destination server, please move the whole data directory to the one, provided within /DietPi/dietpi.txt (default: \"/mnt/dietpi_userdata/$1_data\"), or create a symlink from there. On reinstallation, DietPi-Software will check this location for backups and in case automatically restore them."
+	echo -e "[\e[32m  OK  \e[0m] Backup successfully completed. On destination server, please move the whole data directory to the one, provided within /DietPi/dietpi.txt (default: \"/mnt/dietpi_userdata/$1_data\"), or create a symlink from there. On reinstall, DietPi-Software will check this location for backups and in case automatically restore them."
 
 }
 
 ### MAIN ###
 
-[[ ! -f /DietPi/dietpi/.installed ]] && echo -e '[\e[31mFAILED\e[0m] No proper DietPi installation found or DietPi-RamDisk is not running. Please ensure you are executing this script from a functional DietPi system and "dietpi-ramdisk" is up.\n' && exit 1
-
-if grep -q 'aSOFTWARE_INSTALL_STATE\[47\]=2' /DietPi/dietpi/.installed; then
+if [[ -f /var/www/owncloud/config/config.php ]]; then
 
 	echo '[ INFO ] ownCloud installation found, preparing backup...'
 	run_backup owncloud "$1"
 
 fi
 
-if grep -q 'aSOFTWARE_INSTALL_STATE\[114\]=2' /DietPi/dietpi/.installed; then
+if [[ -f /var/www/nextcloud/config/config.php ]]; then
 
         echo '[ INFO ] Nextcloud installation found, preparing backup...'
         run_backup nextcloud "$1"
 
 fi
 
-[[ ! $fp_config ]] && echo -e "[\e[31mFAILED\e[0m] No ownCloud or Nextcloud installation found. Please verify that it was installed via dietpi-software, in case reinstall it, non of your existing data/settings will be overwritten.\n" && exit 1
+[[ ! $fp_config ]] && echo -e '[\e[31mFAILED\e[0m] No ownCloud or Nextcloud instance found at /var/www/owncloud|nextcloud. Aborting...\n' && exit 1