diff options
author | 2013-05-01 21:10:12 -0400 | |
---|---|---|
committer | 2013-05-01 21:10:12 -0400 | |
commit | 3b55dc004210bfb116b84552b372e0bb0631cf68 (patch) | |
tree | 5789a7a6d1f10c257bff452e04ccb35aec99e605 /doc | |
parent | 1e3e0f31fcef6eea11e707d3f91eea6532cb969e (diff) | |
parent | debcec9e756fc56b445635f2177ae63a7ca23b67 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc')
3 files changed, 13 insertions, 2 deletions
diff --git a/doc/design/assistant/blog/day_251__xmpp_improvements.mdwn b/doc/design/assistant/blog/day_251__xmpp_improvements.mdwn index 35dc86b38..7007d7c0d 100644 --- a/doc/design/assistant/blog/day_251__xmpp_improvements.mdwn +++ b/doc/design/assistant/blog/day_251__xmpp_improvements.mdwn @@ -3,7 +3,7 @@ since February, or possibly earlier, not counting trips. Whoops! Also, I was feeling overwhelmed with the complexity of fixing XMPP to not be buggy when there are multiple separate repos using the same XMPP -account. Let my subconcious work on that, and last night it served up the +account. Let my subconscious work on that, and last night it served up the solution, in detail. Built it today. It's only a partial solution, really. If you want to use the same XMPP @@ -21,7 +21,7 @@ Before, it would merge them all together without warning. ---- While I was testing that, I think I found out the real reason why XMPP -pushes have seemed a little unrelaible. It turns out to not be an XMPP +pushes have seemed a little unreliable. It turns out to not be an XMPP issue at all! Instead, the merger was simply not always noticing when `git receive-pack` updated a ref, and not merging it into master. That was easily fixed. diff --git a/doc/forum/webapp_listen_port_with_autostart.mdwn b/doc/forum/webapp_listen_port_with_autostart.mdwn new file mode 100644 index 000000000..fc9d1241b --- /dev/null +++ b/doc/forum/webapp_listen_port_with_autostart.mdwn @@ -0,0 +1,3 @@ +To start the webapp on a X-less server it's possible to use the parameter `--listen` and then connect from a client with X to it. + +How can I start the webapp on all annex repos on this server like on a client with `assistant --autostart`? Would be nice to start the assistant on all configured repos which listens on a defined port, f.e. `git annex assistant --autostart --listen 0.0.0.0:8888`. It would be even nicer to have a parameter to chose a autostart configuration file, f.e. `git annex assistant --autostart --autostart-config /etc/git-annex/autostart --listen 0.0.0.0:8888`, so this could end up in a real server application, a init script would be easy to write... diff --git a/doc/tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant/comment_5_4114380f66b6376c851e93f6876d590b._comment b/doc/tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant/comment_5_4114380f66b6376c851e93f6876d590b._comment new file mode 100644 index 000000000..5d638a3b8 --- /dev/null +++ b/doc/tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant/comment_5_4114380f66b6376c851e93f6876d590b._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo" + nickname="Tobias" + subject="mimetypes" + date="2013-05-01T20:37:33Z" + content=""" +Does `annex.largefiles` support mimetypes? F.e. `git config annex.largefiles \"not mimetype=text/plain\"` +"""]] |