diff options
Diffstat (limited to 't/mirror-test-setup.sh')
| -rwxr-xr-x | t/mirror-test-setup.sh | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/t/mirror-test-setup.sh b/t/mirror-test-setup.sh index b35364c..32bc462 100755 --- a/t/mirror-test-setup.sh +++ b/t/mirror-test-setup.sh @@ -66,7 +66,7 @@ ssh $mainhost@localhost info lines=" repo gitolite-admin option mirror.master = frodo - option mirror.slaves-1 = sam gollum + option mirror.copies-1 = sam gollum option mirror.redirectOK = sam repo r1 @@ -74,14 +74,14 @@ repo r1 RW = u2 R = u3 option mirror.master = sam - option mirror.slaves-1 = frodo + option mirror.copies-1 = frodo repo r2 RW+ = u2 RW = u3 R = u4 option mirror.master = sam - option mirror.slaves-1 = frodo gollum + option mirror.copies-1 = frodo gollum option mirror.redirectOK = all include \"%HOSTNAME.conf\" @@ -106,7 +106,7 @@ done # goes on frodo lines=" -# local to frodo but sam thinks frodo is a slave +# local to frodo but sam thinks frodo is a copy repo lfrodo RW = u1 @@ -114,13 +114,13 @@ RW = u1 repo mboth RW = u1 option mirror.master = frodo -option mirror.slaves = sam +option mirror.copies = sam # frodo thinks someone else is the master but sam thinks he is repo mnotsam RW = u1 option mirror.master = merry -option mirror.slaves = frodo +option mirror.copies = frodo # local to frodo but sam thinks frodo is a master and redirect is OK repo lfrodo2 @@ -130,14 +130,14 @@ RW = u1 repo nnfrodo RW = u1 option mirror.master = gollum -option mirror.slaves = frodo +option mirror.copies = frodo option mirror.redirectOK = all -# sam is not a valid slave to send stuff to frodo +# sam is not a valid copy to send stuff to frodo repo nvsfrodo RW = u1 option mirror.master = frodo -option mirror.slaves = gollum +option mirror.copies = gollum option mirror.redirectOK = all " @@ -145,43 +145,43 @@ echo "$lines" | sudo -u frodo -i sh -c "cat >> .gitolite/conf/frodo.conf" # goes on sam lines=" -# local to frodo but sam thinks frodo is a slave +# local to frodo but sam thinks frodo is a copy repo lfrodo RW = u1 option mirror.master = sam -option mirror.slaves = frodo +option mirror.copies = frodo # both think they're master repo mboth RW = u1 option mirror.master = sam -option mirror.slaves = frodo +option mirror.copies = frodo # frodo thinks someone else is the master but sam thinks he is repo mnotsam RW = u1 option mirror.master = sam -option mirror.slaves = frodo +option mirror.copies = frodo # local to frodo but sam thinks frodo is a master and redirect is OK repo lfrodo2 RW = u1 option mirror.master = frodo -option mirror.slaves = sam +option mirror.copies = sam option mirror.redirectOK = all # non-native to frodo but sam thinks frodo is master repo nnfrodo RW = u1 option mirror.master = frodo -option mirror.slaves = sam +option mirror.copies = sam option mirror.redirectOK = all -# sam is not a valid slave to send stuff to frodo +# sam is not a valid copy to send stuff to frodo repo nvsfrodo RW = u1 option mirror.master = frodo -option mirror.slaves = sam +option mirror.copies = sam option mirror.redirectOK = all " |