Merge pull request #4777 from pi-hole/tweak/default_log_path

Change default FTL log file path to /var/log/pihole/FTL.log

advanced/Scripts/piholeDebug.sh

@@ -129,7 +129,7 @@ FTL_PORT="${RUN_DIRECTORY}/pihole-FTL.port"
 PIHOLE_LOG="${LOG_DIRECTORY}/pihole.log"
 PIHOLE_LOG_GZIPS="${LOG_DIRECTORY}/pihole.log.[0-9].*"
 PIHOLE_DEBUG_LOG="${LOG_DIRECTORY}/pihole_debug.log"
-PIHOLE_FTL_LOG="$(get_ftl_conf_value "LOGFILE" "${LOG_DIRECTORY}/pihole-FTL.log")"
+PIHOLE_FTL_LOG="$(get_ftl_conf_value "LOGFILE" "${LOG_DIRECTORY}/FTL.log")"
 
 PIHOLE_WEB_SERVER_ACCESS_LOG_FILE="${WEB_SERVER_LOG_DIRECTORY}/access-pihole.log"
 PIHOLE_WEB_SERVER_ERROR_LOG_FILE="${WEB_SERVER_LOG_DIRECTORY}/error-pihole.log"

advanced/Templates/logrotate

@@ -9,7 +9,7 @@
 	nomail
 }
 
-/var/log/pihole/pihole-FTL.log {
+/var/log/pihole/FTL.log {
 	# su #
 	weekly
 	copytruncate

advanced/Templates/pihole-FTL.service

@@ -70,13 +70,13 @@ start() {
     mkdir -pm 0755 /run/pihole /var/log/pihole
     [ ! -f "${FTL_PID_FILE}" ] && install -m 644 -o pihole -g pihole /dev/null "${FTL_PID_FILE}"
     [ ! -f "${FTL_PORT_FILE}" ] && install -m 644 -o pihole -g pihole /dev/null "${FTL_PORT_FILE}"
-    [ ! -f /var/log/pihole/pihole-FTL.log ] && install -m 644 -o pihole -g pihole /dev/null /var/log/pihole/pihole-FTL.log
+    [ ! -f /var/log/pihole/FTL.log ] && install -m 644 -o pihole -g pihole /dev/null /var/log/pihole/FTL.log
     [ ! -f /var/log/pihole/pihole.log ] && install -m 640 -o pihole -g pihole /dev/null /var/log/pihole/pihole.log
     [ ! -f /etc/pihole/dhcp.leases ] && install -m 644 -o pihole -g pihole /dev/null /etc/pihole/dhcp.leases
     # Ensure that permissions are set so that pihole-FTL can edit all necessary files
-    chown pihole:pihole /run/pihole /etc/pihole /var/log/pihole /var/log/pihole/pihole-FTL.log /var/log/pihole/pihole.log /etc/pihole/dhcp.leases
+    chown pihole:pihole /run/pihole /etc/pihole /var/log/pihole /var/log/pihole/FTL.log /var/log/pihole/pihole.log /etc/pihole/dhcp.leases
     # Ensure that permissions are set so that pihole-FTL can edit the files. We ignore errors as the file may not (yet) exist
-    chmod -f 0644 /etc/pihole/macvendor.db /etc/pihole/dhcp.leases /var/log/pihole/pihole-FTL.log
+    chmod -f 0644 /etc/pihole/macvendor.db /etc/pihole/dhcp.leases /var/log/pihole/FTL.log
     chmod -f 0640 /var/log/pihole/pihole.log
     # Chown database files to the user FTL runs as. We ignore errors as the files may not (yet) exist
     chown -f pihole:pihole /etc/pihole/pihole-FTL.db /etc/pihole/gravity.db /etc/pihole/macvendor.db
@@ -91,7 +91,7 @@ start() {
 
     fi
     if [ ! -f /var/log/pihole-FTL.log ]; then
-        ln -s /var/log/pihole/pihole-FTL.log /var/log/pihole-FTL.log
+        ln -s /var/log/pihole/FTL.log /var/log/pihole-FTL.log
         chown -h pihole:pihole /var/log/pihole-FTL.log
     fi
 

automated install/basic-install.sh

@@ -2612,12 +2612,24 @@ main() {
 
     # If this is an update from a previous Pi-hole installation
     # we need to move any existing `pihole*` logs from `/var/log` to `/var/log/pihole`
-    # if /var/log/pihole.log is not a symlink (set durign FTL startup) move the files
+    # if /var/log/pihole.log is not a symlink (set during FTL startup) move the files
     # can be removed with Pi-hole v6.0
     # To be sure FTL is not running when we move the files we explicitly stop it here
 
     stop_service pihole-FTL &> /dev/null
 
+    # Special handling for pihole-FTL.log -> pihole/FTL.log
+    if [ -f /var/log/pihole-FTL.log ] && [ ! -L /var/log/pihole-FTL.log ]; then
+        # /var/log/pihole-FTL.log      -> /var/log/pihole/FTL.log
+        # /var/log/pihole-FTL.log.1    -> /var/log/pihole/FTL.log.1
+        # /var/log/pihole-FTL.log.2.gz -> /var/log/pihole/FTL.log.2.gz
+        # /var/log/pihole-FTL.log.3.gz -> /var/log/pihole/FTL.log.3.gz
+        # /var/log/pihole-FTL.log.4.gz -> /var/log/pihole/FTL.log.4.gz
+        # /var/log/pihole-FTL.log.5.gz -> /var/log/pihole/FTL.log.5.gz
+        for f in /var/log/pihole-FTL.log*; do mv "$f" "$( sed "s/pihole-/pihole\//" <<< "$f")"; done
+    fi
+
+    # Remaining log files
     if [ -f /var/log/pihole.log ] && [ ! -L /var/log/pihole.log ]; then
         mv /var/log/pihole*.* /var/log/pihole/ 2>/dev/null
     fi