Rename mirror/reportmirror to reportmirror

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:

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