diff --git a/.gitignore b/.gitignore index c012532..520121f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,7 @@ /.config/ /.cache/ /.ssh/ +log/ +log-rsync/ +log-zfssync/ +state/ diff --git a/merlin/Handoff.md b/merlin/Handoff.md index 41cf7ee..4a5b737 100644 --- a/merlin/Handoff.md +++ b/merlin/Handoff.md @@ -15,7 +15,7 @@ - [ ] fedora-epel - [ ] cygwin < - [ ] gnu < -- [ ] nognu < +- [ ] nongnu < - [ ] mysql < - [ ] gnome < - [ ] damnsmalllinux < @@ -60,4 +60,4 @@ - [ ] trisquel-packages - [ ] trisquel-iso - [ ] almalinux -- [ ] ceph \ No newline at end of file +- [ ] ceph diff --git a/merlin/merlin-config.ini b/merlin/merlin-config.ini index bd290d5..ee58887 100644 --- a/merlin/merlin-config.ini +++ b/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 @@ -136,4 +137,4 @@ sync_type = csc-sync-standard frequency = twice-daily local_dir = eclipse rsync_host = download.eclipse.org -rsync_dir = eclipseMirror \ No newline at end of file +rsync_dir = eclipseMirror