From 97fb53f6de347643cd1227fda8377315a9c36fa5 Mon Sep 17 00:00:00 2001 From: deajan Date: Wed, 25 Dec 2019 18:52:07 +0100 Subject: [PATCH] Again remarklint fixes --- CHANGELOG.md | 223 ++++++++++++++++++++++++++------------------------- 1 file changed, 113 insertions(+), 110 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb7e08f..14a779c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,14 @@ ## RECENT CHANGES -dd Mmm YYYY: To be done +### dd Mmm YYYY: To be done - Make --log-conflicts non experimental (randomly fails) - ! new option FORCE_CONFLICT_PREVALANCE which will always use Initiator or Target, regardless of best time - ! target-helper: destination mails etc on target, also, no cmd after on configs -dd Mmm YYYY: osync v1.3 release (for full changelog since v1.2 branch see all v1.3-beta/RC entries) +### dd Mmm YYYY: osync v1.3 release (for full changelog since v1.2 branch see all v1.3-beta/RC entries) -dd Mmm YYYY: osync v1.3-RC1 release +### dd Mmm YYYY: osync v1.3-RC1 release - New option to use SSH_CONTROLMASTER in order to speed up remote sync tasks and preserve a single ssh channel - New option SSH_OPTIONAL_ARGS @@ -16,24 +16,24 @@ dd Mmm YYYY: osync v1.3-RC1 release - Fixed various cosmetic issues with code and logs - Improved upgrade script - Fixed a possible bash buffer overflow when synchronizing large filesets (tested with 2M files) - - This fix actually truncats every string sent to Logger not being more than 16KB + - This fix actually truncats every string sent to Logger not being more than 16KB - Fixed osync leaving temporary log files behind in RUN_DIR (/tmp by default) - Updated target helper service configuration file - Improved codacy results - Added more debugging -22 May 2019: osync v1.3-beta3 release +### 22 May 2019: osync v1.3-beta3 release - Config file update script fixes - Removed old Win10 1607 bash fixes to make Win10 1809 work (breaks Win10 1607 beta bash version...Yeah, nothing I can do about that) -20 May 2019: osync v1.3-beta2 release +### 20 May 2019: osync v1.3-beta2 release - More --summary statistics - Config file syntax now uses booleans instead of yes / no (but still accepts old syntax) - - Added boolean update in upgrade script + - Added boolean update in upgrade script - Config file revision check - - Added config file revision in upgrade script + - Added config file revision in upgrade script - New option --sync-type=initator2target|target2initiator that allows using osync as rsync wrapper for unidirectional sync - New osync target helper service - Fixed multiple race conditions in parallel executions (which also fixes random conflict logs failures) @@ -43,15 +43,15 @@ dd Mmm YYYY: osync v1.3-RC1 release - Fixed (again) deletion propagation when file contains spaces (thanks to http://github.com/weinhold) - Deprecated --log-conflicts for 1.3 branch (is now experimental) - Updated ofunctions - - Has better random number generator - - IsInteger, IsNumeric and IsNumericExpand are now busybox compatible + - Has better random number generator + - IsInteger, IsNumeric and IsNumericExpand are now busybox compatible - Multiple installer fixes - Multiple batch fixes -08 Aug 2018: osync v1.3-beta1 release +### 08 Aug 2018: osync v1.3-beta1 release - Added an option to log conflictual files - - Presence of conflictual files can trigger a special mail + - Presence of conflictual files can trigger a special mail - New option --initialize (see #141) - Added OpenRC support (thanks to kozross, see #140) - Added --no-resume option in order to disable resuming execution on failure @@ -67,32 +67,32 @@ dd Mmm YYYY: osync v1.3-RC1 release - Merged Logger and QuickLogger for simplified usage - Fixed inotifyway error in FreeBSD (see #119) - Minor enhancements in installer / ofunctions - - Added --prefix option for installer - - Installer path fixes - - Fixed logging bug with QuickLogger + - Added --prefix option for installer + - Installer path fixes + - Fixed logging bug with QuickLogger - Refactored time control and parallel execution functions into one single function - Multiple portability improvements - - UrlEncode function is now Busybox compatible - - IsInteger function is now Busybox compatible + - UrlEncode function is now Busybox compatible + - IsInteger function is now Busybox compatible - Prevented non unique runtime filenames on some systems where no milliseconds exist - - Fixed bogus runtime filenames on Busybox + - Fixed bogus runtime filenames on Busybox - Upgraded shunit2 test framework to v2.1.8pre (git commit 07bb329) - Multiple smaller fixes and improvements -25 Mar 2017: osync v1.2 release (for full changelog of v1.2 branch see all v1.2-beta/RC entries) +### 25 Mar 2017: osync v1.2 release (for full changelog of v1.2 branch see all v1.2-beta/RC entries) - Check for initiator directory before launching monitor mode - Updated RPM spec file (Thanks to https://github.com/liger1978) - Fixed remote commands can be run on local runs and obviously fail - Minor fixes in installer logic -10 Feb 2017: osync v1.2-RC3 release +### 10 Feb 2017: osync v1.2-RC3 release - Uninstaller skips ssh_filter if needed by other program (osync/obackup) - Logger now automatically obfuscates _REMOTE_TOKEN - Logger doesn't show failed commands in stdout, only logs them -08 Feb 2017: osync v1.2-RC2 release +### 08 Feb 2017: osync v1.2-RC2 release - Tests have run on CentOS 5,7 and 7, Debian 8, Linux Mint 18, Fedora 25, FreeBSD 10.3/pfSense, FreeBSD 11, MacOSX Sierra, Win10 1607 (14393.479) bash, Cygwin x64 and MSYS2 current - Hugely improved ssh_filter @@ -103,7 +103,7 @@ dd Mmm YYYY: osync v1.3-RC1 release - Fixed installer statistics don't report OS - Minor tweaks and fixes in ofunctions -13 Dec 2016: osync v1.2-RC1 release +### 13 Dec 2016: osync v1.2-RC1 release - Unit tests have run on CentOS 5,6 and 7, Debian 8, Linux Mint 18, FreeBSD 10.3/pfSense, FreeBSD 11, MacOSX Sierra, Win10 1607 (14393.479) bash, Cygwin x64 and MSYS2 current - Added optional rsync arguments configuration value @@ -114,23 +114,23 @@ dd Mmm YYYY: osync v1.3-RC1 release - Spinner is less prone to move logging on screen - Fixed daemon mode didn't enforce exclusions - Made a quick and dirty preprocessor - - ofunctions can now directly be loaded into osync via an include statement - - n_osync.sh can be assembled on the fly using bootstrap.sh + - ofunctions can now directly be loaded into osync via an include statement + - n_osync.sh can be assembled on the fly using bootstrap.sh - Forced remote ssh to use bash (fixes FreeBSD 11 compatibility when default shell is csh) - Faster execution - - Reduced number of needed sequential SSH connections for remote sync (4 connections less) - - Refactored CheckReplicaPath and CheckDiskSpace into one functon CheckReplicas - - Refactored CheckDiskSpace, CheckLocks and WriteLocks into one function HandleLocks - - Removed noclobber locking in favor of a more direct method + - Reduced number of needed sequential SSH connections for remote sync (4 connections less) + - Refactored CheckReplicaPath and CheckDiskSpace into one functon CheckReplicas + - Refactored CheckDiskSpace, CheckLocks and WriteLocks into one function HandleLocks + - Removed noclobber locking in favor of a more direct method - Improved remote logging - Fixed directory ctime softdeletion - Using mutt as mail program now supports multiple recipients - osync now properly handles symlink deletions (previous bugfix didn't work properly) - Simplified osync-batch runner (internally and for user) - - Better filename handling - - Easier to read log output - - Always passes --silent to osync - - All options that do not belong to osync-batch are automatically passed to osync + - Better filename handling + - Easier to read log output + - Always passes --silent to osync + - All options that do not belong to osync-batch are automatically passed to osync - Improved installer OS detection - Added daemon capability on MacOS X - Fixed upgrade script cannot update header on BSD / MacOS X @@ -142,17 +142,17 @@ dd Mmm YYYY: osync v1.3-RC1 release - Fixed failed deletion rescheduling under BSD bug introduced with v1.2 rewrite - merge.sh is now BSD and Mac compatible - More work on unit tests: - - Unit tests are now BSD / MacOSX / MSYS / Cygwin and Windows 10 bash compatible - - Added more ACL tests - - Added directory soft deletion tests - - Added symlink and broken symlink copy / deletion tests - - Made unit tests more robust when aborted - - Simplified unit tests needed config files (merged travis and local config files) - - Added timed execution tests + - Unit tests are now BSD / MacOSX / MSYS / Cygwin and Windows 10 bash compatible + - Added more ACL tests + - Added directory soft deletion tests + - Added symlink and broken symlink copy / deletion tests + - Made unit tests more robust when aborted + - Simplified unit tests needed config files (merged travis and local config files) + - Added timed execution tests - More code compliance - Lots of minor fixes -19 Nov 2016: osync v1.2-beta3 re-release +### 19 Nov 2016: osync v1.2-beta3 re-release - Fixed blocker bug where local tests tried GetRemoteOS Anyway - Fixed CentOS 5 compatibility bug for checking disk space introduced in beta3 @@ -160,97 +160,97 @@ dd Mmm YYYY: osync v1.3-RC1 release - Made unit tests clean authorized_keys file after usage - Added local unit test where remote OS connection would fail -18 Nov 2016: osync v1.2-beta3 released +### 18 Nov 2016: osync v1.2-beta3 released - Improved locking / unlocking replicas - - Fixed killing local pid that has lock bug introduced in v1.2 rewrite - - Allow remote unlocking when INSTANCE_ID of lock matches local INSTANCE_ID + - Fixed killing local pid that has lock bug introduced in v1.2 rewrite + - Allow remote unlocking when INSTANCE_ID of lock matches local INSTANCE_ID - Fixed failed deletions re-propagation bug introduced in v1.2 rewrite - Faster remote OS detection - New output switches, --no-prefix, --summary, --errors-only - Added busybox (and Android Termux) support - - More portable file size functions - - More portable compression program commands - - More paranoia checks - - Added busybox sendmail support - - Added tls and ssl support for sendmail + - More portable file size functions + - More portable compression program commands + - More paranoia checks + - Added busybox sendmail support + - Added tls and ssl support for sendmail - Added --skip-deletion support in config and quicksync modes - Added possibility to skip deletion on initiator or target replica - Prevent lock file racing condition (thanks to https://github.com/allter) - Added ssh password file support - Hugely improved unit tests - - Added conflict resolution tests - - Added softdeletion tests - - Added softdeletion cleanup tests - - Added lock tests - - Added skip-deletion tests - - Added configuration file tests - - Added upgrade script test - - Added basic daemon mode tests + - Added conflict resolution tests + - Added softdeletion tests + - Added softdeletion cleanup tests + - Added lock tests + - Added skip-deletion tests + - Added configuration file tests + - Added upgrade script test + - Added basic daemon mode tests - Simplified logger - All fixes from v1.1.5 -17 Oct 2016: osync v1.2-beta2 released +### 17 Oct 2016: osync v1.2-beta2 released - osync now propagates symlink deletions and moves symlinks without referrents to deletion dir - Upgrade script now has the ability to add any missing value - Improved unit tests - - Added upgrade script test - - Added deletion propagation tests + - Added upgrade script test + - Added deletion propagation tests -30 Aug 2016: osync v1.2-beta released +### 30 Aug 2016: osync v1.2-beta released - Rendered more recent code compatible with bash 3.2+ - Added a PKGBUILD file for ArchLinux thanks to Shadowigor (https://github.com/shaodwigor). Builds available at https://aur.archlinux.org/packages/osync/ - Some more code compliance & more paranoia checks - Added more preflight checks - Logs sent by mail are easier to read - - Better subject (currently running or finished run) - - Fixed bogus double log sent in alert mails + - Better subject (currently running or finished run) + - Fixed bogus double log sent in alert mails - Made unix signals posix compliant - Config file upgrade script now updates header - Improved batch runner - Made keep logging value configurable and not mandatory - Fixed handling of processes in uninterruptible sleep state - Parallelized sync functions - - Rewrite sync resume process + - Rewrite sync resume process - Added options to ignore permissions, ownership and groups - Refactored WaitFor... functions into one - Improved execution speed - - Rewrite sync resume process - - Added parallel execution for most secondary fuctions - - Lowered sleep time in wait functions - - Removed trivial sleep and forking in remote deletion code, send the whole function to background instead - - Unlock functions no longer launched if locking failed + - Rewrite sync resume process + - Added parallel execution for most secondary fuctions + - Lowered sleep time in wait functions + - Removed trivial sleep and forking in remote deletion code, send the whole function to background instead + - Unlock functions no longer launched if locking failed - Improved WaitFor... functions to accept multiple pids - Added KillAllChilds function to accept multiple pids - Improved logging -17 Nov 2016: osync v1.1.5 released +### 17 Nov 2016: osync v1.1.5 released - Backported unit tests from v1.2-beta allowing to fix the following - - Allow quicksync mode to specify rsync include / exclude patterns as environment variables - - Added default path separator char in quicksync mode for multiple includes / exclusions - - Local runs should not check for remote connectivity - - Fixed backups go into root of replica instead of .osync_wordir/backups - - Fixed error alerts cannot be triggered from subprocesses - - Fixed remote locked targets are unlocked in any case + - Allow quicksync mode to specify rsync include / exclude patterns as environment variables + - Added default path separator char in quicksync mode for multiple includes / exclusions + - Local runs should not check for remote connectivity + - Fixed backups go into root of replica instead of .osync_wordir/backups + - Fixed error alerts cannot be triggered from subprocesses + - Fixed remote locked targets are unlocked in any case -10 Nov 2016: osync v1.1.4 released +### 10 Nov 2016: osync v1.1.4 released - Fixed a corner case with sending alerts with logfile attachments when osync is used by multiple users -02 Sep 2016: osync v1.1.3 released +### 02 Sep 2016: osync v1.1.3 released - Fixed installer for CYGWIN / MSYS environment -28 Aug 2016: osync v1.1.2 released +### 28 Aug 2016: osync v1.1.2 released - Renamed sync.conf to sync.conf.example (thanks to https://github.com/hortimech) - Fixed RunAfterHook may be executed twice - Fixed soft deletion when SUDO_EXEC is enabled -06 Aug 2016: osync v1.1.1 released +### 06 Aug 2016: osync v1.1.1 released - Fixed bogus rsync pattern file adding - Fixed soft deletion always enabled on target @@ -258,7 +258,7 @@ dd Mmm YYYY: osync v1.3-RC1 release - Fixed deletion propagation code - Fixed missing deletion / backup diretories message in verbose mode -27 Jul 2016: osync v1.1 released +### 27 Jul 2016: osync v1.1 released - More msys and cygwin compatibility - Logging begins now before any remote checks @@ -279,8 +279,8 @@ dd Mmm YYYY: osync v1.3-RC1 release - Revamped rsync patterns to allow include and exclude patterns - Fully merged codebase with obackup - Passed shellCheck.net - - Simplified EscapeSpaces to simple bash substitution - - Corrected a lot of minor warnings in order to make code more bullet proof + - Simplified EscapeSpaces to simple bash substitution + - Corrected a lot of minor warnings in order to make code more bullet proof - Added v1.0x to v1.1 upgrade script - Added (much) more verbose debugging (and possibility to remove debug code to gain speed) - Force tree function to overwrite earlier tree files @@ -297,7 +297,7 @@ dd Mmm YYYY: osync v1.3-RC1 release ## v0-v1.0x - Jun 2013 - Sep 2015 -22 Jul. 2015: Osync v1.00a released +### 22 Jul. 2015: Osync v1.00a released - Small improvements in osync-batch.sh time management - Improved various logging on error @@ -314,18 +314,18 @@ dd Mmm YYYY: osync v1.3-RC1 release - Removed legacy lockfile code from init script - Removed hardcoded program name from init script -01 Avr. 2015: Osync v1.00pre +### 01 Avr. 2015: Osync v1.00pre - Improved and refactored the soft deletion routine by merging conflict backup and soft deletion - - Reworked soft deletion code to handle a case where a top level directory gets deleted even if the files contained in it are not old enough (this obviously shouldn't happen on most FS) - - Added more logging + - Reworked soft deletion code to handle a case where a top level directory gets deleted even if the files contained in it are not old enough (this obviously shouldn't happen on most FS) + - Added more logging - Merged various fixes from onovy (http://github.com/onovy) Thanks! - - Lowered sleep time between commands - - Check if master and slave directories are the same - - Check script parameters in osync.sh and osync-batch.sh - - Run sync after timeout in --on-changes mode when no changes are detected (helps propagate slave changes) - - Fix for locking in --on-changes mode (child should lock/unlock, master process shouldn't unlock) - - Remote user is now optional in quicksync mode + - Lowered sleep time between commands + - Check if master and slave directories are the same + - Check script parameters in osync.sh and osync-batch.sh + - Run sync after timeout in --on-changes mode when no changes are detected (helps propagate slave changes) + - Fix for locking in --on-changes mode (child should lock/unlock, master process shouldn't unlock) + - Remote user is now optional in quicksync mode - Replaced default script execution storage from /dev/shm to /tmp because some rootkit detection software doesn't like this - Fixed bogus error in DEBUG for quicksync mode where no max execution time is set - Prevent debug mode to send alert emails @@ -349,7 +349,7 @@ dd Mmm YYYY: osync v1.3-RC1 release - Added a routine that reinjects failed deletions for next run in order to prevent bringing back when deletion failed with permission issues - Added treat dir symlink as dir parameter -27 May 2014: Osync 0.99 RC3 +### 27 May 2014: Osync 0.99 RC3 - Additionnal delete fix for *BSD and MSYS (deleted file list not created right) - Fixed dry mode to use non dry after run treelists to create delete lists @@ -364,7 +364,7 @@ dd Mmm YYYY: osync v1.3-RC1 release - Added a simple init script and an install script - Fixed an issue with MacOSX using rsync -E differently than other *nix (Thanks to Pierre Clement) - Multislave asynchronous task support (Thanks to Ulrich Norbisrath) - - This breaks compat with elder osync runs. Add the SYNC_ID suffix to elder state files to keep deleted file information. + - This breaks compat with elder osync runs. Add the SYNC_ID suffix to elder state files to keep deleted file information. - Added an easier debug setting i.e DEBUG=yes ./osync.sh (Again, thanks to Ulrich Norbisrath) - Added hardlink preservation (Thanks to Ulrich Norbisrath) - Added external exclusion file support (Thanks to Pierre Clement) @@ -397,24 +397,24 @@ dd Mmm YYYY: osync v1.3-RC1 release - Added possibility to quick sync two local directories without any prior configuration - Added time control on OS detection -02 Nov. 2013: Osync 0.99 RC2 +### 02 Nov. 2013: Osync 0.99 RC2 - Minor improvement on operating system detection - Improved RunLocalCommand execution hook - Minor improvements on permission checks - Made more portability improvements (mostly for FreeBSD, must be run with bash shell) - Added local and remote operating system detection - - Added forced usage of MSYS find on remote MSYS hosts - - Updated MSYS handling + - Added forced usage of MSYS find on remote MSYS hosts + - Updated MSYS handling - Merged MSYS (MinGW minimal system) bash compatibility under Windows from Obackup - - Added check for /var/log directory - - Added check for shared memory directory - - Added alternative way to kill child processes for other OSes and especially for MSYS (which is a very odd way) - - Added Sendemail.exe support for windows Alerting - - Replaced which commend by type -p, as it is more portable - - Added support for ping.exe from windows - - Forced usage of MSYS find instead of Windows' find.exe on master - - Added an optionnal remote rsync executable path parameter + - Added check for /var/log directory + - Added check for shared memory directory + - Added alternative way to kill child processes for other OSes and especially for MSYS (which is a very odd way) + - Added Sendemail.exe support for windows Alerting + - Replaced which commend by type -p, as it is more portable + - Added support for ping.exe from windows + - Forced usage of MSYS find instead of Windows' find.exe on master + - Added an optionnal remote rsync executable path parameter - Fixed an issue with CheckConnectivity3rdPartyHosts - Added an option to stop execution if a local / remote command fails - Improved forced quit command by killing all child processes @@ -423,7 +423,7 @@ dd Mmm YYYY: osync v1.3-RC1 release - Fixed various typos - Enforced CheckConnectivityRemoteHost and CheckConnectivity3rdPartyHosts checks (if one of these fails, osync is stopped) -18 Aug. 2013: Osync 0.99 RC1 +### 18 Aug. 2013: Osync 0.99 RC1 - Added possibility to change default logfile - Fixed a possible error upon master replica lock check @@ -435,7 +435,8 @@ dd Mmm YYYY: osync v1.3-RC1 release - Fixed LoadConfigFile function will not warn on wrong config file - Added --no-maxtime parameter for sync big changes without enforcing execution time checks -03 Aug. 2013: beta 3 milestone +### 03 Aug. 2013: beta 3 milestone + - Softdelete functions do now honor --dry switch - Simplified sync delete functions - Enhanced compatibility with different charsets in filenames @@ -443,12 +444,14 @@ dd Mmm YYYY: osync v1.3-RC1 release - Tree functions now honor supplementary rsync arguments - Tree functions now honor exclusion lists -01 Aug. 2013: beta 2 milestone +### 01 Aug. 2013: beta 2 milestone + - Fixed an issue with spaces in directory trees - Fixed an issue with recursive directory trees - Revamped a bit code to add bash 3.2 compatibility -24 Jul. 2013: beta milestone +### 24 Jul. 2013: beta milestone + - Fixed some bad error handling in CheckMasterSlaveDirs and LockDirectories - Added support for spaces in sync dirs and exclude lists - Fixed false exit code if no remote slave lock present @@ -478,4 +481,4 @@ dd Mmm YYYY: osync v1.3-RC1 release - Added soft-deleted items - Added backup items in case of conflict -19 Jun. 2013: Project begin as Obackup fork +### 19 Jun. 2013: Project begin as Obackup fork