Linux/obackup
1
0
Fork 0
mirror of https://github.com/deajan/obackup.git synced 2024-11-15 04:03:41 +01:00
Code Issues Releases Wiki Activity
762 Commits 2 Branches 8 Tags 4 MiB
003aade0a8
Commit Graph

529 Commits

Author SHA1 Message Date
deajan
cfbec5120b Fixed typo 2016-09-09 08:31:16 +02:00
deajan
a35edebafc Check for gpg recipient if encryption is used 2016-09-09 08:14:29 +02:00
deajan
8573ecfcb5 Rebuilt targets 2016-09-08 22:51:24 +02:00
deajan
179434e9b0 Updated common scripts 2016-09-08 22:51:00 +02:00
deajan
25cb702d22 Better GPG compatibility 2016-09-04 22:48:09 +02:00
deajan
8924ae31ff Still trying to resolve the mystery of GPG in travis 2016-09-04 22:34:42 +02:00
deajan
c6f386bf01 Trying to resolve Travis GPG mystery 2016-09-04 22:25:24 +02:00
deajan
6a1b2b9d48 Added more gpg tests 2016-09-04 22:20:18 +02:00
deajan
5a8d1ab811 Another typo bites the dust 2016-09-04 22:05:01 +02:00
deajan
e59fcdbe15 Re enabled gpg fix 2016-09-04 21:51:26 +02:00
deajan
da5d98e922 PassPhrase test 2016-09-04 21:41:05 +02:00
deajan
20cf783bdb Added gpg unit test 2016-09-04 21:37:24 +02:00
deajan
93dbcb4f74 Common travis run 2016-09-04 21:26:19 +02:00
deajan
5aae319a2e Still trying to debug travis 2016-09-04 21:16:48 +02:00
deajan
176564769c Mismatch in loglevels 2016-09-04 21:16:32 +02:00
deajan
f0170d949a Trying to debug travis run 2016-09-04 21:11:05 +02:00
deajan
e741aa6bc2 Fixed typo 2016-09-04 19:42:22 +02:00
deajan
e0a8c5567d Added SetEncryption before all functions 2016-09-04 09:38:11 +02:00
deajan
1187360b62 Run all tests 2016-09-04 09:33:29 +02:00
deajan
099575fb88 Work in progress on encrpytion 2016-09-04 09:30:12 +02:00
deajan
272adb24e7 Fixed typos 2016-09-04 08:37:21 +02:00
deajan
c84e4eae9e Updated tests 2016-09-04 08:07:17 +02:00
deajan
69b41e01dd Fixed double error count in WaitForTaskCompletion 2016-09-04 08:03:28 +02:00
deajan
af9924a648 Updated tests 2016-09-03 14:18:03 +02:00
deajan
2346594adc Kept IsNumeric expand for variable variables 2016-09-03 13:30:38 +02:00
deajan
cd3da2d589 Added Integer test function 2016-09-03 13:10:14 +02:00
deajan
65a3a0a19a Fixed unit tests 2016-09-02 23:22:29 +02:00
deajan
26664835c0 Updated unit test config files 2016-09-02 23:20:48 +02:00
deajan
cf8f3f20ef Minor fixes 2016-09-02 23:20:07 +02:00
deajan
fc8ef801a4 Fix EscapeSpaces on bash >= 4.3 2016-09-02 21:18:18 +02:00
deajan
3b090d8e43 Changed travis ssh config 2016-09-02 20:36:45 +02:00
deajan
3134131975 Made tee work with push command 2016-09-02 20:32:17 +02:00
deajan
bfbd57490b Added known_hosts workaround for ssh tests 2016-09-02 20:31:49 +02:00
deajan
064b3f875b Debugging travis 2016-09-02 16:33:49 +02:00
deajan
dd42cd08b0 Fixed problem with gpg 1 2016-09-02 16:33:23 +02:00
deajan
05590e1266 Debug Travis CI tests 2016-09-02 16:08:23 +02:00
deajan
2ce18fb721 Fix paths 2016-09-02 15:53:39 +02:00
deajan
caf8301679 Another typo fixing :' sic 2016-09-02 15:47:02 +02:00
deajan
f9fef31e73 OMG! bad coding fix 2016-09-02 15:36:18 +02:00
deajan
9fabedaeb4 Added return codes logs to connectivitychecks 2016-09-02 15:34:24 +02:00
deajan
fa038f9994 Fixed typo 2016-09-02 13:38:35 +02:00
deajan
c42b80ccb0 Trying to disable SSH known hosts for Travis tests 2016-09-02 13:37:01 +02:00
deajan
a14431c828 Fixed shunit2 runner 2016-09-02 13:27:39 +02:00
deajan
326f8a8245 Added conf file selection 2016-09-02 13:22:24 +02:00
deajan
e77a20595b Changed conf files for travis 2016-09-02 13:18:27 +02:00
deajan
4c8ae70b73 Added dev comment 2016-09-02 13:14:41 +02:00
deajan
2f7cea1736 Bumped program build 2016-09-02 13:14:30 +02:00
deajan
428c6464e2 Updated config files 2016-09-02 13:14:04 +02:00
deajan
f28b884c01 Added encryption unit tests 2016-09-02 13:13:53 +02:00
deajan
694b73983a Fixed encryption paths 2016-09-02 12:16:25 +02:00
deajan
6647a7be59 WIP: making encryption coherent 2016-09-01 22:55:11 +02:00
deajan
35c7dc97c2 Multiple typo fixes 2016-09-01 22:15:16 +02:00
deajan
66babd22fa Fixed paths 2016-09-01 20:32:38 +02:00
deajan
758f074d65 Fixed typo 2016-09-01 17:27:53 +02:00
deajan
92258308fe Encryption implemented 2016-09-01 16:07:20 +02:00
deajan
672672af2b Code cleanup 2016-09-01 15:50:29 +02:00
deajan
67b42842db Added encryption support for SQL backups 2016-09-01 15:44:29 +02:00
deajan
5ca743f7da Added crypt disk space calculation 2016-09-01 15:11:56 +02:00
deajan
1c88c73b5c WIP: encrypt & decrypt functions working 2016-09-01 14:37:01 +02:00
deajan
084fd91005 Work in progress for encryption 2016-08-31 23:32:21 +02:00
deajan
2ac8b646a9 Rebuilt targets 2016-08-31 12:28:19 +02:00
deajan
f74aad596d Changed --database since it's deprecated 2016-08-31 12:27:53 +02:00
deajan
89975337c9 Updated test conf files 2016-08-31 11:28:12 +02:00
deajan
bb8cf4a27c Rebuilt targets 2016-08-31 11:26:21 +02:00
deajan
0127da6ac3 Added more mysqldump flexibility 2016-08-31 11:15:12 +02:00
deajan
fbdd12dc72 Added ParallelExec function test 2016-08-30 21:50:04 +02:00
deajan
e6be72f5a8 Removed debug line 2016-08-30 19:17:14 +02:00
deajan
9da86de41e Fixed merge program variable 2016-08-30 18:56:18 +02:00
deajan
a6f52125b0 Updated ofunctions 2016-08-30 18:55:36 +02:00
deajan
8cef797979 Trying to diag Travis results 2016-08-30 18:50:19 +02:00
deajan
0cab87309f Improved merge.sh with exit codes. 2016-08-30 18:28:27 +02:00
deajan
5371f859e9 Test travis system 2016-08-30 18:28:08 +02:00
deajan
133e1ebe0e Improved travis CI tests 2016-08-30 18:12:59 +02:00
deajan
a9077af7bb Minor fixes 2016-08-30 18:11:54 +02:00
deajan
a583835cf5 Added merge test 2016-08-30 16:26:30 +02:00
deajan
35558cf48c Added merge test 2016-08-30 16:24:30 +02:00
deajan
9daa4c10bf Updated tests for Travis CI 2016-08-30 16:12:10 +02:00
deajan
8c17c2dfe2 Added ~ expansion 2016-08-30 15:36:08 +02:00
deajan
d415a727bf Added more explicit log message 2016-08-29 18:27:34 +02:00
deajan
cf908c4fab Replaced 0/1 with booleans 2016-08-29 18:27:12 +02:00
deajan
4a9ebd0abc Updated ofunctions 2016-08-29 18:26:47 +02:00
deajan
40eb0f760c Fixed result variable name 2016-08-26 15:18:07 +02:00
deajan
4755fbacb7 Rebuilt targets 2016-08-26 15:10:30 +02:00
deajan
9cfcf338e1 SendAlert now triggered as last action 2016-08-26 15:09:01 +02:00
deajan
bf8e45217c Logs sent per mail are now only limited to current run 2016-08-26 15:08:01 +02:00
deajan
8817c68f7c Better __CheckArguments function 2016-08-26 14:46:11 +02:00
deajan
134aaec0da SendAlert arg check is now ranged 2016-08-26 14:23:57 +02:00
deajan
5b9f6c5fa2 __CheckArguments now also takes ranges 2016-08-26 14:23:36 +02:00
deajan
809e6a1d4f Improved logging output 2016-08-26 12:28:53 +02:00
deajan
2c55108ba6 Fixed bogus double log alert sending 2016-08-26 12:09:22 +02:00
deajan
cfd76c0c4c Fixed typo 2016-08-26 12:06:49 +02:00
deajan
d1c845ba67 More clear subject line in alerts 2016-08-26 12:01:35 +02:00
deajan
e966682ecc Fixed double time check in database backup 2016-08-26 11:57:55 +02:00
deajan
fc84c633a8 Work in progress for encryption 2016-08-26 11:55:58 +02:00
deajan
a342b1ba1d Increased remote host soft max time 2016-08-23 23:40:20 +02:00
deajan
da0a45e3d3 Rebuilt targets 2016-08-22 09:11:32 +02:00
deajan
0d4664cae0 Fixed typo 2016-08-22 08:32:56 +02:00
deajan
53677b00d3 Updated serial 2016-08-22 08:30:19 +02:00
deajan
1e1adf3470 Fixed code removal 2016-08-22 08:29:58 +02:00
deajan
ae23418f7b Fixed signal posfix compliance 2016-08-22 08:25:47 +02:00
deajan
775866b62d Fixed RunAfterHook exec + signal posix compliance 2016-08-22 08:25:31 +02:00
deajan
51b43487e2 More waitFor function tests + arg list 2016-08-18 22:38:28 +02:00
deajan
f550b03d4d Adapted arg list for WaitFor function 2016-08-18 22:38:06 +02:00
deajan
cb8bd6b326 Rebuilt targets 2016-08-18 22:16:15 +02:00
deajan
37b94c6712 Adapted parameters for WaitFor function 2016-08-18 22:15:08 +02:00
deajan
5c8eb7fdf9 Removed unused parameter in WaitFor function 2016-08-18 22:14:46 +02:00
deajan
db32308c40 Updated test conf files 2016-08-18 17:15:10 +02:00
Orsiris de Jong
7fb22d0732 Fixed INSTANCE_ID for push test 2016-08-18 17:11:43 +02:00
deajan
6d63a4b754 Better unit tests 2016-08-18 17:10:53 +02:00
deajan
d006328b61 Rebuilt targets 2016-08-18 14:23:57 +02:00
deajan
6cbb732d7c Added basic shunit2 tests 2016-08-18 14:19:52 +02:00
deajan
bda19b3822 Finally fixed all space related errors 2016-08-18 12:58:05 +02:00
deajan
073291934b Added another debugging function 2016-08-18 12:57:50 +02:00
deajan
b7c49ed6d9 Rebuilt targets 2016-08-18 11:53:18 +02:00
deajan
9fed22d4f9 Added some test files 2016-08-18 11:52:46 +02:00
deajan
f6c916f6ef Fixed infamous typo 2016-08-18 11:05:30 +02:00
deajan
9f6e676a9a Fixed GetDirectoriesSize...again 2016-08-18 10:58:35 +02:00
deajan
a6be969081 Fixed spaces in backup dirs 2016-08-18 10:18:56 +02:00
deajan
2d49c957de Fixed backup rotation bug introduced with code rework 2016-08-17 15:27:40 +02:00
deajan
a4e4c5b7be Fixed warning when testing process state 2016-08-17 15:26:54 +02:00
deajan
a4038750a7 Added bash test 2016-08-17 13:44:14 +02:00
deajan
2658730f70 Fixed typo 2016-08-17 10:44:28 +02:00
deajan
56173e9d1c Improved batch runner 2016-08-17 10:24:27 +02:00
deajan
87dd096f61 Rebuilt targets 2016-08-17 10:01:55 +02:00
deajan
a84a8c95f9 Standarised exit codes 2016-08-17 10:01:27 +02:00
deajan
aa581c5ce1 Improved batch runner 2016-08-17 10:00:23 +02:00
deajan
a74e83185a Fixed double backup path in rotate functions 2016-08-17 09:20:52 +02:00
deajan
01ddddcb49 Added keep logging preflight check 2016-08-17 09:14:09 +02:00
deajan
234961e982 Rebuilt targets 2016-08-16 23:19:18 +02:00
deajan
9fe0aa3546 Fixed double RunAfterHook launch 2016-08-16 23:19:01 +02:00
deajan
49748686b9 Rebuilt Targets 2016-08-16 22:55:16 +02:00
deajan
18f318d138 Last fix for killchilds 2016-08-16 22:54:36 +02:00
deajan
075c673717 Cannot use function before declaration 2016-08-16 22:53:22 +02:00
deajan
01725786f1 Rebuilt targets 2016-08-16 22:40:02 +02:00
deajan
0e085000d7 Fixed WaitForTaskCompletion killchilds call 2016-08-16 22:39:13 +02:00
deajan
cccb358373 Moved keep logging back to ofunctions 2016-08-16 22:37:36 +02:00
deajan
0df0f8c44c Rebuilt targets 2016-08-16 21:24:48 +02:00
deajan
cd35771399 Added keep logging argument 2016-08-16 21:23:57 +02:00
deajan
9ca9ab6ed0 Removed keep logging 2016-08-16 21:13:21 +02:00
deajan
ce841a29ac Rebuilt targets 2016-08-16 20:39:49 +02:00
deajan
c822c6e3eb Updated waitfortaskcompletion kill functionality 2016-08-16 20:39:13 +02:00
deajan
4e95245374 Ignoring backup size should give size -1Ko 2016-08-15 11:52:55 +02:00
deajan
2d3ce5cd6f Rebuilt targets 2016-08-15 10:29:13 +02:00
deajan
357f4a1b71 Handle uninterruptible sleep state processes 2016-08-15 10:15:05 +02:00
deajan
0d958ed923 Rebuilt targets 2016-08-08 19:00:52 +02:00
deajan
ec5720623d Added shellcheck wrapper for debug env 2016-08-08 18:55:22 +02:00
deajan
7b378dafb7 Added missing -r to read 2016-08-08 18:43:35 +02:00
deajan
40af118c1e Rebuilt targets 2016-08-08 16:35:11 +02:00
deajan
f7a3c4b3f0 Removed unused IFS statements 2016-08-08 16:32:06 +02:00
deajan
81c9ddf202 Rebuilt targets 2016-08-08 15:49:48 +02:00
deajan
93a5dbcf78 Various fixes 2016-08-08 15:47:47 +02:00
deajan
dbeb79980f Rebuilt targets 2016-08-08 00:23:48 +02:00
deajan
6fb84d1441 Fixed wrong variable names 2016-08-08 00:10:28 +02:00
deajan
dbe0020c85 Fixed wrong variable names 2016-08-08 00:03:19 +02:00
deajan
cc5a2a4fd1 Rebuilt targets 2016-08-07 23:47:21 +02:00
deajan
88a927c0b4 Refactor wait functions 2016-08-07 23:45:40 +02:00
deajan
1a98f1c855 Rebuilt targets 2016-08-06 16:16:19 +02:00
deajan
b66f25f436 Updated merge tool 2016-08-06 16:14:07 +02:00
deajan
4b888812ff Revert "Updated merge tool" 
This reverts commit 0aee59e05e.
 2016-08-06 16:13:11 +02:00
