Merge pull request #2029 from Fourdee/testing

**v6.14**
(21/08/18)

**Changes / Improvements / Optimizations:**

DietPi-Software | GLOBAL_PW: The global password used by DietPi-Software is now encrypted with AES-256, removed from '/boot/dietpi.txt' and stored securely on rootFS with root:root/700 access only: https://github.com/Fourdee/DietPi/issues/2021

DietPi-Software | FreshRSS, a self-hosted RSS feed aggregator, now available for installation. Thanks @msongz for requesting an RSS reader: https://github.com/Fourdee/DietPi/issues/1996

DietPi-Software | BruteFIR: Due to low install count (7), we have removed this software from the DietPi database, and, is no longer available for installation.

DietPi-Software | NAA Daemon: Installation updated to 3.5.4-38. Thanks Volpone for the heads up!: https://dietpi.com/phpbb/viewtopic.php?f=11&t=4420

General | '/etc/machine-id' is now unique for each DietPi installation. Regenerated during patch: https://github.com/Fourdee/DietPi/issues/2015

**Bug Fixes:**

DietPi-Drive_Manager | Resolved an issue where custom tmpfs and/or bind entries would be removed during script run: https://github.com/Fourdee/DietPi/issues/2013

DietPi-Software | NAA Daemon : Resolved an issue where this would fail to progress the installation, due to a whiptail prompt behind G_RUN_CMD.

DietPi-Survey/Bugreport | Resolved an issue with failed uploads, due to Cloudflare: https://github.com/Fourdee/DietPi/issues/2022

General | Sparky SBC: Previous patch for RTL8812AU driver support, will be reapplied, as the previous patch did not succeed.

General | Resolved an issue where pre v6.9 images, would roll back the clock during the 1st reboot after updating DietPi: https://github.com/Fourdee/DietPi/issues/2026#issuecomment-414475011

General | Rock64: Image has been updated to Ayufan 0.7.9. Includes fixes for kernel upgrades via APT: https://github.com/Fourdee/DietPi/issues/2026

CHANGELOG.txt

@@ -1,4 +1,24 @@
 
+v6.14
+(21/08/18)
+
+Changes / Improvements / Optimizations:
+DietPi-Software | GLOBAL_PW: The global password used by DietPi-Software is now encrypted with AES-256, removed from '/boot/dietpi.txt' and stored securely on rootFS with root:root/700 access only: https://github.com/Fourdee/DietPi/issues/2021
+DietPi-Software | FreshRSS, a self-hosted RSS feed aggregator, now available for installation. Thanks @msongz for requesting an RSS reader: https://github.com/Fourdee/DietPi/issues/1996
+DietPi-Software | BruteFIR: Due to low install count (7), we have removed this software from the DietPi database, and, is no longer available for installation.
+DietPi-Software | NAA Daemon: Installation updated to 3.5.4-38. Thanks Volpone for the heads up!: https://dietpi.com/phpbb/viewtopic.php?f=11&t=4420
+General | '/etc/machine-id' is now unique for each DietPi installation. Regenerated during patch: https://github.com/Fourdee/DietPi/issues/2015
+
+Bug Fixes:
+DietPi-Drive_Manager | Resolved an issue where custom tmpfs and/or bind entries would be removed during script run: https://github.com/Fourdee/DietPi/issues/2013
+DietPi-Software | NAA Daemon : Resolved an issue where this would fail to progress the installation, due to a whiptail prompt behind G_RUN_CMD.
+DietPi-Survey/Bugreport | Resolved an issue with failed uploads, due to Cloudflare: https://github.com/Fourdee/DietPi/issues/2022
+General | Sparky SBC: Previous patch for RTL8812AU driver support, will be reapplied, as the previous patch did not succeed.
+General | Resolved an issue where pre v6.9 images, would roll back the clock during the 1st reboot after updating DietPi: https://github.com/Fourdee/DietPi/issues/2026#issuecomment-414475011
+General | Rock64: Image has been updated to Ayufan 0.7.9. Includes fixes for kernel upgrades via APT: https://github.com/Fourdee/DietPi/issues/2026
+
+-----------------------------------------------------------------------------------------------------------
+
 v6.13
 (14/08/18)
 

PREP_SYSTEM_FOR_DIETPI.sh

@@ -1074,6 +1074,7 @@ _EOF_
 		mkdir -p /root/.ssh
 		>> /root/.ssh/known_hosts
 		G_CONFIG_INJECT 'dietpi.com ' 'dietpi.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDE6aw3r6aOEqendNu376iiCHr9tGBIWPgfrLkzjXjEsHGyVSUFNnZt6pftrDeK7UX\+qX4FxOwQlugG4fymOHbimRCFiv6cf7VpYg1Ednquq9TLb7/cIIbX8a6AuRmX4fjdGuqwmBq3OG7ZksFcYEFKt5U4mAJIaL8hXiM2iXjgY02LqiQY/QWATsHI4ie9ZOnwrQE\+Rr6mASN1BVFuIgyHIbwX54jsFSnZ/7CdBMkuAd9B8JkxppWVYpYIFHE9oWNfjh/epdK8yv9Oo6r0w5Rb\+4qaAc5g\+RAaknHeV6Gp75d2lxBdCm5XknKKbGma2\+/DfoE8WZTSgzXrYcRlStYN' /root/.ssh/known_hosts
