2
0
mirror of https://github.com/deajan/osync synced 2024-11-15 12:12:56 +00:00
Commit Graph

1785 Commits

Author SHA1 Message Date
deajan
583998272d Merge branch 'onovy-ssh_user_opt_fix' 2015-06-26 17:25:00 +02:00
deajan
7b7b31fbb0 Merge #19 and unuglify 2015-06-26 17:23:05 +02:00
deajan
dd37cf062e Merge branch 'ssh_user_opt_fix' of https://github.com/onovy/osync into onovy-ssh_user_opt_fix
Conflicts:
	osync.sh
2015-06-26 16:44:24 +02:00
deajan
54c13b85ef Hotfix #22 - Missing full path in soft deletion 2015-06-26 16:31:11 +02:00
Orsiris de Jong
9aa2e1166e Added missing slash 2015-06-24 21:50:46 +02:00
Orsiris de Jong
eb9625bddc Hotfix #22 added rm -rf if file already exists
Fix is only useful if deleted directories already exist and are not empty
2015-06-24 21:43:00 +02:00
Orsiris de Jong
adad3257b3 Hotfix #22 added -f to mv command 2015-06-24 14:07:00 +02:00
Orsiris de Jong
d765bef203 Merge pull request #18 from cron410/patch-1
Grammar and spelling of README.md
2015-05-25 21:58:08 +02:00
cron410
1fc5235a51 Updated requested naming
Used consisted naming conventions.
2015-05-24 02:11:52 -04:00
deajan
9815a7bff3 Fixed #21 for missing readlink on MacOS X & BSD 2015-05-18 10:53:11 +02:00
deajan
c289e71548 Improved osync-batch.sh for crontab execution 2015-04-26 22:32:43 +02:00
deajan
00342e610b Quick fix for osync-batch.sh 2015-04-24 21:13:48 +02:00
onovy
13c9b02add Unit tests. 2015-04-21 12:21:33 +02:00
onovy
6830127f95 PR #16 fix. 2015-04-21 12:18:38 +02:00
deajan
0ea1a3e5de Fixed multiple log messages since lower sleep time 2015-04-20 14:11:09 +02:00
deajan
2f827f9246 Fixed typo in soft deletion and added paranoia checksum 2015-04-13 21:33:43 +02:00
deajan
aef10c2808 Removed legacy lockfile code from init script 2015-04-13 17:26:12 +02:00
deajan
447bd7f36d Removed hard coded program name in init script 2015-04-13 16:46:15 +02:00
cron410
db715824b0 Grammar and spelling of README.md
Edited "Please use double quotes as path delimiters." for more correct grammar.
2015-04-04 18:41:28 -04:00
deajan
6852e4ece7 Quick fix for some quotes 2015-04-01 23:19:07 +02:00
deajan
8f0d0cdf8c Revert "Revert "Typo and documentation fixes""
This reverts commit c13e61f793.
2015-04-01 23:17:40 +02:00
deajan
c13e61f793 Revert "Typo and documentation fixes"
This reverts commit 0812ad0929.
2015-04-01 23:14:46 +02:00
deajan
0812ad0929 Typo and documentation fixes 2015-04-01 23:08:38 +02:00
deajan
737e13ddb9 Fixed #16 where remote user didn't work for elder config files 2015-04-01 15:37:41 +02:00
deajan
b602510cb8 Merged v1.00pre into master after successfull testing 2015-04-01 11:04:44 +02:00
deajan
f870e9b1e6 Merge branch 'master' of github.com:deajan/osync
Merged v1.00pre into master
2015-04-01 11:02:26 +02:00
deajan
864894431c Merged v1.00pre into master after successfull testing 2015-04-01 11:02:03 +02:00
deajan
51c6831466 Updated changelog 2015-04-01 10:36:38 +02:00
deajan
bf39522b23 Removed extra slash for soft deletion 2015-04-01 10:34:40 +02:00
Orsiris de Jong
c5cf89f9d2 Merge pull request #16 from onovy/ssh_user_opt
Remote user is optional now in remote slaves.
2015-03-31 01:57:44 +02:00
deajan
f45086dad3 Refactored soft deletion code 2015-03-31 01:46:07 +02:00
onovy
b992f4277d Remote user is optional now in remote slaves. 2015-03-30 20:13:39 +02:00
deajan
41781aa0da Some more work on soft deletion 2015-03-30 19:51:31 +02:00
deajan
784406a23d Updated with PR #11 2015-03-30 18:27:25 +02:00
deajan
764b3f2914 Merged #11 with new build number 2015-03-30 18:24:31 +02:00
Orsiris de Jong
f2b4dbf75f Merge pull request #11 from onovy/lock-fix
Locking fix in SyncOnChanges mode.
2015-03-30 18:21:54 +02:00
deajan
2507a08b3c Fixed onovy's PR for same dir check 2015-03-30 18:18:05 +02:00
deajan
76f1fe4fa1 Changed build dates 2015-03-30 18:12:01 +02:00
Orsiris de Jong
9c02b4f38e Merge pull request #15 from onovy/param-check
Check scripts params.
2015-03-30 18:04:01 +02:00
Orsiris de Jong
a7820c083e Merge pull request #13 from onovy/lower_sleep
Lower sleep time per cycle.
2015-03-30 17:55:00 +02:00
Orsiris de Jong
feef7f5b66 Merge pull request #14 from onovy/same-master-slave
Check if master and slave dirs are not same.
2015-03-30 01:10:47 +02:00
onovy
0722b25c03 Check scripts params. 2015-03-29 17:57:06 +02:00
onovy
67f9e8b77d Check if master and slave dirs is not same. 2015-03-29 17:30:09 +02:00
onovy
a1fb4bc7de Lower sleep time per cycle. 2015-03-29 16:35:58 +02:00
Orsiris de Jong
60f242e2ae Fixing program build date.
Need to know which osync is run on servers. This is a good way to track version.
2015-03-29 13:41:37 +02:00
Orsiris de Jong
d693a19c81 Merge pull request #12 from onovy/max-wait
Run sync after timeout in inotify mode even when no changes detected.
2015-03-29 13:38:31 +02:00
onovy
52f63f2e12 Run sync after timeout in inotify mode even when no changes detected. 2015-03-29 12:40:39 +02:00
onovy
906cd15436 Locking fix in SyncOnChanges mode. 2015-03-28 22:50:37 +01:00
deajan
e7af81de98 Reworked softdeletion code (WIP). Some other fixes too 2015-03-28 19:06:17 +00:00
deajan
b531479414 news commit 2015-03-28 19:03:04 +00:00