deajan
0aee59e05e Updated merge tool 2016-08-06 16:12:31 +02:00
deajan
7cdb0e6ac7 Added installer template 2016-08-06 15:15:46 +02:00
deajan
d860242781 Made merge.sh work with all programs 2016-08-06 15:15:11 +02:00
deajan
9ef1841543 Bumped version to dev 2016-08-06 14:04:35 +02:00
deajan
69d1729b2e Begin code rewrite 2016-08-06 14:02:52 +02:00
deajan
8828a21741 Added new logger prefix option 2016-08-06 13:53:12 +02:00
deajan
deb10dd3f0 Updated ofunctions 2016-08-06 13:52:17 +02:00
deajan
200b0a8685 Bumped version to 2.0 2016-08-06 13:42:25 +02:00
deajan
7f99fd6c67 Fixed double pattern declaration 2016-08-06 13:16:45 +02:00
deajan
b1c6aeb6fc Fixed mysqldump error codes not honored 2016-07-19 13:28:16 +02:00
deajan
fcab617c0d Code cleanup 2016-07-19 13:26:16 +02:00
deajan
557738a5e5 Code cleanup 2016-07-19 12:58:05 +02:00
deajan
f2d121f38f Rebuild after osync fix #52 2016-07-19 10:53:55 +02:00
deajan
2488f9f654 Fix for osync bug #52 2016-07-19 10:53:33 +02:00
deajan
48c178ed6b Updated ofunctions 2016-05-26 22:34:08 +02:00
deajan
82e1b68398 Minor additions to ofunctions 2016-05-26 22:33:47 +02:00
deajan
7a7a7c08bc Fixed regression for Mac/BSD 2016-05-26 11:11:43 +02:00
deajan
5808e87057 Bumped version to v2.0-RC1 2016-05-25 20:11:37 +02:00
deajan
04a66b2c9c Updated ofunctions 2016-05-25 19:55:54 +02:00
deajan
92c3b38fff Finished windows support for generic mail sending function 2016-05-25 19:55:20 +02:00
deajan
fdc71ceda3 Fixed installer paths 2016-04-14 18:01:18 +02:00
deajan
2c51055209 More debugging love for KillChilds 2016-04-12 09:41:16 +02:00
deajan
1913c897f1 More debugging in KillChilds 2016-04-12 09:14:44 +02:00
deajan
f5dfc478a2 Fixed bogus debug line in Killchilds 2016-04-10 21:11:59 +02:00
deajan
39de9cdfa5 Some msys/cygwin compat fixes 2016-04-08 21:09:00 +02:00
deajan
d0982a6cf6 Added more preflight checks 2016-04-06 21:02:33 +02:00
deajan
15d3d98164 Added an option to run after exec cmd on error 2016-04-06 20:47:04 +02:00
deajan
9d057ea95f Made logging begin before remote checks 2016-04-06 20:41:58 +02:00
deajan
e3c9c5cb18 Updated ofunctions.sh with userland logging 2016-04-06 20:41:34 +02:00
deajan
4ad99413f4 Added userland logging 2016-04-06 20:40:20 +02:00
deajan
33570bc3f1 Reversed some function args to make debug easier 2016-04-01 21:22:18 +02:00
deajan
087638c8ae Fixing wrong ofunctions.sh upload 2016-03-31 23:00:01 +02:00
deajan
d39f6d092d Better KillChild and WaitForTaskCompletion 2016-03-31 14:28:18 +02:00
deajan
b91f80702e Reverted using eval in SendAlert 2016-03-31 11:59:53 +02:00
deajan
38c39360b7 Added pre-flight check for SSH_IGNORE_KNOWN_HOSTS 2016-03-31 10:54:24 +02:00
deajan
91dd9f5104 Fixed missing SSH OPTS in RSYNC_SSH 2016-03-31 10:05:30 +02:00
deajan
60266c40a6 Fixed bogus SSH_OPTS variable 2016-03-31 10:02:42 +02:00
deajan
a7e8487df3 Added optional statistics for installer 2016-03-25 22:51:26 +01:00
deajan
b9d2b72ac9 Added ignore known hosts option to obackup 2016-03-25 20:07:27 +01:00
deajan
7eeff3b476 Added an option to ignore ssh known hosts 2016-03-25 20:05:29 +01:00
deajan
a61cb4d7cd Fixed pfSense mail according to jimp's comment 2016-03-22 14:15:40 +01:00
deajan
ac50d769c9 Added pfSense mail.php support 2016-03-22 12:38:09 +01:00
deajan
f931227cd2 Minor enhancement in os detection log 2016-03-20 16:52:49 +01:00
deajan
c2675e125d Added cygwin to supported OS list 2016-03-20 16:49:29 +01:00
deajan
234fcd9887 Fixed not using remote find cmd defined by InitRemoteOSSettings 2016-03-18 19:20:28 +01:00
deajan
5c74224dcd Some sanity code cleanup 2016-03-14 21:50:40 +01:00
deajan
69fc7ac9cd Reduced log level for 3rdparty pings 2016-03-10 10:26:26 +01:00
deajan
0f11faa7c7 Improved logging for execution time 2016-03-04 09:34:02 +01:00
deajan
d2ab111f90 Improved mail sending 2016-03-03 16:33:59 +01:00
deajan
d36c77d777 Moved loglevel from stdout to logfile only 2016-03-03 16:29:32 +01:00
deajan
b27ee4f8c1 Added loglevel to log filesé 2016-03-03 16:26:52 +01:00
deajan
192e1d2f65 Added instance run check. 2016-03-03 16:06:27 +01:00
deajan
6eea38afdf Fixed rsync options placement 2016-03-01 20:11:38 +01:00
deajan
18f530ce0c Raised soft exec time for RotateCopies 2016-03-01 19:35:40 +01:00
deajan
6712fc6cc7 Moved rsync patterns from obackup to ofunctions 2016-02-21 11:13:23 +01:00
deajan
42a86c116d Typo fixing and shellcheck pass 2016-02-19 22:14:13 +01:00
deajan
0096fe81c8 Minor adapts from osync 2016-02-16 21:09:57 +01:00
deajan
d1c5de13de Fixed subject in sendmail 2015-11-30 14:49:19 +01:00
deajan
d584149e39 Added missing global config file value 2015-11-28 12:48:40 +01:00
deajan
6cd1815ed9 Added include patterns to backup 2015-11-28 12:48:19 +01:00
deajan
954606b8ba Fixed bogus directory creation in some backup cases 2015-11-21 13:22:14 +01:00
deajan
61a70b1ba5 Fixed ofunctions.sh path 2015-11-19 23:05:59 +01:00
deajan
4b2b99d016 Revert "Fixed ofunctions path" 
This reverts commit 896eb0b650.
 2015-11-19 23:04:02 +01:00
deajan
896eb0b650 Fixed ofunctions path 2015-11-19 23:03:18 +01:00
deajan
da043ed3ae Added remote dir creation before file backup. 2015-11-19 22:14:15 +01:00
deajan
213b2de002 Fixed sudo not necessary on local commands 2015-11-18 10:52:43 +01:00
deajan
013fbdf000 Added file / sql backup rotation distinction 2015-11-16 12:52:15 +01:00
deajan
87dd950199 Fixed wrong file size detection 2015-11-15 14:47:20 +01:00
deajan
3b17f127cf Fixed remote rotation for filenames containing spaces 2015-11-15 12:20:42 +01:00
deajan
197f3036d1 Initial v2.0 upload 2015-11-12 01:26:38 +01:00