From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Tim O'Callaghan" Subject: Re: My sync setup for Org-mode files and more: unison, git (was: Require feedback on an idea: move to a central server all my org file and edit from there?) Date: Tue, 2 Feb 2016 18:08:22 +0100 Message-ID: References: <2016-01-25T16-24-49@devnull.Karl-Voit.at> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQeRs-0005C5-AS for emacs-orgmode@gnu.org; Tue, 02 Feb 2016 12:09:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQeRr-00028E-04 for emacs-orgmode@gnu.org; Tue, 02 Feb 2016 12:09:04 -0500 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]:37397) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQeRq-00027i-La for emacs-orgmode@gnu.org; Tue, 02 Feb 2016 12:09:02 -0500 Received: by mail-wm0-x22f.google.com with SMTP id l66so32739957wml.0 for ; Tue, 02 Feb 2016 09:09:02 -0800 (PST) In-Reply-To: <2016-01-25T16-24-49@devnull.Karl-Voit.at> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Karl Voit Cc: org-mode Hi, My setup uses Dropbox and encfs. It is the best cross platform solution for managing this problem i have come across. I used to use git repos, unison, ssh tunneling, etc, but Dropbox beats them all hands down, and i can use it with a free account. - Windows - Dropbox + boxcryptor classic - Andoid - Dropbox + android Boxcryptor classic or cryptonite - Linux/Macos - Dropbox + encfs I created a script to automount and manage encfs and possible conflicts on the encrypted filesystem from my bash command line. You can find the script here: https://github.com/timoc/encfsbox I've been using this setup for a few years now and it auto-syncs all of my org files, research material etc (and git repositories) securely between multiple hosts. I also use it to securely share org-files and working support material with others, The only caveat is to add this line (or add a org-mode hook) to the top of your org file, so that if an org file is open elsewhere when you edit your dropbox it will get auto-reloaded by emacs: # -*- mode: org; mode:auto-revert; -*- Dropbox manages conflict detection between the various hosts. I have very rarely had any conflicts between hosts. If you use my enfsbox script it will automatically tell you if it encounters conflicts in the encrypted files, and you can call it with the C parameter to move the conflicted file into the encfs filesystem so you can perform a merge. Hope this helps. Tim. P.S. if you like this idea, and want to create a Dropbox account, please use this link: https://db.tt/d1zHZ92 It donates extra dropbox storage to me, for which i will tidy-up and publish my multi-dropbox account version and accept feature requests via github :) On 25 January 2016 at 16:42, Karl Voit wrote: > Hi! > > * Xebar Saram wrote: >> >> I keep syncing (via git,unison etc) all my org files all the time between 4 >> machines and i just had enough :) im not (and probably never will be) >> disciplined enough to properly save and close all my 100's of buffer before >> i leave each machine each time and im always faced with conflict/merging >> hell.. > > I do have privacy concerns since my most precious data is all > managed via Org-mode. > > My system with four machines (1x Win7, 3x Linux) is: > > - home desktop: > - gitwatch + auto-commit: committing all changes when I save a > file (or a file gets synced) > - unison over ssh: sync with my own root-server via 10min cron-job > > - root server: > - just providing data and sync services > - no Emacs processing > > - home notebook: > - unison over ssh to root server (10min cron-job) > > - work (Win7): > - manual unison sync in the morning & evening > > Since I close Emacs when I'm done working on a machine, I avoid > merge hell so far. > > I never forget to sync because Org is very important to me and the > sync jobs don't just sync Org-mode files but my whole core data-set > of several hundreds megabytes. I tend to use this functionality also > for "high-frequency" backup of my most important data. > > -- > mail|git|SVN|photos|postings|SMS|phonecalls|RSS|CSV|XML to Org-mode: > > get Memacs from https://github.com/novoid/Memacs < > > https://github.com/novoid/extract_pdf_annotations_to_orgmode + more on github > >