v148

+ PiHole log clear fix, non en_GB default: https://github.com/Fourdee/DietPi/issues/839
MichaIng · Mar 29, 2017 · 3a6c6a3 · 3a6c6a3 · Fourdee · Mar 29, 2017
1 parent ad1a7f4
commit 3a6c6a3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -10,6 +10,7 @@ General | Boot: All failed drive mounts will be re-mounted after network connect
 Bug fixes:
 DietPi-Software | YaCy: Web interface admin details are now set during install. Username = admin, password = dietpi. Many thanks to Pilovali for reporting this!:
 DietPi-Software | Gogs: Installation now resolved. Due to https://dl.gogs.io/ removing "latest" links for binary download. Now hosted on dietpi.com: https://github.com/Fourdee/DietPi/issues/833
+DietPi-RAMlog | PiHole: Resolved an issue where PiHole logs were being cleared every 1 hour, if default locale on system is not en_GB. PiHole logs allow for current day and 5MB size limit. Many thanks to @k-plan for his assistance with this one: https://github.com/Fourdee/DietPi/issues/839
 General | Cron-Daily: Removed a df export left over from auto TRIM code (no longer used).
 
 -----------------------------------------------------------------------------------------------------------

diff --git a/dietpi/dietpi-logclear b/dietpi/dietpi-logclear
@@ -111,7 +111,7 @@
 					#Find all non-matching lines with todays date (eg: find all lines not generated today)
 					# NB: day is space padded without trailling 0 (eg: Sep  1, Sep 11)
 					# NB: Force english dates to match english dates that dnsmasq always logs with: https://github.com/Fourdee/DietPi/issues/233#issuecomment-196407135
-					local month_day_today=$(LANG=en_GB.UTF-8 date +'%b %e')
+					local month_day_today=$(LC_ALL=en_GB.UTF-8 date +'%b %e')
 
 					# - Check for at least 1 non-matching line before applying (so we can enable the dnsmasq restart flag)
 					# - Remove all lines in logfile for all other days, excluding today.

diff --git a/dietpi/patch_file b/dietpi/patch_file
@@ -2424,6 +2424,9 @@ _EOF_
 		cp /DietPi/dietpi/conf/cron.hourly_dietpi /etc/cron.hourly/dietpi
 		chmod +x /etc/cron.hourly/dietpi
 		#-------------------------------------------------------------------------------
+		#ARMbian log2ram cron job cleanup: http://dietpi.com/phpbb/viewtopic.php?f=11&t=1580&p=6478#p6478
+		rm rm /etc/cron.hourly/log2ram &> /dev/null
+		#-------------------------------------------------------------------------------
 
 	fi