From 2bc214a638dee2deeafce1f00f5501ca77ccd30c Mon Sep 17 00:00:00 2001
From: Andrew Wang <someone.zip@gmail.com>
Date: Tue, 28 Jun 2022 03:48:10 +0000
Subject: [PATCH 1/2] minor fix

---
 .gitignore               | 4 ++++
 merlin/merlin-config.ini | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

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/merlin-config.ini b/merlin/merlin-config.ini
index d1b1d62..cc566fa 100644
--- a/merlin/merlin-config.ini
+++ b/merlin/merlin-config.ini
@@ -24,6 +24,7 @@ rsync_dir = puppylinux
 
 [CPAN]
 verbose = true
+dry_run = true
 sync_type = csc-sync-standard
 frequency = twice-daily
 local_dir = CPAN
@@ -62,7 +63,7 @@ verbose = true
 dry_run = true
 sync_type = csc-sync-standard
 frequency = twice-daily
-local_dir = nongnu
+local_dir = nognu
 rsync_host = dl.sv.gnu.org
 rsync_dir = releases
 
@@ -137,4 +138,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

From e00aa63ca4760fefbf54003b4f2171c20f957cf0 Mon Sep 17 00:00:00 2001
From: Andrew Wang <someone.zip@gmail.com>
Date: Tue, 28 Jun 2022 03:58:03 +0000
Subject: [PATCH 2/2] nongnu not nognu

---
 merlin/Handoff.md        | 4 ++--
 merlin/merlin-config.ini | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

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 cc566fa..500582a 100644
--- a/merlin/merlin-config.ini
+++ b/merlin/merlin-config.ini
@@ -58,12 +58,12 @@ local_dir = gnu
 rsync_host = ftp.gnu.org
 rsync_dir = gnu
 
-[nognu]
+[nongnu]
 verbose = true
 dry_run = true
 sync_type = csc-sync-standard
 frequency = twice-daily
-local_dir = nognu
+local_dir = nongnu
 rsync_host = dl.sv.gnu.org
 rsync_dir = releases
 
@@ -84,7 +84,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