diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-09-23 11:09:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-23 11:09:23 -0400 |
| commit | 226526ff4a13d89107cdb403b2413d3ddc55d960 (patch) | |
| tree | de36aca532e87fb950e6daae39436f2ebfdacc50 /doc | |
| parent | 52b81582773e98c45efa96841cc974bcf706531b (diff) | |
| parent | f61719e7d0fb81532670b4f1eab2899bf95c9c26 (diff) | |
Merge remote-tracking branch 'jcftang/master'
Diffstat (limited to 'doc')
3 files changed, 24 insertions, 1 deletions
diff --git a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn index 58b9acb74..0265cbb44 100644 --- a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn +++ b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn @@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync. Help me prioritize my work: What special remote would you most like to use with the git-annex assistant? -[[!poll open=yes 14 "Amazon S3" 5 "Box.com" 43 "My phone (or MP3 player)" 4 "Tahoe-LAFS" 3 "OpenStack SWIFT" 11 "Google Drive" 8 "Amazon Glacier"]] +[[!poll open=yes 14 "Amazon S3" 6 "Box.com" 43 "My phone (or MP3 player)" 4 "Tahoe-LAFS" 3 "OpenStack SWIFT" 11 "Google Drive" 8 "Amazon Glacier"]] This poll is ordered with the options I consider easiest to build listed first. Mostly because git-annex already supports them and they diff --git a/doc/forum/Error_adding_ssh_remote_in_assistant.mdwn b/doc/forum/Error_adding_ssh_remote_in_assistant.mdwn new file mode 100644 index 000000000..e2ef42a19 --- /dev/null +++ b/doc/forum/Error_adding_ssh_remote_in_assistant.mdwn @@ -0,0 +1,15 @@ +I'm trying to add a ssh remote in the web app, but I receive the following error: + + Internal Server Error + + ssh-keygen ["-F","router.eisenacher81.org"] exited 1 + +The console complains about the known_hosts file: + + /home/michael/.ssh/known_hosts is not a valid known_hosts file. + line 44 missing key: AAAAB3NzaC1yc2EAAAABIwAAAIEAtnX75Qa8YVR... + key_read: uudecode AAAAB3NzaC1|1|veTakKhYY3OSqCepiq7WAUK8cxQ=|suoi0YU/lgg781Vz9O7yTao5exY= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA4bTnEFFiKz4+i3S9DWHJVoV8CD1DsVRJRodWdTA86+x58S0l0rUyJgXbGwScMI+xFCrqzpd4Hgoc4ElRykj5SL+7IuB5ZAe+4ILQPeiL9ck/1Q7uoh7vWiURXr92Hz5tjuEe3QI9H iKauXj5yj5mGq1VVXLN1CdfQ99G4zSxK7c= failed + line 73 invalid key: |1|k9vzo7Ftuxf235It5LbrX36p2f0=|rNHdygip... + line 93: invalid hashed name: |1||1|aptgcuUg4ITWhZQLxzRHH8gUIOQ=|Qe2JAlAw++SZosE9ZhQW+fA3twE=... + line 120 missing key: AAAAB3NzaC1yc2EAAAABIwAAAQEAsHa75NfjyB1... + /home/michael/.ssh/known_hosts is not a valid known_hosts file. diff --git a/doc/forum/Error_adding_ssh_remote_in_assistant/comment_1_eecc0660db4083cc91c5330587f74610._comment b/doc/forum/Error_adding_ssh_remote_in_assistant/comment_1_eecc0660db4083cc91c5330587f74610._comment new file mode 100644 index 000000000..c5ca91231 --- /dev/null +++ b/doc/forum/Error_adding_ssh_remote_in_assistant/comment_1_eecc0660db4083cc91c5330587f74610._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.153.14.141" + subject="comment 1" + date="2012-09-22T12:40:55Z" + content=""" +Looks like you have a corrupt known_hosts file, but I'm pretty sure git-annex did not do it, as it only lets ssh update that as normal. If you delete the problem lines it'll probably work, though you might want to save a copy to investigate what happened. +"""]] |