Merge branch 'go' of csclub.uwaterloo.ca:public/mirror into go

.gitignore

@@ -13,3 +13,7 @@
 /.config/
 /.cache/
 /.ssh/
+log/
+log-rsync/
+log-zfssync/
+state/

merlin/Handoff.md

@@ -15,7 +15,7 @@
 - [ ] fedora-epel
 - [ ] cygwin <
 - [ ] gnu <
-- [ ] nognu <
+- [ ] nongnu <
 - [ ] mysql <
 - [ ] gnome <
 - [ ] damnsmalllinux <

merlin/merlin-config.ini

@@ -23,6 +23,7 @@ rsync_dir = puppylinux
 
 [CPAN]
 verbose = true
+dry_run = true
 sync_type = csc-sync-standard
 frequency = twice-daily
 local_dir = CPAN
@@ -56,7 +57,7 @@ local_dir = gnu
 rsync_host = ftp.gnu.org
 rsync_dir = gnu
 
-[nognu]
+[nongnu]
 verbose = true
 dry_run = true
 sync_type = csc-sync-standard
@@ -82,7 +83,7 @@ frequency = twice-daily
 local_dir = gnome
 rsync_host = master.gnome.org
 rsync_dir = gnomeftp
-password_file = /home/mirror/passwords/gnome
+password_file = /home/mirror-go/passwords/gnome
 
 [damnsmalllinux]
 verbose = true