Merge branch 'master' of ssh://git-annex.branchable.com

2 files changed, 37 insertions, 0 deletions

diff --git a/doc/bugs/Error_running_git-annex.app_on_OS_X_10.13.1___40__17B1003__41__.mdwn b/doc/bugs/Error_running_git-annex.app_on_OS_X_10.13.1___40__17B1003__41__.mdwn
new file mode 100644
index 000000000..314d49f0c
--- /dev/null
+++ b/doc/bugs/Error_running_git-annex.app_on_OS_X_10.13.1___40__17B1003__41__.mdwn
@@ -0,0 +1,27 @@
+### Please describe the problem.
+git-annex doesn't start.
+
+### What steps will reproduce the problem?
+launch git-annex from terminal (if it is ran from GUI it doesn't open without notifying any error)
+
+### What version of git-annex are you using? On what operating system?
+Version: 6.20171128-g58b04cd2e on OS X 10.13.1 (17B1003)
+
+### Please provide any additional information below.
+I solved the issue by manually changing the file /Applications/git-annex.app/Contents/MacOS/bundle/B which is an alias pointing to the file /Applications/git-annex.app/Contents/MacOS/bundle/usr/lib/libz.1.dylib with a new alias having the same name 'B' which link to /usr/lib/libz.1.dylb.
+I'm pretty sure this is not an optimal and general solution, but it is useful in order to prove what's the problem. Further, for it worked. 
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+dyld: Symbol not found: _inflateValidate
+  Referenced from: /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib
+  Expected in: /Applications/git-annex.app/Contents/MacOS/bundle/B
+ in /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib
+Abort trap: 6
+
+# End of transcript or log.
+"""]]
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+
diff --git a/doc/forum/How_to_organise_backup_to_S3__63__.mdwn b/doc/forum/How_to_organise_backup_to_S3__63__.mdwn
new file mode 100644
index 000000000..25ead06aa
--- /dev/null
+++ b/doc/forum/How_to_organise_backup_to_S3__63__.mdwn
@@ -0,0 +1,10 @@
+Hello,
+
+what is the best way to use git-annex as a backup tool to S3? As far as I know, even if all data is copied to S3, I need a checkout of the git repo, correct? And of course the private key used.
+
+- Is there a way to also save the repository data to S3? To have something like ```git annex restore-from-external-remote ...```
+
+- If not, how do you organise the backup so that it is disaster proof? Upload the repo to some other external server regularly?
+
+Thanks,
+Florian