From 93c80e510d913343e2e1086cd9a5ea4c87233298 Mon Sep 17 00:00:00 2001 From: benoit Date: Fri, 17 Jul 2020 03:37:28 +0000 Subject: [PATCH] updated vimdiff for debian upgrades --- SysadminTips.page | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/SysadminTips.page b/SysadminTips.page index 72bcf75..9d6fed4 100644 --- a/SysadminTips.page +++ b/SysadminTips.page @@ -96,9 +96,12 @@ sed -ri 's/^\s*[0-9]+\s*; serial/\t\t\t 2017041010\t ; serial/' db.* After Debian/Ubuntu upgrade, merge local config files according to config files shipped in packages. ``` -for file in $(find /etc -iname '*.dpkg-dist'); do vimdiff ${file%%.dpkg-dist} $file; done -for file in $(find /etc -iname '*.dpkg-old'); do vimdiff ${file%%.dpkg-old} $file; done -for file in $(find /etc -iname '*.ucf-dist'); do vimdiff ${file%%.ucf-dist} $file; done +for file in $(find /etc -iname '*.dpkg-dist'); do vimdiff ${file%%.dpkg-dist} $file; rm $file; done +for file in $(find /etc -iname '*.dpkg-old'); do vimdiff ${file%%.dpkg-old} $file; rm $file; done +for file in $(find /etc -iname '*.dpkg-new'); do vimdiff ${file%%.dpkg-new} $file; rm $file; done +for file in $(find /etc -iname '*.ucf-dist'); do vimdiff ${file%%.ucf-dist} $file; rm $file; done +for file in $(find /etc -iname '*.ucf-old'); do vimdiff ${file%%.ucf-old} $file; rm $file; done +for file in $(find /etc -iname '*.ucf-new'); do vimdiff ${file%%.ucf-new} $file; rm $file; done ``` Debug php with strace and php-cgi (especially useful for wp multisites).