From b7a341535215c00f9b7403faf073c44d0669f9c2 Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Sat, 14 Oct 2023 16:06:27 +0000
Subject: [PATCH] Rename mirror/reportmirror to reportmirror

---
 playbooks/mirror.yml                                 | 10 +++++-----
 roles/{mirror => }/reportmirror/defaults/main.yml    |  0
 roles/{mirror => }/reportmirror/meta/main.yml        |  0
 roles/{mirror => }/reportmirror/tasks/main.yml       |  0
 .../reportmirror/templates/report_mirror.conf.j2     | 12 ++++++------
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename roles/{mirror => }/reportmirror/defaults/main.yml (100%)
 rename roles/{mirror => }/reportmirror/meta/main.yml (100%)
 rename roles/{mirror => }/reportmirror/tasks/main.yml (100%)
 rename roles/{mirror => }/reportmirror/templates/report_mirror.conf.j2 (91%)

diff --git a/playbooks/mirror.yml b/playbooks/mirror.yml
index 4ae2bab..6ff74cf 100644
--- a/playbooks/mirror.yml
+++ b/playbooks/mirror.yml
@@ -27,11 +27,11 @@
     - base
     - mirror/base
     - mirror/thinlinc
-    - role: mirror/reportmirror
-      mirror_hostname: mirrors.foo.sh
-      mirror_mirrors: [epel, fedora]
-      mirror_sitename: foo.sh
-      mirror_password: "{{ report_mirror_pass }}"
+    - role: reportmirror
+      reportmirror_hostname: mirrors.foo.sh
+      reportmirror_mirrors: [epel, fedora]
+      reportmirror_sitename: foo.sh
+      reportmirror_password: "{{ report_mirror_pass }}"
     - role: mirror/sync
       mirror_label: fedora-epel
       mirror_source:
diff --git a/roles/mirror/reportmirror/defaults/main.yml b/roles/reportmirror/defaults/main.yml
similarity index 100%
rename from roles/mirror/reportmirror/defaults/main.yml
rename to roles/reportmirror/defaults/main.yml
diff --git a/roles/mirror/reportmirror/meta/main.yml b/roles/reportmirror/meta/main.yml
similarity index 100%
rename from roles/mirror/reportmirror/meta/main.yml
rename to roles/reportmirror/meta/main.yml
diff --git a/roles/mirror/reportmirror/tasks/main.yml b/roles/reportmirror/tasks/main.yml
similarity index 100%
rename from roles/mirror/reportmirror/tasks/main.yml
rename to roles/reportmirror/tasks/main.yml
diff --git a/roles/mirror/reportmirror/templates/report_mirror.conf.j2 b/roles/reportmirror/templates/report_mirror.conf.j2
similarity index 91%
rename from roles/mirror/reportmirror/templates/report_mirror.conf.j2
rename to roles/reportmirror/templates/report_mirror.conf.j2
index 59d4dbb..7181a22 100644
--- a/roles/mirror/reportmirror/templates/report_mirror.conf.j2
+++ b/roles/reportmirror/templates/report_mirror.conf.j2
@@ -11,8 +11,8 @@ enabled=1
 # Name and Password fields need to match the Site name and password
 # fields you entered for your Site in the MirrorManager database at
 # https://admin.fedoraproject.org/mirrormanager
-name={{ mirror_sitename }}
-password={{ mirror_password }}
+name={{ reportmirror_sitename }}
+password={{ reportmirror_password }}
 
 [host]
 # if enabled=0, no data about this host is sent to the database
@@ -20,7 +20,7 @@ enabled=1
 # Name field need to match the Host name field you entered for your
 # Host in the MirrorManager database at
 # https://admin.fedoraproject.org/mirrormanager
-name={{ mirror_hostname }}
+name={{ reportmirror_hostname }}
 # if user_active=0, no data about this category is given to the public
 # This can be used to toggle between serving and not serving data,
 # such enabled during the nighttime (when you have more idle bandwidth
@@ -52,15 +52,15 @@ rsyncd=/var/log/rsyncd.log
 # path= is the path on your local disk to the top-level directory for this Category
 
 [Fedora Linux]
-{% if "fedora" in mirror_mirrors %}
+{% if "fedora" in reportmirror_mirrors %}
 enabled=1
 {% else %}
 enabled=0
 {% endif %}
 path=/srv/mrirors/fedora
 
-[Fedora EPEL]
-{% if "epel" in mirror_mirrors %}
+[Fedora EPELreport]
+{% if "epel" in reportmirror_mirrors %}
 enabled=1
 {% else %}
 enabled=0