+		G_CONFIG_INJECT '185.101.93.93 ' '185.101.93.93 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDE6aw3r6aOEqendNu376iiCHr9tGBIWPgfrLkzjXjEsHGyVSUFNnZt6pftrDeK7UX\+qX4FxOwQlugG4fymOHbimRCFiv6cf7VpYg1Ednquq9TLb7/cIIbX8a6AuRmX4fjdGuqwmBq3OG7ZksFcYEFKt5U4mAJIaL8hXiM2iXjgY02LqiQY/QWATsHI4ie9ZOnwrQE\+Rr6mASN1BVFuIgyHIbwX54jsFSnZ/7CdBMkuAd9B8JkxppWVYpYIFHE9oWNfjh/epdK8yv9Oo6r0w5Rb\+4qaAc5g\+RAaknHeV6Gp75d2lxBdCm5XknKKbGma2\+/DfoE8WZTSgzXrYcRlStYN' /root/.ssh/known_hosts
 
 		#-----------------------------------------------------------------------------------
 		#MISC
@@ -1291,10 +1292,11 @@ _EOF_
 			G_RUN_CMD wget https://raw.githubusercontent.com/sparky-sbc/sparky-test/master/rtl8812au/rtl8812au_sparky.tar
 			mkdir -p rtl8812au_sparky
 			tar -xvf rtl8812au_sparky.tar -C rtl8812au_sparky
-			chmod +x rtl8812au_sparky/install.sh
-			G_RUN_CMD rtl8812au_sparky/install.sh
-			rm rtl8812au_sparky.tar
-			rm -R rtl8812au_sparky
+			chmod +x -R rtl8812au_sparky
+			cd rtl8812au_sparky
+			G_RUN_CMD ./install.sh
+			cd ..
+			rm -R rtl8812au_sparky*
 
 			#	Use performance gov for stability.
 			sed -i '/^[[:blank:]]*CONFIG_CPU_GOVERNOR=/c\CONFIG_CPU_GOVERNOR=performance' /DietPi/dietpi.txt
@@ -1508,12 +1510,12 @@ _EOF_
 		G_RUN_CMD wget "https://raw.githubusercontent.com/$GIT_OWNER/DietPi/$GIT_BRANCH/dietpi/.version" -O /DietPi/dietpi/.version
 
 		#	reduce sub_version by 1, allows us to create image, prior to release and patch if needed.
-		CORE_VERSION=$(sed -n 1p /DietPi/dietpi/.version)
-		SUB_VERSION=$(sed -n 2p /DietPi/dietpi/.version)
-		((SUB_VERSION--))
+		export G_DIETPI_VERSION_CORE=$(sed -n 1p /DietPi/dietpi/.version)
+		export G_DIETPI_VERSION_SUB=$(sed -n 2p /DietPi/dietpi/.version)
+		((G_DIETPI_VERSION_SUB--))
 		cat << _EOF_ > /DietPi/dietpi/.version
-$CORE_VERSION
-$SUB_VERSION
+$G_DIETPI_VERSION_CORE
+$G_DIETPI_VERSION_SUB
 _EOF_
 
 		G_RUN_CMD cp /DietPi/dietpi/.version /var/lib/dietpi/.dietpi_image_version

README.md

@@ -213,3 +213,9 @@ Shairport-Sync
 
 OpenVPN
 - https://github.com/OpenVPN
+
+FreshRSS
+- https://github.com/FreshRSS/FreshRSS
+
+Folding@Home
+- https://github.com/FoldingAtHome

dietpi.txt

@@ -59,7 +59,7 @@ AUTO_SETUP_SWAPFILE_SIZE=1
 #		Optional swapfile location
 AUTO_SETUP_SWAPFILE_LOCATION=/var/swap
 
-# Unmask (enable) systemd-logind service, which is masked by default on DietPi 
+# Unmask (enable) systemd-logind service, which is masked by default on DietPi
 AUTO_UNMASK_LOGIND=0
 
 ##### Software Automation Options #####
@@ -152,6 +152,9 @@ CONFIG_CPU_MAX_FREQ=Disabled
 #Limit the min cpu frequency (Mhz) for all cores. | Disabled=disabled | Useful for 1-wire correct support (eg. 480Mhz).
 CONFIG_CPU_MIN_FREQ=Disabled
 
+#Disable Intel based turbo/boost stepping.
+CONFIG_CPU_DISABLE_TURBO=0
+
 #Min value 10000 microseconds (10ms)
 CONFIG_CPU_ONDEMAND_SAMPLE_RATE=25000
 

dietpi/.version

@@ -1,2 +1,2 @@
 6
-13
+14

dietpi/boot

