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

3 files changed, 34 insertions, 14 deletions

diff --git a/doc/forum/Can_we_have_remotes_that_aren__39__t_tracked__63___/comment_2_7cde9785886c8450e1475f0b54481ae3._comment b/doc/forum/Can_we_have_remotes_that_aren__39__t_tracked__63___/comment_2_7cde9785886c8450e1475f0b54481ae3._comment
new file mode 100644
index 000000000..92713db01
--- /dev/null
+++ b/doc/forum/Can_we_have_remotes_that_aren__39__t_tracked__63___/comment_2_7cde9785886c8450e1475f0b54481ae3._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.227"
+ subject="comment 2"
+ date="2014-01-02T17:26:35Z"
+ content="""
+I have now implemented a way to mark a remote as readonly. This prevents git-annex from pushing anything to the remote, or modifying it in other ways.
+
+It seems that in your use case, you might want to avoid git-annex sync pushing the git-annex branch, but still push a branch like master. So far, it's up to you to decide which branches to manually push; readonly disables all pushing.
+"""]]
diff --git a/doc/tips/Synology_NAS_and_git_annex.mdwn b/doc/tips/Synology_NAS_and_git_annex.mdwn
index dd1eb5464..c6f56d2f8 100644
--- a/doc/tips/Synology_NAS_and_git_annex.mdwn
+++ b/doc/tips/Synology_NAS_and_git_annex.mdwn
@@ -4,17 +4,17 @@ This is known to work with DSM 4.3-3810 Update 1 and git-annex standalone versio
 
 ## Installation Steps
 
-1. In the DSM Package Center, install Git, which is available from Synology (no third-party repository needed).
-2. Download the latest [[standalone|Linux_standalone]] git-annex build for Linux on armel.
-3. Extract it somewhere sensible (eg: a bin/ directory your users home directory)
-4. Go into the git-annex.linux directory and ./runshell. You can now run git-annex as you normally would.
+(1) In the DSM Package Center, install Git, which is available from Synology (no third-party repository needed).
+(2) Download the latest [[standalone|Linux_standalone]] git-annex build for Linux on armel.
+(3) Extract it somewhere sensible (eg: a bin/ directory your users home directory)
+(4) Go into the git-annex.linux directory and ./runshell. You can now run git-annex as you normally would.
 
 ## How to sync with the Synology NAS
 
 ### On the Synology
-1. Setup port forwarding and associated dynamic dns, if applicable. Many good guides online for this.
-2. Setup ssh key based authentication with the Synology for each computer you want to sync with it. You want a specific key that is used only by git-annex, for each computer. Again, many good guides online.
-3. In the Synology .ssh/authorized_keys file for your account, add (substituing your username)
+(1) Setup port forwarding and associated dynamic dns, if applicable. Many good guides online for this.
+(2) Setup ssh key based authentication with the Synology for each computer you want to sync with it. You want a specific key that is used only by git-annex, for each computer. Again, many good guides online.
+(3) In the Synology .ssh/authorized_keys file for your account, add (substituing your username)
 [[!format sh """
 command="/home/$yourusername/.ssh/git-annex-shell"
 """]]
@@ -22,18 +22,18 @@ to the beginning of the line. Eg, it would look like this:
 [[!format sh """
 command="/home/greg/.ssh/git-annex-shell" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDT1yE96E/JQNPt0ziiNYJRvndCvLK4uG5h/SNYoAIBF1uH6L7VYAt3HWVqSyi3BcV70WDZ/yWgtNzbrcir46JpvEHMcvYaXLbANwoDGNjG/gsz7kP/8VUxZ6hG3P3ICuwnqVum5+rYXm6oj3xzWPfTRhhRoDZLOQdevSNpdGNaa/lSg8Vuq2suHwjQlQb8AIUuCZmS5cm6XwoUq/jJtN4LTuTPqMjzA6NkdhWM2Kigi9jPQBFborkYBPMphmZwBZiVnhsH1XpaOff+mP03D2gF/huC+b1vbWQstjuehUbY59rvJ4ijb3810Uq2ep7dwLagmILtX5GbL+GS64pAn9sIP annex-othercomputer
 """]]
-4. the git-annex-shell script in your .ssh should be created for you aftering your initial ./runshell
-5. Double check that the script points to the correct directory of where your extracted git-annex.linux lives.
+(4) the git-annex-shell script in your .ssh should be created for you aftering your initial ./runshell
+(5) Double check that the script points to the correct directory of where your extracted git-annex.linux lives.
 
 ### On the other computers - the manual way
-1. See step 2 above about creating the specific git-annex ssh keys.
-2. In your .ssh/config, create an alias for your Synology that includes specifying the right sshkey. For example, mine looks like:
+(1) See step 2 above about creating the specific git-annex ssh keys.
+(2) In your .ssh/config, create an alias for your Synology that includes specifying the right sshkey. For example, mine looks like:
 [[!format sh """
 Host synologyhost
     HostName mydynamicdomain.no-ip.org
     IdentityFile /home/greg/.ssh/annex_rsa
 """]]
-3. Now when you clone the git repo from the Synology, or add it as a remote, do the following:
+(3) Now when you clone the git repo from the Synology, or add it as a remote, do the following:
 [[!format sh """
 git clone greg@synologyhost:/absolute/path/to/annexname annexname
 """]]
@@ -42,7 +42,7 @@ or
 [[!format sh """
 git remote add synology greg@synologyhost:/absolute/path/to/annexname
 """]]
-4. Run git-annex sync
+(4) Run git-annex sync
 
 ### On the other computers - Using the assistant
-1. Use the webapp to add the remote. I'm not sure if there are any gotchas here as I have not done it this way yet.
+(1) Use the webapp to add the remote. I'm not sure if there are any gotchas here as I have not done it this way yet.
diff --git a/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_9_fdc883d3963de8072794f3189742e4e3._comment b/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_9_fdc883d3963de8072794f3189742e4e3._comment
new file mode 100644
index 000000000..2287f6935
--- /dev/null
+++ b/doc/todo/wishlist:___34__quiet__34___annex_get_for_centralized_use_case/comment_9_fdc883d3963de8072794f3189742e4e3._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.227"
+ subject="comment 9"
+ date="2014-01-02T17:25:50Z"
+ content="""
+I have now implemented a way to mark a remote as readonly. This prevents git-annex from pushing anything to the remote, or modifying it in other ways.
+
+It seems that in your use case, you might want to avoid git-annex sync pushing the git-annex branch, but still push a branch like master. So far, it's up to you to decide which branches to manually push; readonly disables all pushing.
+"""]]