diff --git a/roles/download/tasks/main.yml b/roles/download/tasks/main.yml
index 125163a..0726465 100644
--- a/roles/download/tasks/main.yml
+++ b/roles/download/tasks/main.yml
@@ -39,10 +39,7 @@
- selinux
- name: /etc/motd_fedora
- copy: src=motd_fedora dest=/etc/motd_fedora
-
-- name: /etc/motd_fedora_tier1
- copy: src=motd_fedora_tier1 dest=/etc/motd_fedora_tier1
+ template: src=rsync/motd_fedora.j2 dest =/etc/motd_fedora
- name: Configure logrotate for /var/log/rsyncd-fedora.log
copy: src=logrotate-rsync-fedora dest=/etc/logrotate.d/rsync-fedora
diff --git a/roles/download/templates/rsync/motd_fedora.j2
b/roles/download/templates/rsync/motd_fedora.j2
index b640f3f..b73d868 100644
--- a/roles/download/templates/rsync/motd_fedora.j2
+++ b/roles/download/templates/rsync/motd_fedora.j2
@@ -1,9 +1,15 @@
----------------------------
Fedora Master Mirror Servers
----------------------------
+{% if inventory_hostname in groups['download_tier1'] %}
+NOTE: This server is for authorized Fedora tier1 mirrors only!
+{% endif %}
+
If you are using bare rsync to sync content, please stop and
take a look at https://pagure.io/quick-fedora-mirror.
See http://fedoraproject.org/wiki/Infrastructure/Mirroring for
further instructions.
----------------------------
+
+You have connected to {{ inventory_hostname }}
--
Stephen J Smoogen.
_______________________________________________
infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
