v6.23 (#2744)

Beta v6.23.0

.conf/desktop/apps/opentyrian.desktop

@@ -2,7 +2,7 @@
 Type=Application
 Name=OpenTyrian
 Comment=An arcade-style shoot 'em up
-Icon=/usr/local/games/opentyrian/linux/icons/tyrian-48.png
+Icon=/usr/games/opentyrian/linux/icons/tyrian-48.png
 Categories=Game;ArcadeGame;
-Exec=/usr/local/games/opentyrian/run
+Exec=/usr/games/opentyrian/run
 Terminal=false

.conf/dps_114/apache.nextcloud.conf

@@ -15,7 +15,4 @@ Redirect permanent /ocs-provider /nextcloud/ocs-provider
         SetEnv HOME /var/www/nextcloud
         SetEnv HTTP_HOME /var/www/nextcloud
 
-        # Hard coding 128M OPCache size, only for /nextcloud, to suppress warning on nextcloud admin panel.
-        php_admin_value opcache.memory_consumption 128
-
 </Directory>

.conf/dps_114/lighttpd.nextcloud.conf

@@ -30,7 +30,4 @@ $HTTP["url"] =~ "^/nextcloud($|/)" {
 		)
 	}
 
-	# Solve OPcache settings warning on Nextcloud admin panel
-	setenv.add-environment += ( "PHP_ADMIN_VALUE" => "opcache.memory_consumption=128" )
-
 }

.conf/dps_114/nginx.nextcloud.conf

@@ -60,8 +60,6 @@ location ^~ /nextcloud {
 		fastcgi_intercept_errors on;
 		# Disable on Jessie, because Jessie Nginx does not support this directive
 		#fastcgi_request_buffering off;
-		# Hard coding 128M OPCache size to suppress warning on Nextcloud admin panel.
-		fastcgi_param PHP_ADMIN_VALUE "opcache.memory_consumption=128";
         }
 
 	location ~ ^\/nextcloud\/(?:updater|ocs-provider|ocm-provider)(?:$|\/) {

.conf/dps_121/roonbridge.service

@@ -1,10 +1,8 @@
 [Unit]
-Description=Roon Bridge
+Description=Roon Bridge (DietPi)
 After=network.target sound.target
 
 [Service]
-Type=simple
-User=root
 Group=dietpi
 Environment=ROON_DATAROOT=/mnt/dietpi_userdata/roon
 Environment=ROON_ID_DIR=/mnt/dietpi_userdata/roon

.conf/dps_36/squeezelite.service

@@ -1,8 +1,7 @@
 [Unit]
-Description=squeezelite
+Description=SqueezeLite (DietPi)
 
 [Service]
-Type=simple
 ExecStart=/usr/bin/squeezelite -a 4096:1024:16:0 -C 5 -n 'DietPi-Squeezelite' -f /var/log/squeezelite.log
 
 [Install]

.conf/dps_51/run

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/dash
 #////////////////////////////////////
 # DietPi OpenTyrian Run Script
 #
@@ -12,15 +12,16 @@
 # Usage:
 # run
 #////////////////////////////////////
+FP_DIR='/usr/games/opentyrian'
 
-#Xserver already running
-if (($(pidof X) >= 0)); then
+# Xserver already running
+if pgrep Xorg &> /dev/null; then
 
-	/usr/local/games/opentyrian/opentyrian -t /usr/local/games/opentyrian/data
+	$FP_DIR/opentyrian -t $FP_DIR/data
 
-#No X (init X server)
+# No X (init X server)
 else
 
-	xinit /usr/local/games/opentyrian/opentyrian -t /usr/local/games/opentyrian/data
+	xinit $FP_DIR/opentyrian -t $FP_DIR/data
 
 fi

.conf/dps_85/nginx.conf

@@ -30,7 +30,7 @@ http {
 
 	# Upstream to abstract back-end connection(s) for PHP
 	upstream php {
-		server unix:/run/php/php7.0-fpm.sock;
+		server unix:/run/php/php7.3-fpm.sock;
 	}
 
 	# Set the mime-types via the mime.types external file
@@ -42,7 +42,7 @@ http {
 	# Click tracking!
 	access_log off;
 
-	# Hide nginx version
+	# Hide Nginx version
 	server_tokens off;
 
 	# ~2 seconds is often enough for HTML/CSS, but connections in

.meta/dietpi-cloud-migration

@@ -1,17 +1,20 @@
 #!/bin/bash
 
-(( $UID )) && echo -e '[\e[31mFAILED\e[0m] Root privileges required. Please run the script with "sudo".\n' && exit 1
+(( $UID )) && echo -e '[\e[31mFAILED\e[0m] Root privileges required. Please run the script with "sudo".' && exit 1
 echo -e '[\e[32m  OK  \e[0m] Root privileges verified.'
 
-! 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
+! 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 install rsync"' && exit 1
 echo -e '[\e[32m  OK  \e[0m] Successfully installed rsync.'
 
+systemctl start mariadb &> /dev/null || systemctl start mysql &> /dev/null || { echo -e '[\e[31mFAILED\e[0m] Could not start MariaDB server. Aborting...'; exit 1; }
+echo -e '[\e[32m  OK  \e[0m] Successfully started MariaDB.'
+
 run_backup(){
 
 	fp_config="/var/www/$1/config/config.php"
 
 	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
+	! 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.' && exit 1
 
 	echo "[ INFO ] Scanning $fp_config for necessary information..."
 	local fp_datadir=$(grep -m1 "^[[:blank:]]*'datadirectory'" $fp_config | cut -d \' -f 4)
@@ -26,19 +29,19 @@ run_backup(){
  - 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 failed, please 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.' && 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, please 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.' && 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 existing directory, please check spelling and mount status of your desired backup drive.\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." && 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
+		! rsync -aHp --delete "$fp_datadir"/ "$2" && echo -e '[\e[31mFAILED\e[0m] "rsync" failed, please check for error reasons and try again.' && exit 1
 		echo -e "[\e[32m  OK  \e[0m] Successfully synced data directory to: $2"
 
 	else
@@ -53,18 +56,20 @@ run_backup(){
 
 ### MAIN ###
 
-if [[ -f /var/www/owncloud/config/config.php ]]; then
+if [[ -f '/var/www/owncloud/config/config.php' ]]; then
 
 	echo '[ INFO ] ownCloud installation found, preparing backup...'
 	run_backup owncloud "$1"
 
 fi
 
-if [[ -f /var/www/nextcloud/config/config.php ]]; 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 instance found at /var/www/owncloud|nextcloud. Aborting...\n' && exit 1
+[[ ! $fp_config ]] && echo -e '[\e[31mFAILED\e[0m] No ownCloud or Nextcloud instance found at /var/www/owncloud|nextcloud. Aborting...' && exit 1
+
+exit 0