| 
						
					 | 
					
						
						
						
						
							
						
						
							46b29dfce9
							
						
					 | 
					
						
						
							
							fix(script): fix dockerCmd quoting error
						
						
						
						
						
					 | 
					
						2022-07-15 13:49:59 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							47adaceed0
							
						
					 | 
					
						
						
							
							feature(version): add version display to script
						
						
						
						
						
					 | 
					
						2022-07-12 15:07:36 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							475a0d0dd2
							
						
					 | 
					
						
						
							
							refactor(compose): detect proper compose cmd
						
						
						
						
						
					 | 
					
						2022-07-12 14:55:43 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							818483f92e
							
						
					 | 
					
						
						
							
							refactor(vars): quote dockerCmd calls
						
						
						
						
						
					 | 
					
						2022-07-12 14:54:17 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c8b328e707
							
						
					 | 
					
						
						
							
							fix(typos): fix various typos
						
						
						
						
						
					 | 
					
						2022-07-12 12:52:37 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fb4dcab29a
							
						
					 | 
					
						
						
							
							chore(shellcheck): ignore some warnings
						
						
						
						
						
					 | 
					
						2022-07-12 12:50:42 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5382dd26d9
							
						
					 | 
					
						
						
							
							fix(cleanup): prevent doDocker error loop
						
						
						
						
						
						
						
						- if doDocker throws an error, cleanup is called which again calls doDocker
- resolve this loop by passing a variable from cleanup 
						
					 | 
					
						2022-07-12 12:47:52 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bd36035a9f
							
						
					 | 
					
						
						
							
							refactor(compose): update container name lookup
						
						
						
						
						
						
						
						- filter by both compose v1 and v2 naming conventions 
						
					 | 
					
						2022-07-12 12:34:26 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							389f5ef059
							
						
					 | 
					
						
						
							
							feature(compose): detect and use proper compose cmd
						
						
						
						
						
						
						
						- check for compose v2 and use 'docker compose'
- if v2 not detected, fallback to 'docker-compose' 
						
					 | 
					
						2022-07-12 12:31:24 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8d10a1a3b9
							
						
					 | 
					
						
						
							
							feature(version): add param to display version
						
						
						
						
						
						
						
						- as per user request 
						
					 | 
					
						2022-07-12 11:36:57 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							aa2c17799c
							
						
					 | 
					
						
						
							
							fix(DETAILS): remove erroneous spaces
						
						
						
						
						
						
						
						Closes github #11 
						
					 | 
					
						2021-03-08 03:45:18 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							1334975cab
							
						
					 | 
					
						
						
							
							fix(BACKUP): fix colour var usage
						
						
						
						
						
						
						
						SQL dump success and REDIS dump success msg printed 'cyan' instead of
using the colour var 
						
					 | 
					
						2021-03-08 00:50:55 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							19d1eb1587
							
						
					 | 
					
						
						
							
							refactor(BACKUP): prevent alias cmds
						
						
						
						
						
						
						
						- prefix cp and cd with \ to prevent alias cmd
- fix typo in comment 
						
					 | 
					
						2021-03-08 00:40:11 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							4aae61f97e
							
						
					 | 
					
						
						
							
							feature(BACKUP): allow non-default borg location
						
						
						
						
						
						
						
						- parameter to specify non-default borg program location
Closes github #10 
						
					 | 
					
						2021-03-08 00:36:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							5ea25529b9
							
						
					 | 
					
						
						
							
							feature(BACKUP): add SSH port customization
						
						
						
						
						
						
						
						- borgSSHPort variable in details file
- read and appended to RSH connection string
- default to standard port 22
Closes github #9 
						
					 | 
					
						2021-03-08 00:08:22 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							de76918e81
							
						
					 | 
					
						
						
							
							feature(BACKUP): parameterize log colourization
						
						
						
						
						
						
						
						Closes github #9 
						
					 | 
					
						2021-03-07 23:54:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							16f4c11f91
							
						
					 | 
					
						
						
							
							fix(BACKUP): remove extraneous mailcow dir in xtraLocation
						
						
						
						
						
					 | 
					
						2021-02-15 15:43:18 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							0bc0f8e5f9
							
						
					 | 
					
						
						
							
							refactor(BACKUP): update xtraLocation sample
						
						
						
						
						
					 | 
					
						2021-02-15 15:39:43 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							21e4a6774c
							
						
					 | 
					
						
						
							
							docs(BACKUP): change xtraListPath description
						
						
						
						
						
						
						
						- description was misleading, this is not a required variable
- holdover from importing 
						
					 | 
					
						2021-02-15 15:37:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							f2231c7074
							
						
					 | 
					
						
						
							
							fix(BACKUP): change borg cmd
						
						
						
						
						
						
						
						- place common-options after borg command verb
- thanks to lluis
Closes github 7 
						
					 | 
					
						2021-02-09 16:56:38 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							2747b10040
							
						
					 | 
					
						
						
							
							docs(RESTORE): remove misleading copied comments
						
						
						
						
						
					 | 
					
						2021-02-09 14:59:59 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							876f8eee9e
							
						
					 | 
					
						
						
							
							fix(RESTORE): fix restore path when non-verbose
						
						
						
						
						
						
						
						- non-verbose tar extraction was set to null path 
						
					 | 
					
						2021-02-09 14:58:50 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							3a3b02685b
							
						
					 | 
					
						
						
							
							make restore script executable
						
						
						
						
						
					 | 
					
						2021-02-09 08:30:06 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							85e34c73a3
							
						
					 | 
					
						
						
							
							feature(BACKUP): add compression option
						
						
						
						
						
						
						
						- parameter to specify compression used by borg