@@ -134,6 +134,11 @@
 		dropbearkey -t ecdsa -f /etc/dropbear/dropbear_ecdsa_host_key &> /dev/null
 		dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key &> /dev/null
 
+		# - Recreate machine-id: https://github.com/Fourdee/DietPi/issues/2015
+		rm /etc/machine-id &> /dev/null
+		rm /var/lib/dbus/machine-id &> /dev/null
+		systemd-machine-id-setup
+
 		# - Network
 		local index_eth=$(sed -n 1p /DietPi/dietpi/.network)
 		local index_wlan=$(sed -n 2p /DietPi/dietpi/.network)

dietpi/conf/nginx.sites-dietpi.nextcloud.config

@@ -29,65 +29,63 @@ location ^~ /nextcloud {
         error_page 404 /nextcloud/core/templates/404.php;
 
         location /nextcloud {
-                rewrite ^ /nextcloud/index.php$uri;
+            rewrite ^ /nextcloud/index.php$request_uri;
         }
 
         location ~ ^/nextcloud/(?:build|tests|config|lib|3rdparty|templates|data)/ {
-                deny all;
+            deny all;
         }
-
         location ~ ^/nextcloud/(?:\.|autotest|occ|issue|indie|db_|console) {
-                deny all;
+            deny all;
         }
 
         location ~ ^/nextcloud/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+)\.php(?:$|/) {
-                include fastcgi_params;
-                fastcgi_split_path_info ^(.+\.php)(/.*)$;
-                fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-                fastcgi_param PATH_INFO $fastcgi_path_info;
-                # HTTPS forces redirection from http://, thus has to be enabled only on active HTTPS environment.
-                #fastcgi_param HTTPS on;
-                # Avoid sending the security headers twice
-                fastcgi_param modHeadersAvailable true;
-                # Front controller enables pretty URLs without /index.php/, which works fine since Nextcloud 13!
-                fastcgi_param front_controller_active true;
-                fastcgi_pass php;
-                fastcgi_intercept_errors on;
-                # Disable on Jessie, because Jessie Nginx does not support that parameter
-                #fastcgi_request_buffering off;
-                # Hard coding 128M OPCache size, only for /nextcloud, to suppress warning on nextcloud admin panel.
-                fastcgi_param PHP_ADMIN_VALUE "opcache.memory_consumption=128";
+            fastcgi_split_path_info ^(.+?\.php)(/.*)$;
+            include fastcgi_params;
+            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+            fastcgi_param PATH_INFO $fastcgi_path_info;
+            # HTTPS forces redirection from http://, thus has to be enabled only on active HTTPS environment.
+            #fastcgi_param HTTPS on;
+            # Avoid sending the security headers twice
+            fastcgi_param modHeadersAvailable true;
+            # Front controller enables pretty URLs without /index.php/, which works fine since Nextcloud 13!
+            fastcgi_param front_controller_active true;
+            fastcgi_pass php;
+            fastcgi_intercept_errors on;
+            # Disable on Jessie, because Jessie Nginx does not support that parameter
+            #fastcgi_request_buffering off;
+            # Hard coding 128M OPCache size, only for /nextcloud, to suppress warning on nextcloud admin panel.
+            fastcgi_param PHP_ADMIN_VALUE "opcache.memory_consumption=128";
         }
 
         location ~ ^/nextcloud/(?:updater|ocs-provider)(?:$|/) {
-                try_files $uri/ =404;
-                index index.php;
+            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)$ {
-                try_files $uri /nextcloud/index.php$uri$is_args$args;
-                add_header Cache-Control "public, max-age=15778463";
-                # Add headers to serve security related headers  (It is intended
-                # to have those duplicated to the ones above)
-                # Before enabling Strict-Transport-Security headers please read
-                # into this topic first.
-                add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;";
-                add_header X-Content-Type-Options nosniff;
-                add_header X-XSS-Protection "1; mode=block";
-                add_header X-Robots-Tag none;
-                add_header X-Download-Options noopen;
-                #add_header X-Frame-Options "SAMEORIGIN";
-                add_header X-Permitted-Cross-Domain-Policies none;
-                # Optional: Don't log access to assets
-                access_log off;
+            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
+            # to have those duplicated to the ones above)
+            # Before enabling Strict-Transport-Security headers please read
+            # into this topic first.
+            add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;";
+            add_header X-Content-Type-Options nosniff;
+            add_header X-XSS-Protection "1; mode=block";
+            add_header X-Robots-Tag none;
+            add_header X-Download-Options noopen;
+            #add_header X-Frame-Options "SAMEORIGIN";
+            add_header X-Permitted-Cross-Domain-Policies none;
+            # Optional: Don't log access to assets
+            access_log off;
         }
 
         location ~ \.(?:png|html|ttf|ico|jpg|jpeg)$ {
-                try_files $uri /nextcloud/index.php$uri$is_args$args;
-                # Optional: Don't log access to other assets
-                access_log off;
+            try_files $uri /nextcloud/index.php$request_uri;
+            # Optional: Don't log access to other assets
+            access_log off;
         }
-
 }