- as requested by shaneonabike (via github)
Closes github 5 
						
					 | 
					
						2021-02-09 08:22:48 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e592633b9
							
						
					 | 
					
						
						
							
							fix(BACKUP): bypass possible cd aliases
						
						
						
						
						
					 | 
					
						2021-02-09 08:03:23 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							e127616800
							
						
					 | 
					
						
						
							
							fix(BACKUP): fix missing parameter shift
						
						
						
						
						
						
						
						- docker timeout parameters 
						
					 | 
					
						2021-02-09 08:02:34 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							053e45affc
							
						
					 | 
					
						
						
							
							docs(RESTORE): add inline help
						
						
						
						
						
					 | 
					
						2021-02-09 07:46:42 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							fb58c06489
							
						
					 | 
					
						
						
							
							fix(RESTORE): fix output to console when non-verbose
						
						
						
						
						
					 | 
					
						2021-02-09 07:13:12 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							010ab1dceb
							
						
					 | 
					
						
						
							
							perf(RESTORE): exit if nothing to do
						
						
						
						
						
					 | 
					
						2021-02-09 06:49:33 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							f28ad5e6e7
							
						
					 | 
					
						
						
							
							refactor(RESTORE): add logging for mailcow start/stop
						
						
						
						
						
					 | 
					
						2021-02-09 06:45:30 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							06df565348
							
						
					 | 
					
						
						
							
							style(RESTORE): add space before append redirects
						
						
						
						
						
					 | 
					
						2021-02-09 06:42:27 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							ea0d98734a
							
						
					 | 
					
						
						
							
							fix(RESTORE): fix accidental log file overwrite vs append
						
						
						
						
						
					 | 
					
						2021-02-09 06:39:38 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							b07ad2c0ee
							
						
					 | 
					
						
						
							
							perf(RESTORE): use docker-compose stop timeout
						
						
						
						
						
					 | 
					
						2021-02-09 06:01:04 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							84605567cd
							
						
					 | 
					
						
						
							
							feature(RESTORE): restart mailcow after completion
						
						
						
						
						
					 | 
					
						2021-02-09 05:59:37 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c6019f7da
							
						
					 | 
					
						
						
							
							feature(RESTORE): process secondary volume restoration
						
						
						
						
						
					 | 
					
						2021-02-09 05:48:17 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							363c970f2f
							
						
					 | 
					
						
						
							
							refactor(RESTORE): create and use restore function
						
						
						
						
						
						
						
						- single function to handle non-SQL restore operations
- replace previous mail and crypt restore with new function 
						
					 | 
					
						2021-02-09 05:41:56 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							cc30581382
							
						
					 | 
					
						
						
							
							feature(RESTORE): restore mail and encryption key
						
						
						
						
						
					 | 
					
						2021-02-09 05:00:08 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							c9b85d084e
							
						
					 | 
					
						
						
							
							feature(RESTORE): stop docker containers and confirm
						
						
						
						
						
					 | 
					
						2021-02-08 11:30:39 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf18c80f94
							
						
					 | 
					
						
						
							
							refactor(RESTORE): execute docker-compose silently
						
						
						
						
						
					 | 
					
						2021-02-08 10:59:47 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							764f35a695
							
						
					 | 
					
						
						
							
							docs(RESTORE): update error message list
						
						
						
						
						
					 | 
					
						2021-02-08 10:53:14 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba212f738f
							
						
					 | 
					
						
						
							
							feature(RESTORE): clearer more accurate exit report messages
						
						
						
						
						
						
						
						- change exit messages based on errors, warnings, etc.
- separate error codes for exit with non-crit err and/or warnings 
						
					 | 
					
						2021-02-08 10:52:17 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							59cc9a5d66
							
						
					 | 
					
						
						
							
							fix(RESTORE): increment errorCount on SQL import error
						
						
						
						
						
					 | 
					
						2021-02-08 10:39:35 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							7b3ff7f6ae
							
						
					 | 
					
						
						
							
							fix(RESTORE): strip trailing slash from backup-location
						
						
						
						
						
					 | 
					
						2021-02-08 10:31:03 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							78e1ed2539
							
						
					 | 
					
						
						
							
							perf(RESTORE): remove duplicate backup-location existence check
						
						
						
						
						
					 | 
					
						2021-02-08 10:28:21 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							af4fcf3cf3
							
						
					 | 
					
						
						
							
							fix(RESTORE): exit on invalid backup location
						
						
						
						
						
					 | 
					
						2021-02-08 10:25:24 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							561437d667
							
						
					 | 
					
						
						
							
							fix(RESTORE): fix printf err
						
						
						
						
						
					 | 
					
						2021-02-08 10:24:19 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							e4cd29fd42
							
						
					 | 
					
						
						
							
							feature(RESTORE): restore SQL database
						
						
						
						
						
					 | 
					
						2021-02-08 09:43:49 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							54ca63657f
							
						
					 | 
					
						
						
							
							fix(RESTORE): change to mc directory before imports
						
						
						
						
						
					 | 
					
						2021-02-08 09:21:25 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							de96d55268
							
						
					 | 
					
						
						
							
							refactor(RESTORE): update imported code to use writeLog func
						
						
						
						
						
					 | 
					
						2021-02-08 08:56:12 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Asif Bacchus
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d793dc291
							
						
					 | 
					
						
						
							
							feature(RESTORE): abort if mc not pre-initialized
						
						
						
						
						
					 | 
					
						2021-02-08 08:46:14 -07:00 | 
					
					
						
						
							
							
							
						
					 |