diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index 5756c6f8d5..aebf467059 100644 --- a/playbooks/groups/noc.yml +++ b/playbooks/groups/noc.yml @@ -49,5 +49,5 @@ roles: - { role: dhcp_server, when: datacenter == 'phx2' } - { role: tftp_server, when: datacenter == 'phx2' } - - nagios_server + - nagios/server - fedmsg/base diff --git a/roles/nagios_client/files/scripts/check_datanommer_timesince.py b/roles/nagios/client/files/scripts/check_datanommer_timesince.py similarity index 100% rename from roles/nagios_client/files/scripts/check_datanommer_timesince.py rename to roles/nagios/client/files/scripts/check_datanommer_timesince.py diff --git a/roles/nagios_client/files/scripts/check_fcomm_queue b/roles/nagios/client/files/scripts/check_fcomm_queue similarity index 100% rename from roles/nagios_client/files/scripts/check_fcomm_queue rename to roles/nagios/client/files/scripts/check_fcomm_queue diff --git a/roles/nagios_client/files/scripts/check_fedmsg_consumer_backlog.py b/roles/nagios/client/files/scripts/check_fedmsg_consumer_backlog.py similarity index 100% rename from roles/nagios_client/files/scripts/check_fedmsg_consumer_backlog.py rename to roles/nagios/client/files/scripts/check_fedmsg_consumer_backlog.py diff --git a/roles/nagios_client/files/scripts/check_fedmsg_consumer_exceptions.py b/roles/nagios/client/files/scripts/check_fedmsg_consumer_exceptions.py similarity index 100% rename from roles/nagios_client/files/scripts/check_fedmsg_consumer_exceptions.py rename to roles/nagios/client/files/scripts/check_fedmsg_consumer_exceptions.py diff --git a/roles/nagios_client/files/scripts/check_fedmsg_producer_last_ran.py b/roles/nagios/client/files/scripts/check_fedmsg_producer_last_ran.py similarity index 100% rename from roles/nagios_client/files/scripts/check_fedmsg_producer_last_ran.py rename to roles/nagios/client/files/scripts/check_fedmsg_producer_last_ran.py diff --git a/roles/nagios_client/files/scripts/check_fedmsg_producers_consumers.py b/roles/nagios/client/files/scripts/check_fedmsg_producers_consumers.py similarity index 100% rename from roles/nagios_client/files/scripts/check_fedmsg_producers_consumers.py rename to roles/nagios/client/files/scripts/check_fedmsg_producers_consumers.py diff --git a/roles/nagios_client/files/scripts/check_haproxy_conns.py b/roles/nagios/client/files/scripts/check_haproxy_conns.py similarity index 100% rename from roles/nagios_client/files/scripts/check_haproxy_conns.py rename to roles/nagios/client/files/scripts/check_haproxy_conns.py diff --git a/roles/nagios_client/files/scripts/check_lock b/roles/nagios/client/files/scripts/check_lock similarity index 100% rename from roles/nagios_client/files/scripts/check_lock rename to roles/nagios/client/files/scripts/check_lock diff --git a/roles/nagios_client/files/scripts/check_lock_file_age b/roles/nagios/client/files/scripts/check_lock_file_age similarity index 100% rename from roles/nagios_client/files/scripts/check_lock_file_age rename to roles/nagios/client/files/scripts/check_lock_file_age diff --git a/roles/nagios_client/files/scripts/check_memcache_connect b/roles/nagios/client/files/scripts/check_memcache_connect similarity index 100% rename from roles/nagios_client/files/scripts/check_memcache_connect rename to roles/nagios/client/files/scripts/check_memcache_connect diff --git a/roles/nagios_client/files/scripts/check_postfix_queue b/roles/nagios/client/files/scripts/check_postfix_queue similarity index 100% rename from roles/nagios_client/files/scripts/check_postfix_queue rename to roles/nagios/client/files/scripts/check_postfix_queue diff --git a/roles/nagios_client/files/scripts/check_raid.py b/roles/nagios/client/files/scripts/check_raid.py similarity index 100% rename from roles/nagios_client/files/scripts/check_raid.py rename to roles/nagios/client/files/scripts/check_raid.py diff --git a/roles/nagios_client/files/scripts/check_readonly_fs b/roles/nagios/client/files/scripts/check_readonly_fs similarity index 100% rename from roles/nagios_client/files/scripts/check_readonly_fs rename to roles/nagios/client/files/scripts/check_readonly_fs diff --git a/roles/nagios_client/files/scripts/check_supybot_plugin b/roles/nagios/client/files/scripts/check_supybot_plugin similarity index 100% rename from roles/nagios_client/files/scripts/check_supybot_plugin rename to roles/nagios/client/files/scripts/check_supybot_plugin diff --git a/roles/nagios_client/files/scripts/check_testcloud b/roles/nagios/client/files/scripts/check_testcloud similarity index 100% rename from roles/nagios_client/files/scripts/check_testcloud rename to roles/nagios/client/files/scripts/check_testcloud diff --git a/roles/nagios_client/files/selinux/fi-nrpe.mod b/roles/nagios/client/files/selinux/fi-nrpe.mod similarity index 100% rename from roles/nagios_client/files/selinux/fi-nrpe.mod rename to roles/nagios/client/files/selinux/fi-nrpe.mod diff --git a/roles/nagios_client/files/selinux/fi-nrpe.pp b/roles/nagios/client/files/selinux/fi-nrpe.pp similarity index 100% rename from roles/nagios_client/files/selinux/fi-nrpe.pp rename to roles/nagios/client/files/selinux/fi-nrpe.pp diff --git a/roles/nagios_client/files/selinux/fi-nrpe.te b/roles/nagios/client/files/selinux/fi-nrpe.te similarity index 100% rename from roles/nagios_client/files/selinux/fi-nrpe.te rename to roles/nagios/client/files/selinux/fi-nrpe.te diff --git a/roles/nagios_client/handlers/main.yml b/roles/nagios/client/handlers/main.yml similarity index 100% rename from roles/nagios_client/handlers/main.yml rename to roles/nagios/client/handlers/main.yml diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios/client/tasks/main.yml similarity index 100% rename from roles/nagios_client/tasks/main.yml rename to roles/nagios/client/tasks/main.yml diff --git a/roles/nagios_client/templates/check_autocloud_proc.cfg.j2 b/roles/nagios/client/templates/check_autocloud_proc.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_autocloud_proc.cfg.j2 rename to roles/nagios/client/templates/check_autocloud_proc.cfg.j2 diff --git a/roles/nagios_client/templates/check_cron.cfg.j2 b/roles/nagios/client/templates/check_cron.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_cron.cfg.j2 rename to roles/nagios/client/templates/check_cron.cfg.j2 diff --git a/roles/nagios_client/templates/check_datanommer_history.cfg.j2 b/roles/nagios/client/templates/check_datanommer_history.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_datanommer_history.cfg.j2 rename to roles/nagios/client/templates/check_datanommer_history.cfg.j2 diff --git a/roles/nagios_client/templates/check_disk.cfg.j2 b/roles/nagios/client/templates/check_disk.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_disk.cfg.j2 rename to roles/nagios/client/templates/check_disk.cfg.j2 diff --git a/roles/nagios_client/templates/check_fedmsg_consumers.cfg.j2 b/roles/nagios/client/templates/check_fedmsg_consumers.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_fedmsg_consumers.cfg.j2 rename to roles/nagios/client/templates/check_fedmsg_consumers.cfg.j2 diff --git a/roles/nagios_client/templates/check_fedmsg_gateway_proc.cfg.j2 b/roles/nagios/client/templates/check_fedmsg_gateway_proc.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_fedmsg_gateway_proc.cfg.j2 rename to roles/nagios/client/templates/check_fedmsg_gateway_proc.cfg.j2 diff --git a/roles/nagios_client/templates/check_fedmsg_hub_proc.cfg.j2 b/roles/nagios/client/templates/check_fedmsg_hub_proc.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_fedmsg_hub_proc.cfg.j2 rename to roles/nagios/client/templates/check_fedmsg_hub_proc.cfg.j2 diff --git a/roles/nagios_client/templates/check_fedmsg_irc_proc.cfg.j2 b/roles/nagios/client/templates/check_fedmsg_irc_proc.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_fedmsg_irc_proc.cfg.j2 rename to roles/nagios/client/templates/check_fedmsg_irc_proc.cfg.j2 diff --git a/roles/nagios_client/templates/check_fedmsg_masher_proc.cfg.j2 b/roles/nagios/client/templates/check_fedmsg_masher_proc.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_fedmsg_masher_proc.cfg.j2 rename to roles/nagios/client/templates/check_fedmsg_masher_proc.cfg.j2 diff --git a/roles/nagios_client/templates/check_fedmsg_relay_proc.cfg.j2 b/roles/nagios/client/templates/check_fedmsg_relay_proc.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_fedmsg_relay_proc.cfg.j2 rename to roles/nagios/client/templates/check_fedmsg_relay_proc.cfg.j2 diff --git a/roles/nagios_client/templates/check_happroxy_conns.cfg.j2 b/roles/nagios/client/templates/check_happroxy_conns.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_happroxy_conns.cfg.j2 rename to roles/nagios/client/templates/check_happroxy_conns.cfg.j2 diff --git a/roles/nagios_client/templates/check_koschei_polling_proc.cfg.j2 b/roles/nagios/client/templates/check_koschei_polling_proc.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_koschei_polling_proc.cfg.j2 rename to roles/nagios/client/templates/check_koschei_polling_proc.cfg.j2 diff --git a/roles/nagios_client/templates/check_koschei_resolver_proc.cfg.j2 b/roles/nagios/client/templates/check_koschei_resolver_proc.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_koschei_resolver_proc.cfg.j2 rename to roles/nagios/client/templates/check_koschei_resolver_proc.cfg.j2 diff --git a/roles/nagios_client/templates/check_koschei_scheduler_proc.cfg.j2 b/roles/nagios/client/templates/check_koschei_scheduler_proc.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_koschei_scheduler_proc.cfg.j2 rename to roles/nagios/client/templates/check_koschei_scheduler_proc.cfg.j2 diff --git a/roles/nagios_client/templates/check_koschei_watcher_proc.cfg.j2 b/roles/nagios/client/templates/check_koschei_watcher_proc.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_koschei_watcher_proc.cfg.j2 rename to roles/nagios/client/templates/check_koschei_watcher_proc.cfg.j2 diff --git a/roles/nagios_client/templates/check_lock.cfg.j2 b/roles/nagios/client/templates/check_lock.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_lock.cfg.j2 rename to roles/nagios/client/templates/check_lock.cfg.j2 diff --git a/roles/nagios_client/templates/check_lock_file_age.cfg.j2 b/roles/nagios/client/templates/check_lock_file_age.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_lock_file_age.cfg.j2 rename to roles/nagios/client/templates/check_lock_file_age.cfg.j2 diff --git a/roles/nagios_client/templates/check_memcache.cfg.j2 b/roles/nagios/client/templates/check_memcache.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_memcache.cfg.j2 rename to roles/nagios/client/templates/check_memcache.cfg.j2 diff --git a/roles/nagios_client/templates/check_merged_file_age.cfg.j2 b/roles/nagios/client/templates/check_merged_file_age.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_merged_file_age.cfg.j2 rename to roles/nagios/client/templates/check_merged_file_age.cfg.j2 diff --git a/roles/nagios_client/templates/check_mirrorlist_cache.cfg.j2 b/roles/nagios/client/templates/check_mirrorlist_cache.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_mirrorlist_cache.cfg.j2 rename to roles/nagios/client/templates/check_mirrorlist_cache.cfg.j2 diff --git a/roles/nagios_client/templates/check_mysql.cfg.j2 b/roles/nagios/client/templates/check_mysql.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_mysql.cfg.j2 rename to roles/nagios/client/templates/check_mysql.cfg.j2 diff --git a/roles/nagios_client/templates/check_openvpn_link.cfg.j2 b/roles/nagios/client/templates/check_openvpn_link.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_openvpn_link.cfg.j2 rename to roles/nagios/client/templates/check_openvpn_link.cfg.j2 diff --git a/roles/nagios_client/templates/check_postfix_queue.cfg.j2 b/roles/nagios/client/templates/check_postfix_queue.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_postfix_queue.cfg.j2 rename to roles/nagios/client/templates/check_postfix_queue.cfg.j2 diff --git a/roles/nagios_client/templates/check_raid.cfg.j2 b/roles/nagios/client/templates/check_raid.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_raid.cfg.j2 rename to roles/nagios/client/templates/check_raid.cfg.j2 diff --git a/roles/nagios_client/templates/check_readonly_fs.cfg.j2 b/roles/nagios/client/templates/check_readonly_fs.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_readonly_fs.cfg.j2 rename to roles/nagios/client/templates/check_readonly_fs.cfg.j2 diff --git a/roles/nagios_client/templates/check_redis_proc.cfg.j2 b/roles/nagios/client/templates/check_redis_proc.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_redis_proc.cfg.j2 rename to roles/nagios/client/templates/check_redis_proc.cfg.j2 diff --git a/roles/nagios_client/templates/check_supybot_fedmsg_plugin.cfg.j2 b/roles/nagios/client/templates/check_supybot_fedmsg_plugin.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_supybot_fedmsg_plugin.cfg.j2 rename to roles/nagios/client/templates/check_supybot_fedmsg_plugin.cfg.j2 diff --git a/roles/nagios_client/templates/check_swap.cfg.j2 b/roles/nagios/client/templates/check_swap.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_swap.cfg.j2 rename to roles/nagios/client/templates/check_swap.cfg.j2 diff --git a/roles/nagios_client/templates/check_testcloud.cfg.j2 b/roles/nagios/client/templates/check_testcloud.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_testcloud.cfg.j2 rename to roles/nagios/client/templates/check_testcloud.cfg.j2 diff --git a/roles/nagios_client/templates/check_unbound_proc.cfg.j2 b/roles/nagios/client/templates/check_unbound_proc.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_unbound_proc.cfg.j2 rename to roles/nagios/client/templates/check_unbound_proc.cfg.j2 diff --git a/roles/nagios_client/templates/check_varnish_proc.cfg.j2 b/roles/nagios/client/templates/check_varnish_proc.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/check_varnish_proc.cfg.j2 rename to roles/nagios/client/templates/check_varnish_proc.cfg.j2 diff --git a/roles/nagios_client/templates/nrpe.cfg.j2 b/roles/nagios/client/templates/nrpe.cfg.j2 similarity index 100% rename from roles/nagios_client/templates/nrpe.cfg.j2 rename to roles/nagios/client/templates/nrpe.cfg.j2 diff --git a/roles/nagios_server/files/check_nagios_notifications.py b/roles/nagios/server/files/check_nagios_notifications.py similarity index 100% rename from roles/nagios_server/files/check_nagios_notifications.py rename to roles/nagios/server/files/check_nagios_notifications.py diff --git a/roles/nagios_server/files/irc-colorize.py b/roles/nagios/server/files/irc-colorize.py similarity index 100% rename from roles/nagios_server/files/irc-colorize.py rename to roles/nagios/server/files/irc-colorize.py diff --git a/roles/nagios_server/files/nagios-external/cgi.cfg b/roles/nagios/server/files/nagios-external/cgi.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/cgi.cfg rename to roles/nagios/server/files/nagios-external/cgi.cfg diff --git a/roles/nagios_server/files/nagios-external/contactgroups/bodhi.cfg b/roles/nagios/server/files/nagios-external/contactgroups/bodhi.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contactgroups/bodhi.cfg rename to roles/nagios/server/files/nagios-external/contactgroups/bodhi.cfg diff --git a/roles/nagios_server/files/nagios-external/contactgroups/fedora-sysadmin-email.cfg b/roles/nagios/server/files/nagios-external/contactgroups/fedora-sysadmin-email.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contactgroups/fedora-sysadmin-email.cfg rename to roles/nagios/server/files/nagios-external/contactgroups/fedora-sysadmin-email.cfg diff --git a/roles/nagios_server/files/nagios-external/contactgroups/fedora-sysadmin-ircbot.cfg b/roles/nagios/server/files/nagios-external/contactgroups/fedora-sysadmin-ircbot.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contactgroups/fedora-sysadmin-ircbot.cfg rename to roles/nagios/server/files/nagios-external/contactgroups/fedora-sysadmin-ircbot.cfg diff --git a/roles/nagios_server/files/nagios-external/contactgroups/fedora-sysadmin-pager.cfg b/roles/nagios/server/files/nagios-external/contactgroups/fedora-sysadmin-pager.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contactgroups/fedora-sysadmin-pager.cfg rename to roles/nagios/server/files/nagios-external/contactgroups/fedora-sysadmin-pager.cfg diff --git a/roles/nagios_server/files/nagios-external/contactgroups/null.cfg b/roles/nagios/server/files/nagios-external/contactgroups/null.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contactgroups/null.cfg rename to roles/nagios/server/files/nagios-external/contactgroups/null.cfg diff --git a/roles/nagios_server/files/nagios-external/contacts/admin.cfg b/roles/nagios/server/files/nagios-external/contacts/admin.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contacts/admin.cfg rename to roles/nagios/server/files/nagios-external/contacts/admin.cfg diff --git a/roles/nagios_server/files/nagios-external/contacts/ausil.cfg b/roles/nagios/server/files/nagios-external/contacts/ausil.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contacts/ausil.cfg rename to roles/nagios/server/files/nagios-external/contacts/ausil.cfg diff --git a/roles/nagios_server/files/nagios-external/contacts/codeblock.cfg b/roles/nagios/server/files/nagios-external/contacts/codeblock.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contacts/codeblock.cfg rename to roles/nagios/server/files/nagios-external/contacts/codeblock.cfg diff --git a/roles/nagios_server/files/nagios-external/contacts/hvivani.cfg b/roles/nagios/server/files/nagios-external/contacts/hvivani.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contacts/hvivani.cfg rename to roles/nagios/server/files/nagios-external/contacts/hvivani.cfg diff --git a/roles/nagios_server/files/nagios-external/contacts/ircbot.cfg b/roles/nagios/server/files/nagios-external/contacts/ircbot.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contacts/ircbot.cfg rename to roles/nagios/server/files/nagios-external/contacts/ircbot.cfg diff --git a/roles/nagios_server/files/nagios-external/contacts/jcollie.cfg b/roles/nagios/server/files/nagios-external/contacts/jcollie.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contacts/jcollie.cfg rename to roles/nagios/server/files/nagios-external/contacts/jcollie.cfg diff --git a/roles/nagios_server/files/nagios-external/contacts/jmtaylor.cfg b/roles/nagios/server/files/nagios-external/contacts/jmtaylor.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contacts/jmtaylor.cfg rename to roles/nagios/server/files/nagios-external/contacts/jmtaylor.cfg diff --git a/roles/nagios_server/files/nagios-external/contacts/jstanley.cfg b/roles/nagios/server/files/nagios-external/contacts/jstanley.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contacts/jstanley.cfg rename to roles/nagios/server/files/nagios-external/contacts/jstanley.cfg diff --git a/roles/nagios_server/files/nagios-external/contacts/kevin.cfg b/roles/nagios/server/files/nagios-external/contacts/kevin.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contacts/kevin.cfg rename to roles/nagios/server/files/nagios-external/contacts/kevin.cfg diff --git a/roles/nagios_server/files/nagios-external/contacts/lmacken.cfg b/roles/nagios/server/files/nagios-external/contacts/lmacken.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contacts/lmacken.cfg rename to roles/nagios/server/files/nagios-external/contacts/lmacken.cfg diff --git a/roles/nagios_server/files/nagios-external/contacts/mmcgrath.cfg b/roles/nagios/server/files/nagios-external/contacts/mmcgrath.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contacts/mmcgrath.cfg rename to roles/nagios/server/files/nagios-external/contacts/mmcgrath.cfg diff --git a/roles/nagios_server/files/nagios-external/contacts/nb.cfg b/roles/nagios/server/files/nagios-external/contacts/nb.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contacts/nb.cfg rename to roles/nagios/server/files/nagios-external/contacts/nb.cfg diff --git a/roles/nagios_server/files/nagios-external/contacts/nigelj.cfg b/roles/nagios/server/files/nagios-external/contacts/nigelj.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contacts/nigelj.cfg rename to roles/nagios/server/files/nagios-external/contacts/nigelj.cfg diff --git a/roles/nagios_server/files/nagios-external/contacts/null.cfg b/roles/nagios/server/files/nagios-external/contacts/null.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contacts/null.cfg rename to roles/nagios/server/files/nagios-external/contacts/null.cfg diff --git a/roles/nagios_server/files/nagios-external/contacts/puiterwijk.cfg b/roles/nagios/server/files/nagios-external/contacts/puiterwijk.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contacts/puiterwijk.cfg rename to roles/nagios/server/files/nagios-external/contacts/puiterwijk.cfg diff --git a/roles/nagios_server/files/nagios-external/contacts/ricky.cfg b/roles/nagios/server/files/nagios-external/contacts/ricky.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contacts/ricky.cfg rename to roles/nagios/server/files/nagios-external/contacts/ricky.cfg diff --git a/roles/nagios_server/files/nagios-external/contacts/rigeld2.cfg b/roles/nagios/server/files/nagios-external/contacts/rigeld2.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contacts/rigeld2.cfg rename to roles/nagios/server/files/nagios-external/contacts/rigeld2.cfg diff --git a/roles/nagios_server/files/nagios-external/contacts/skvidal.cfg b/roles/nagios/server/files/nagios-external/contacts/skvidal.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contacts/skvidal.cfg rename to roles/nagios/server/files/nagios-external/contacts/skvidal.cfg diff --git a/roles/nagios_server/files/nagios-external/contacts/smooge.cfg b/roles/nagios/server/files/nagios-external/contacts/smooge.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/contacts/smooge.cfg rename to roles/nagios/server/files/nagios-external/contacts/smooge.cfg diff --git a/roles/nagios_server/files/nagios-external/escalations.cfg b/roles/nagios/server/files/nagios-external/escalations.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/escalations.cfg rename to roles/nagios/server/files/nagios-external/escalations.cfg diff --git a/roles/nagios_server/files/nagios-external/hostgroups/all.cfg b/roles/nagios/server/files/nagios-external/hostgroups/all.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/hostgroups/all.cfg rename to roles/nagios/server/files/nagios-external/hostgroups/all.cfg diff --git a/roles/nagios_server/files/nagios-external/hostgroups/dns.cfg b/roles/nagios/server/files/nagios-external/hostgroups/dns.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/hostgroups/dns.cfg rename to roles/nagios/server/files/nagios-external/hostgroups/dns.cfg diff --git a/roles/nagios_server/files/nagios-external/hosts/admin.fedoraproject.org.cfg b/roles/nagios/server/files/nagios-external/hosts/admin.fedoraproject.org.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/hosts/admin.fedoraproject.org.cfg rename to roles/nagios/server/files/nagios-external/hosts/admin.fedoraproject.org.cfg diff --git a/roles/nagios_server/files/nagios-external/hosts/fedorapeople.org.cfg b/roles/nagios/server/files/nagios-external/hosts/fedorapeople.org.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/hosts/fedorapeople.org.cfg rename to roles/nagios/server/files/nagios-external/hosts/fedorapeople.org.cfg diff --git a/roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg b/roles/nagios/server/files/nagios-external/hosts/fedoraproject.org.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg rename to roles/nagios/server/files/nagios-external/hosts/fedoraproject.org.cfg diff --git a/roles/nagios_server/files/nagios-external/hosts/gateway.fedoraproject.org.cfg b/roles/nagios/server/files/nagios-external/hosts/gateway.fedoraproject.org.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/hosts/gateway.fedoraproject.org.cfg rename to roles/nagios/server/files/nagios-external/hosts/gateway.fedoraproject.org.cfg diff --git a/roles/nagios_server/files/nagios-external/hosts/koji.fedoraproject.org.cfg b/roles/nagios/server/files/nagios-external/hosts/koji.fedoraproject.org.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/hosts/koji.fedoraproject.org.cfg rename to roles/nagios/server/files/nagios-external/hosts/koji.fedoraproject.org.cfg diff --git a/roles/nagios_server/files/nagios-external/hosts/noc01.cfg b/roles/nagios/server/files/nagios-external/hosts/noc01.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/hosts/noc01.cfg rename to roles/nagios/server/files/nagios-external/hosts/noc01.cfg diff --git a/roles/nagios_server/files/nagios-external/hosts/ns-sb01.cfg b/roles/nagios/server/files/nagios-external/hosts/ns-sb01.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/hosts/ns-sb01.cfg rename to roles/nagios/server/files/nagios-external/hosts/ns-sb01.cfg diff --git a/roles/nagios_server/files/nagios-external/hosts/ns02.cfg b/roles/nagios/server/files/nagios-external/hosts/ns02.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/hosts/ns02.cfg rename to roles/nagios/server/files/nagios-external/hosts/ns02.cfg diff --git a/roles/nagios_server/files/nagios-external/hosts/ns04.cfg b/roles/nagios/server/files/nagios-external/hosts/ns04.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/hosts/ns04.cfg rename to roles/nagios/server/files/nagios-external/hosts/ns04.cfg diff --git a/roles/nagios_server/files/nagios-external/hosts/ns05.cfg b/roles/nagios/server/files/nagios-external/hosts/ns05.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/hosts/ns05.cfg rename to roles/nagios/server/files/nagios-external/hosts/ns05.cfg diff --git a/roles/nagios_server/files/nagios-external/hosts/redhat.com.cfg b/roles/nagios/server/files/nagios-external/hosts/redhat.com.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/hosts/redhat.com.cfg rename to roles/nagios/server/files/nagios-external/hosts/redhat.com.cfg diff --git a/roles/nagios_server/files/nagios-external/hosts/templates.cfg b/roles/nagios/server/files/nagios-external/hosts/templates.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/hosts/templates.cfg rename to roles/nagios/server/files/nagios-external/hosts/templates.cfg diff --git a/roles/nagios_server/files/nagios-external/minimal.cfg b/roles/nagios/server/files/nagios-external/minimal.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/minimal.cfg rename to roles/nagios/server/files/nagios-external/minimal.cfg diff --git a/roles/nagios_server/files/nagios-external/misccommands.cfg b/roles/nagios/server/files/nagios-external/misccommands.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/misccommands.cfg rename to roles/nagios/server/files/nagios-external/misccommands.cfg diff --git a/roles/nagios_server/files/nagios-external/nagios.cfg b/roles/nagios/server/files/nagios-external/nagios.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/nagios.cfg rename to roles/nagios/server/files/nagios-external/nagios.cfg diff --git a/roles/nagios_server/files/nagios-external/nsca.cfg b/roles/nagios/server/files/nagios-external/nsca.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/nsca.cfg rename to roles/nagios/server/files/nagios-external/nsca.cfg diff --git a/roles/nagios_server/files/nagios-external/private/resource.cfg b/roles/nagios/server/files/nagios-external/private/resource.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/private/resource.cfg rename to roles/nagios/server/files/nagios-external/private/resource.cfg diff --git a/roles/nagios_server/files/nagios-external/private/resource.cfg-sample b/roles/nagios/server/files/nagios-external/private/resource.cfg-sample similarity index 100% rename from roles/nagios_server/files/nagios-external/private/resource.cfg-sample rename to roles/nagios/server/files/nagios-external/private/resource.cfg-sample diff --git a/roles/nagios_server/files/nagios-external/send_nsca.cfg b/roles/nagios/server/files/nagios-external/send_nsca.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/send_nsca.cfg rename to roles/nagios/server/files/nagios-external/send_nsca.cfg diff --git a/roles/nagios_server/files/nagios-external/servicedeps/websitedeps.cfg b/roles/nagios/server/files/nagios-external/servicedeps/websitedeps.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/servicedeps/websitedeps.cfg rename to roles/nagios/server/files/nagios-external/servicedeps/websitedeps.cfg diff --git a/roles/nagios_server/files/nagios-external/services/dns.cfg b/roles/nagios/server/files/nagios-external/services/dns.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/services/dns.cfg rename to roles/nagios/server/files/nagios-external/services/dns.cfg diff --git a/roles/nagios_server/files/nagios-external/services/nagios.cfg b/roles/nagios/server/files/nagios-external/services/nagios.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/services/nagios.cfg rename to roles/nagios/server/files/nagios-external/services/nagios.cfg diff --git a/roles/nagios_server/files/nagios-external/services/templates.cfg b/roles/nagios/server/files/nagios-external/services/templates.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/services/templates.cfg rename to roles/nagios/server/files/nagios-external/services/templates.cfg diff --git a/roles/nagios_server/files/nagios-external/services/websites.cfg b/roles/nagios/server/files/nagios-external/services/websites.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/services/websites.cfg rename to roles/nagios/server/files/nagios-external/services/websites.cfg diff --git a/roles/nagios_server/files/nagios-external/timeperiods.cfg b/roles/nagios/server/files/nagios-external/timeperiods.cfg similarity index 100% rename from roles/nagios_server/files/nagios-external/timeperiods.cfg rename to roles/nagios/server/files/nagios-external/timeperiods.cfg diff --git a/roles/nagios_server/files/nagios/cgi.cfg b/roles/nagios/server/files/nagios/cgi.cfg similarity index 100% rename from roles/nagios_server/files/nagios/cgi.cfg rename to roles/nagios/server/files/nagios/cgi.cfg diff --git a/roles/nagios_server/files/nagios/contactgroups/build-sysadmin-email.cfg b/roles/nagios/server/files/nagios/contactgroups/build-sysadmin-email.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contactgroups/build-sysadmin-email.cfg rename to roles/nagios/server/files/nagios/contactgroups/build-sysadmin-email.cfg diff --git a/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-email.cfg b/roles/nagios/server/files/nagios/contactgroups/fedora-sysadmin-email.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-email.cfg rename to roles/nagios/server/files/nagios/contactgroups/fedora-sysadmin-email.cfg diff --git a/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-ircbot.cfg b/roles/nagios/server/files/nagios/contactgroups/fedora-sysadmin-ircbot.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-ircbot.cfg rename to roles/nagios/server/files/nagios/contactgroups/fedora-sysadmin-ircbot.cfg diff --git a/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-pager.cfg b/roles/nagios/server/files/nagios/contactgroups/fedora-sysadmin-pager.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-pager.cfg rename to roles/nagios/server/files/nagios/contactgroups/fedora-sysadmin-pager.cfg diff --git a/roles/nagios_server/files/nagios/contactgroups/ppc-secondary-email.cfg b/roles/nagios/server/files/nagios/contactgroups/ppc-secondary-email.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contactgroups/ppc-secondary-email.cfg rename to roles/nagios/server/files/nagios/contactgroups/ppc-secondary-email.cfg diff --git a/roles/nagios_server/files/nagios/contactgroups/retrace.cfg b/roles/nagios/server/files/nagios/contactgroups/retrace.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contactgroups/retrace.cfg rename to roles/nagios/server/files/nagios/contactgroups/retrace.cfg diff --git a/roles/nagios_server/files/nagios/contactgroups/sysadmin-qa-email.cfg b/roles/nagios/server/files/nagios/contactgroups/sysadmin-qa-email.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contactgroups/sysadmin-qa-email.cfg rename to roles/nagios/server/files/nagios/contactgroups/sysadmin-qa-email.cfg diff --git a/roles/nagios_server/files/nagios/contacts/aditya.cfg b/roles/nagios/server/files/nagios/contacts/aditya.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/aditya.cfg rename to roles/nagios/server/files/nagios/contacts/aditya.cfg diff --git a/roles/nagios_server/files/nagios/contacts/admin.cfg b/roles/nagios/server/files/nagios/contacts/admin.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/admin.cfg rename to roles/nagios/server/files/nagios/contacts/admin.cfg diff --git a/roles/nagios_server/files/nagios/contacts/ausil.cfg b/roles/nagios/server/files/nagios/contacts/ausil.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/ausil.cfg rename to roles/nagios/server/files/nagios/contacts/ausil.cfg diff --git a/roles/nagios_server/files/nagios/contacts/codeblock.cfg b/roles/nagios/server/files/nagios/contacts/codeblock.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/codeblock.cfg rename to roles/nagios/server/files/nagios/contacts/codeblock.cfg diff --git a/roles/nagios_server/files/nagios/contacts/fedmsg.cfg b/roles/nagios/server/files/nagios/contacts/fedmsg.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/fedmsg.cfg rename to roles/nagios/server/files/nagios/contacts/fedmsg.cfg diff --git a/roles/nagios_server/files/nagios/contacts/hvivani.cfg b/roles/nagios/server/files/nagios/contacts/hvivani.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/hvivani.cfg rename to roles/nagios/server/files/nagios/contacts/hvivani.cfg diff --git a/roles/nagios_server/files/nagios/contacts/ircbot.cfg b/roles/nagios/server/files/nagios/contacts/ircbot.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/ircbot.cfg rename to roles/nagios/server/files/nagios/contacts/ircbot.cfg diff --git a/roles/nagios_server/files/nagios/contacts/jcollie.cfg b/roles/nagios/server/files/nagios/contacts/jcollie.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/jcollie.cfg rename to roles/nagios/server/files/nagios/contacts/jcollie.cfg diff --git a/roles/nagios_server/files/nagios/contacts/jmtaylor.cfg b/roles/nagios/server/files/nagios/contacts/jmtaylor.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/jmtaylor.cfg rename to roles/nagios/server/files/nagios/contacts/jmtaylor.cfg diff --git a/roles/nagios_server/files/nagios/contacts/jstanley.cfg b/roles/nagios/server/files/nagios/contacts/jstanley.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/jstanley.cfg rename to roles/nagios/server/files/nagios/contacts/jstanley.cfg diff --git a/roles/nagios_server/files/nagios/contacts/karsten.cfg b/roles/nagios/server/files/nagios/contacts/karsten.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/karsten.cfg rename to roles/nagios/server/files/nagios/contacts/karsten.cfg diff --git a/roles/nagios_server/files/nagios/contacts/kevin.cfg b/roles/nagios/server/files/nagios/contacts/kevin.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/kevin.cfg rename to roles/nagios/server/files/nagios/contacts/kevin.cfg diff --git a/roles/nagios_server/files/nagios/contacts/lmacken.cfg b/roles/nagios/server/files/nagios/contacts/lmacken.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/lmacken.cfg rename to roles/nagios/server/files/nagios/contacts/lmacken.cfg diff --git a/roles/nagios_server/files/nagios/contacts/mmcgrath.cfg b/roles/nagios/server/files/nagios/contacts/mmcgrath.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/mmcgrath.cfg rename to roles/nagios/server/files/nagios/contacts/mmcgrath.cfg diff --git a/roles/nagios_server/files/nagios/contacts/mtoman.cfg b/roles/nagios/server/files/nagios/contacts/mtoman.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/mtoman.cfg rename to roles/nagios/server/files/nagios/contacts/mtoman.cfg diff --git a/roles/nagios_server/files/nagios/contacts/nb.cfg b/roles/nagios/server/files/nagios/contacts/nb.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/nb.cfg rename to roles/nagios/server/files/nagios/contacts/nb.cfg diff --git a/roles/nagios_server/files/nagios/contacts/parasense.cfg b/roles/nagios/server/files/nagios/contacts/parasense.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/parasense.cfg rename to roles/nagios/server/files/nagios/contacts/parasense.cfg diff --git a/roles/nagios_server/files/nagios/contacts/ppc-secondary.cfg b/roles/nagios/server/files/nagios/contacts/ppc-secondary.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/ppc-secondary.cfg rename to roles/nagios/server/files/nagios/contacts/ppc-secondary.cfg diff --git a/roles/nagios_server/files/nagios/contacts/puiterwijk.cfg b/roles/nagios/server/files/nagios/contacts/puiterwijk.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/puiterwijk.cfg rename to roles/nagios/server/files/nagios/contacts/puiterwijk.cfg diff --git a/roles/nagios_server/files/nagios/contacts/ricky.cfg b/roles/nagios/server/files/nagios/contacts/ricky.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/ricky.cfg rename to roles/nagios/server/files/nagios/contacts/ricky.cfg diff --git a/roles/nagios_server/files/nagios/contacts/rigeld2.cfg b/roles/nagios/server/files/nagios/contacts/rigeld2.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/rigeld2.cfg rename to roles/nagios/server/files/nagios/contacts/rigeld2.cfg diff --git a/roles/nagios_server/files/nagios/contacts/skvidal.cfg b/roles/nagios/server/files/nagios/contacts/skvidal.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/skvidal.cfg rename to roles/nagios/server/files/nagios/contacts/skvidal.cfg diff --git a/roles/nagios_server/files/nagios/contacts/smooge.cfg b/roles/nagios/server/files/nagios/contacts/smooge.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/smooge.cfg rename to roles/nagios/server/files/nagios/contacts/smooge.cfg diff --git a/roles/nagios_server/files/nagios/contacts/sysadmin-qa.cfg b/roles/nagios/server/files/nagios/contacts/sysadmin-qa.cfg similarity index 100% rename from roles/nagios_server/files/nagios/contacts/sysadmin-qa.cfg rename to roles/nagios/server/files/nagios/contacts/sysadmin-qa.cfg diff --git a/roles/nagios_server/files/nagios/escalations.cfg b/roles/nagios/server/files/nagios/escalations.cfg similarity index 100% rename from roles/nagios_server/files/nagios/escalations.cfg rename to roles/nagios/server/files/nagios/escalations.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/all.cfg b/roles/nagios/server/files/nagios/hostgroups/all.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hostgroups/all.cfg rename to roles/nagios/server/files/nagios/hostgroups/all.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/autoqa.cfg b/roles/nagios/server/files/nagios/hostgroups/autoqa.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hostgroups/autoqa.cfg rename to roles/nagios/server/files/nagios/hostgroups/autoqa.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/dns.cfg b/roles/nagios/server/files/nagios/hostgroups/dns.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hostgroups/dns.cfg rename to roles/nagios/server/files/nagios/hostgroups/dns.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/euservers.cfg b/roles/nagios/server/files/nagios/hostgroups/euservers.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hostgroups/euservers.cfg rename to roles/nagios/server/files/nagios/hostgroups/euservers.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/fas.cfg b/roles/nagios/server/files/nagios/hostgroups/fas.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hostgroups/fas.cfg rename to roles/nagios/server/files/nagios/hostgroups/fas.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/hosted.cfg b/roles/nagios/server/files/nagios/hostgroups/hosted.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hostgroups/hosted.cfg rename to roles/nagios/server/files/nagios/hostgroups/hosted.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg b/roles/nagios/server/files/nagios/hostgroups/kvmHosts.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg rename to roles/nagios/server/files/nagios/hostgroups/kvmHosts.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/mgmt.cfg b/roles/nagios/server/files/nagios/hostgroups/mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hostgroups/mgmt.cfg rename to roles/nagios/server/files/nagios/hostgroups/mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/nomail.cfg b/roles/nagios/server/files/nagios/hostgroups/nomail.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hostgroups/nomail.cfg rename to roles/nagios/server/files/nagios/hostgroups/nomail.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/ppc-secondary.cfg b/roles/nagios/server/files/nagios/hostgroups/ppc-secondary.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hostgroups/ppc-secondary.cfg rename to roles/nagios/server/files/nagios/hostgroups/ppc-secondary.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/proxies.cfg b/roles/nagios/server/files/nagios/hostgroups/proxies.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hostgroups/proxies.cfg rename to roles/nagios/server/files/nagios/hostgroups/proxies.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/puppet.cfg b/roles/nagios/server/files/nagios/hostgroups/puppet.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hostgroups/puppet.cfg rename to roles/nagios/server/files/nagios/hostgroups/puppet.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/retrace.cfg b/roles/nagios/server/files/nagios/hostgroups/retrace.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hostgroups/retrace.cfg rename to roles/nagios/server/files/nagios/hostgroups/retrace.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/servers.cfg b/roles/nagios/server/files/nagios/hostgroups/servers.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hostgroups/servers.cfg rename to roles/nagios/server/files/nagios/hostgroups/servers.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/smtp-mm.cfg b/roles/nagios/server/files/nagios/hostgroups/smtp-mm.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hostgroups/smtp-mm.cfg rename to roles/nagios/server/files/nagios/hostgroups/smtp-mm.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/taskotron.cfg b/roles/nagios/server/files/nagios/hostgroups/taskotron.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hostgroups/taskotron.cfg rename to roles/nagios/server/files/nagios/hostgroups/taskotron.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/unbound.cfg b/roles/nagios/server/files/nagios/hostgroups/unbound.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hostgroups/unbound.cfg rename to roles/nagios/server/files/nagios/hostgroups/unbound.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg b/roles/nagios/server/files/nagios/hostgroups/vpnclients.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg rename to roles/nagios/server/files/nagios/hostgroups/vpnclients.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/web.cfg b/roles/nagios/server/files/nagios/hostgroups/web.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hostgroups/web.cfg rename to roles/nagios/server/files/nagios/hostgroups/web.cfg diff --git a/roles/nagios_server/files/nagios/hosts/anitya-backend01.cfg b/roles/nagios/server/files/nagios/hosts/anitya-backend01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/anitya-backend01.cfg rename to roles/nagios/server/files/nagios/hosts/anitya-backend01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/anitya-frontend01.cfg b/roles/nagios/server/files/nagios/hosts/anitya-frontend01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/anitya-frontend01.cfg rename to roles/nagios/server/files/nagios/hosts/anitya-frontend01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder00.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder00.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder00.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder00.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder02.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder02.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder03.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder03.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder04.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder04.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder04.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder04.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder05.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder05.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder05.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder05.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder06.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder06.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder06.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder06.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder07.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder07.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder07.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder07.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder08.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder08.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder08.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder08.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder09.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder09.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder09.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder09.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder10.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder10.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder10.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder10.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder11.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder11.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder11.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder11.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder12.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder12.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder12.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder12.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder13.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder13.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder13.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder13.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder14.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder14.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder14.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder14.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder15.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder15.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder15.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder15.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder16.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder16.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder16.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder16.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder17.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder17.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder17.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder17.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder18.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder18.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder18.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder18.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder19.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder19.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder19.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder19.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder20.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder20.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder20.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder20.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder21.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder21.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder21.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder21.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder22.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder22.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder22.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder22.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-builder23.cfg b/roles/nagios/server/files/nagios/hosts/arm01-builder23.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-builder23.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-builder23.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-releng00.cfg b/roles/nagios/server/files/nagios/hosts/arm01-releng00.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-releng00.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-releng00.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-releng02.cfg b/roles/nagios/server/files/nagios/hosts/arm01-releng02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-releng02.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-releng02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm01-retrace01.cfg b/roles/nagios/server/files/nagios/hosts/arm01-retrace01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm01-retrace01.cfg rename to roles/nagios/server/files/nagios/hosts/arm01-retrace01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder00.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder00.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder00.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder00.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder01.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder01.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder02.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder02.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder03.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder03.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder04.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder04.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder04.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder04.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder05.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder05.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder05.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder05.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder06.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder06.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder06.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder06.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder07.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder07.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder07.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder07.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder08.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder08.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder08.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder08.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder09.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder09.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder09.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder09.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder10.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder10.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder10.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder10.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder11.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder11.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder11.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder11.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder12.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder12.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder12.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder12.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder13.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder13.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder13.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder13.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder14.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder14.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder14.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder14.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder15.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder15.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder15.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder15.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder16.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder16.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder16.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder16.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder17.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder17.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder17.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder17.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder18.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder18.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder18.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder18.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder19.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder19.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder19.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder19.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder20.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder20.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder20.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder20.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder21.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder21.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder21.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder21.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder22.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder22.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder22.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder22.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm02-builder23.cfg b/roles/nagios/server/files/nagios/hosts/arm02-builder23.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm02-builder23.cfg rename to roles/nagios/server/files/nagios/hosts/arm02-builder23.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-00.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-00.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-00.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-00.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-01.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-01.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-02.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-02.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-03.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-03.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-04.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-04.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-04.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-04.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-05.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-05.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-05.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-05.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-06.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-06.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-06.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-06.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-07.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-07.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-07.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-07.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-08.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-08.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-08.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-08.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-09.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-09.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-09.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-09.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-10.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-10.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-10.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-10.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-11.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-11.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-11.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-11.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-12.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-12.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-12.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-12.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-13.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-13.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-13.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-13.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-14.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-14.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-14.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-14.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-15.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-15.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-15.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-15.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-16.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-16.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-16.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-16.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-17.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-17.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-17.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-17.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-18.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-18.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-18.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-18.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-19.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-19.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-19.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-19.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-20.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-20.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-20.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-20.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-21.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-21.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-21.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-21.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-22.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-22.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-22.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-22.cfg diff --git a/roles/nagios_server/files/nagios/hosts/arm04-builder-23.cfg b/roles/nagios/server/files/nagios/hosts/arm04-builder-23.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/arm04-builder-23.cfg rename to roles/nagios/server/files/nagios/hosts/arm04-builder-23.cfg diff --git a/roles/nagios_server/files/nagios/hosts/ask01.cfg b/roles/nagios/server/files/nagios/hosts/ask01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/ask01.cfg rename to roles/nagios/server/files/nagios/hosts/ask01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/ask02.cfg b/roles/nagios/server/files/nagios/hosts/ask02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/ask02.cfg rename to roles/nagios/server/files/nagios/hosts/ask02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/atomic01-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/atomic01-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/atomic01-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/atomic01-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/autocloud-backend01.cfg b/roles/nagios/server/files/nagios/hosts/autocloud-backend01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/autocloud-backend01.cfg rename to roles/nagios/server/files/nagios/hosts/autocloud-backend01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/autocloud-backend02.cfg b/roles/nagios/server/files/nagios/hosts/autocloud-backend02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/autocloud-backend02.cfg rename to roles/nagios/server/files/nagios/hosts/autocloud-backend02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/autocloud-web01.cfg b/roles/nagios/server/files/nagios/hosts/autocloud-web01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/autocloud-web01.cfg rename to roles/nagios/server/files/nagios/hosts/autocloud-web01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/autocloud-web02.cfg b/roles/nagios/server/files/nagios/hosts/autocloud-web02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/autocloud-web02.cfg rename to roles/nagios/server/files/nagios/hosts/autocloud-web02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/autoqa01.cfg b/roles/nagios/server/files/nagios/hosts/autoqa01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/autoqa01.cfg rename to roles/nagios/server/files/nagios/hosts/autoqa01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/backup01-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/backup01-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/backup01-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/backup01-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/backup01.cfg b/roles/nagios/server/files/nagios/hosts/backup01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/backup01.cfg rename to roles/nagios/server/files/nagios/hosts/backup01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/backup02.cfg b/roles/nagios/server/files/nagios/hosts/backup02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/backup02.cfg rename to roles/nagios/server/files/nagios/hosts/backup02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/backup03-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/backup03-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/backup03-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/backup03-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/backup03.cfg b/roles/nagios/server/files/nagios/hosts/backup03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/backup03.cfg rename to roles/nagios/server/files/nagios/hosts/backup03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/badges-backend01.cfg b/roles/nagios/server/files/nagios/hosts/badges-backend01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/badges-backend01.cfg rename to roles/nagios/server/files/nagios/hosts/badges-backend01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/badges-web01.cfg b/roles/nagios/server/files/nagios/hosts/badges-web01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/badges-web01.cfg rename to roles/nagios/server/files/nagios/hosts/badges-web01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/badges-web02.cfg b/roles/nagios/server/files/nagios/hosts/badges-web02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/badges-web02.cfg rename to roles/nagios/server/files/nagios/hosts/badges-web02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bastion-comm01.cfg b/roles/nagios/server/files/nagios/hosts/bastion-comm01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bastion-comm01.cfg rename to roles/nagios/server/files/nagios/hosts/bastion-comm01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bastion-vpn.cfg b/roles/nagios/server/files/nagios/hosts/bastion-vpn.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bastion-vpn.cfg rename to roles/nagios/server/files/nagios/hosts/bastion-vpn.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bastion01.cfg b/roles/nagios/server/files/nagios/hosts/bastion01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bastion01.cfg rename to roles/nagios/server/files/nagios/hosts/bastion01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bastion02.cfg b/roles/nagios/server/files/nagios/hosts/bastion02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bastion02.cfg rename to roles/nagios/server/files/nagios/hosts/bastion02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/batcave01.cfg b/roles/nagios/server/files/nagios/hosts/batcave01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/batcave01.cfg rename to roles/nagios/server/files/nagios/hosts/batcave01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bc02-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/bc02-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bc02-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/bc02-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/blockerbugs01.cfg b/roles/nagios/server/files/nagios/hosts/blockerbugs01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/blockerbugs01.cfg rename to roles/nagios/server/files/nagios/hosts/blockerbugs01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/blockerbugs02.cfg b/roles/nagios/server/files/nagios/hosts/blockerbugs02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/blockerbugs02.cfg rename to roles/nagios/server/files/nagios/hosts/blockerbugs02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bodhi-backend01-stg.cfg b/roles/nagios/server/files/nagios/hosts/bodhi-backend01-stg.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bodhi-backend01-stg.cfg rename to roles/nagios/server/files/nagios/hosts/bodhi-backend01-stg.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bodhi-backend01.cfg b/roles/nagios/server/files/nagios/hosts/bodhi-backend01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bodhi-backend01.cfg rename to roles/nagios/server/files/nagios/hosts/bodhi-backend01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bodhi-backend02.cfg b/roles/nagios/server/files/nagios/hosts/bodhi-backend02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bodhi-backend02.cfg rename to roles/nagios/server/files/nagios/hosts/bodhi-backend02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bodhi01.cfg b/roles/nagios/server/files/nagios/hosts/bodhi01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bodhi01.cfg rename to roles/nagios/server/files/nagios/hosts/bodhi01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bodhi02.cfg b/roles/nagios/server/files/nagios/hosts/bodhi02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bodhi02.cfg rename to roles/nagios/server/files/nagios/hosts/bodhi02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bodhi03.cfg b/roles/nagios/server/files/nagios/hosts/bodhi03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bodhi03.cfg rename to roles/nagios/server/files/nagios/hosts/bodhi03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bodhi04.cfg b/roles/nagios/server/files/nagios/hosts/bodhi04.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bodhi04.cfg rename to roles/nagios/server/files/nagios/hosts/bodhi04.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bodhost01.cfg b/roles/nagios/server/files/nagios/hosts/bodhost01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bodhost01.cfg rename to roles/nagios/server/files/nagios/hosts/bodhost01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/branched-composer.cfg b/roles/nagios/server/files/nagios/hosts/branched-composer.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/branched-composer.cfg rename to roles/nagios/server/files/nagios/hosts/branched-composer.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bugyou01.cfg b/roles/nagios/server/files/nagios/hosts/bugyou01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bugyou01.cfg rename to roles/nagios/server/files/nagios/hosts/bugyou01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bugzilla2fedmsg01.cfg b/roles/nagios/server/files/nagios/hosts/bugzilla2fedmsg01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bugzilla2fedmsg01.cfg rename to roles/nagios/server/files/nagios/hosts/bugzilla2fedmsg01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-01.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-01.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-02.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-02.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-03.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-03.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-04.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-04.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-04.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-04.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-05.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-05.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-05.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-05.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-06.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-06.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-06.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-06.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-07.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-07.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-07.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-07.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-08.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-08.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-08.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-08.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-09.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-09.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-09.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-09.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-10.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-10.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-10.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-10.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-11.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-11.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-11.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-11.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-12.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-12.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-12.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-12.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-13.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-13.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-13.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-13.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-14.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-14.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-14.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-14.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-15.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-15.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-15.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-15.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-16.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-16.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-16.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-16.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-17.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-17.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-17.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-17.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-18.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-18.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-18.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-18.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-19.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-19.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-19.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-19.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-20.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-20.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-20.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-20.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-21.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-21.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-21.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-21.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-22.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-22.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-22.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-22.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-23.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-23.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-23.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-23.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-24.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-24.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-24.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-24.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-25.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-25.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-25.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-25.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-26.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-26.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-26.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-26.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvm-27.cfg b/roles/nagios/server/files/nagios/hosts/buildvm-27.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvm-27.cfg rename to roles/nagios/server/files/nagios/hosts/buildvm-27.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvmhost-10.cfg b/roles/nagios/server/files/nagios/hosts/buildvmhost-10.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvmhost-10.cfg rename to roles/nagios/server/files/nagios/hosts/buildvmhost-10.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvmhost-11.cfg b/roles/nagios/server/files/nagios/hosts/buildvmhost-11.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvmhost-11.cfg rename to roles/nagios/server/files/nagios/hosts/buildvmhost-11.cfg diff --git a/roles/nagios_server/files/nagios/hosts/buildvmhost-12.cfg b/roles/nagios/server/files/nagios/hosts/buildvmhost-12.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/buildvmhost-12.cfg rename to roles/nagios/server/files/nagios/hosts/buildvmhost-12.cfg diff --git a/roles/nagios_server/files/nagios/hosts/busgateway01-stg.cfg b/roles/nagios/server/files/nagios/hosts/busgateway01-stg.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/busgateway01-stg.cfg rename to roles/nagios/server/files/nagios/hosts/busgateway01-stg.cfg diff --git a/roles/nagios_server/files/nagios/hosts/busgateway01.cfg b/roles/nagios/server/files/nagios/hosts/busgateway01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/busgateway01.cfg rename to roles/nagios/server/files/nagios/hosts/busgateway01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bvirthost04-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/bvirthost04-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bvirthost04-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/bvirthost04-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bvirthost04.cfg b/roles/nagios/server/files/nagios/hosts/bvirthost04.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bvirthost04.cfg rename to roles/nagios/server/files/nagios/hosts/bvirthost04.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bvirthost06.cfg b/roles/nagios/server/files/nagios/hosts/bvirthost06.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bvirthost06.cfg rename to roles/nagios/server/files/nagios/hosts/bvirthost06.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bvirthost07-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/bvirthost07-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bvirthost07-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/bvirthost07-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bvirthost07.cfg b/roles/nagios/server/files/nagios/hosts/bvirthost07.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bvirthost07.cfg rename to roles/nagios/server/files/nagios/hosts/bvirthost07.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bvirthost08.cfg b/roles/nagios/server/files/nagios/hosts/bvirthost08.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bvirthost08.cfg rename to roles/nagios/server/files/nagios/hosts/bvirthost08.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bvirthost09.cfg b/roles/nagios/server/files/nagios/hosts/bvirthost09.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bvirthost09.cfg rename to roles/nagios/server/files/nagios/hosts/bvirthost09.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bvirthost10.cfg b/roles/nagios/server/files/nagios/hosts/bvirthost10.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bvirthost10.cfg rename to roles/nagios/server/files/nagios/hosts/bvirthost10.cfg diff --git a/roles/nagios_server/files/nagios/hosts/bvirthost11.cfg b/roles/nagios/server/files/nagios/hosts/bvirthost11.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/bvirthost11.cfg rename to roles/nagios/server/files/nagios/hosts/bvirthost11.cfg diff --git a/roles/nagios_server/files/nagios/hosts/cloud-gw.cfg b/roles/nagios/server/files/nagios/hosts/cloud-gw.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/cloud-gw.cfg rename to roles/nagios/server/files/nagios/hosts/cloud-gw.cfg diff --git a/roles/nagios_server/files/nagios/hosts/collab03.cfg b/roles/nagios/server/files/nagios/hosts/collab03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/collab03.cfg rename to roles/nagios/server/files/nagios/hosts/collab03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/collab04.cfg b/roles/nagios/server/files/nagios/hosts/collab04.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/collab04.cfg rename to roles/nagios/server/files/nagios/hosts/collab04.cfg diff --git a/roles/nagios_server/files/nagios/hosts/coloamer01.cfg b/roles/nagios/server/files/nagios/hosts/coloamer01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/coloamer01.cfg rename to roles/nagios/server/files/nagios/hosts/coloamer01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/copr-be-dev.cfg b/roles/nagios/server/files/nagios/hosts/copr-be-dev.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/copr-be-dev.cfg rename to roles/nagios/server/files/nagios/hosts/copr-be-dev.cfg diff --git a/roles/nagios_server/files/nagios/hosts/copr-be.cfg b/roles/nagios/server/files/nagios/hosts/copr-be.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/copr-be.cfg rename to roles/nagios/server/files/nagios/hosts/copr-be.cfg diff --git a/roles/nagios_server/files/nagios/hosts/darkserver01.cfg b/roles/nagios/server/files/nagios/hosts/darkserver01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/darkserver01.cfg rename to roles/nagios/server/files/nagios/hosts/darkserver01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/darkserver02.cfg b/roles/nagios/server/files/nagios/hosts/darkserver02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/darkserver02.cfg rename to roles/nagios/server/files/nagios/hosts/darkserver02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/datagrepper01.cfg b/roles/nagios/server/files/nagios/hosts/datagrepper01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/datagrepper01.cfg rename to roles/nagios/server/files/nagios/hosts/datagrepper01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/datagrepper02.cfg b/roles/nagios/server/files/nagios/hosts/datagrepper02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/datagrepper02.cfg rename to roles/nagios/server/files/nagios/hosts/datagrepper02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/db-datanommer02.cfg b/roles/nagios/server/files/nagios/hosts/db-datanommer02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/db-datanommer02.cfg rename to roles/nagios/server/files/nagios/hosts/db-datanommer02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/db-fas01.cfg b/roles/nagios/server/files/nagios/hosts/db-fas01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/db-fas01.cfg rename to roles/nagios/server/files/nagios/hosts/db-fas01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/db-koji01.cfg b/roles/nagios/server/files/nagios/hosts/db-koji01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/db-koji01.cfg rename to roles/nagios/server/files/nagios/hosts/db-koji01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/db01.cfg b/roles/nagios/server/files/nagios/hosts/db01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/db01.cfg rename to roles/nagios/server/files/nagios/hosts/db01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/db03.cfg b/roles/nagios/server/files/nagios/hosts/db03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/db03.cfg rename to roles/nagios/server/files/nagios/hosts/db03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/db05.cfg b/roles/nagios/server/files/nagios/hosts/db05.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/db05.cfg rename to roles/nagios/server/files/nagios/hosts/db05.cfg diff --git a/roles/nagios_server/files/nagios/hosts/dedicatedsolutions01.cfg b/roles/nagios/server/files/nagios/hosts/dedicatedsolutions01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/dedicatedsolutions01.cfg rename to roles/nagios/server/files/nagios/hosts/dedicatedsolutions01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/dhcp01.cfg b/roles/nagios/server/files/nagios/hosts/dhcp01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/dhcp01.cfg rename to roles/nagios/server/files/nagios/hosts/dhcp01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/download-ib02.cfg b/roles/nagios/server/files/nagios/hosts/download-ib02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/download-ib02.cfg rename to roles/nagios/server/files/nagios/hosts/download-ib02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/download-rdu01.cfg b/roles/nagios/server/files/nagios/hosts/download-rdu01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/download-rdu01.cfg rename to roles/nagios/server/files/nagios/hosts/download-rdu01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/download-rdu02.cfg b/roles/nagios/server/files/nagios/hosts/download-rdu02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/download-rdu02.cfg rename to roles/nagios/server/files/nagios/hosts/download-rdu02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/download-rdu03.cfg b/roles/nagios/server/files/nagios/hosts/download-rdu03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/download-rdu03.cfg rename to roles/nagios/server/files/nagios/hosts/download-rdu03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/download01-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/download01-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/download01-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/download01-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/download01.cfg b/roles/nagios/server/files/nagios/hosts/download01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/download01.cfg rename to roles/nagios/server/files/nagios/hosts/download01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/download02-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/download02-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/download02-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/download02-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/download02.cfg b/roles/nagios/server/files/nagios/hosts/download02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/download02.cfg rename to roles/nagios/server/files/nagios/hosts/download02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/download03-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/download03-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/download03-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/download03-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/download03.cfg b/roles/nagios/server/files/nagios/hosts/download03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/download03.cfg rename to roles/nagios/server/files/nagios/hosts/download03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/download04-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/download04-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/download04-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/download04-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/download04.cfg b/roles/nagios/server/files/nagios/hosts/download04.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/download04.cfg rename to roles/nagios/server/files/nagios/hosts/download04.cfg diff --git a/roles/nagios_server/files/nagios/hosts/download05-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/download05-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/download05-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/download05-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/download05.cfg b/roles/nagios/server/files/nagios/hosts/download05.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/download05.cfg rename to roles/nagios/server/files/nagios/hosts/download05.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fakefas01.cfg b/roles/nagios/server/files/nagios/hosts/fakefas01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fakefas01.cfg rename to roles/nagios/server/files/nagios/hosts/fakefas01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fas01-stg.cfg b/roles/nagios/server/files/nagios/hosts/fas01-stg.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fas01-stg.cfg rename to roles/nagios/server/files/nagios/hosts/fas01-stg.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fas01.cfg b/roles/nagios/server/files/nagios/hosts/fas01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fas01.cfg rename to roles/nagios/server/files/nagios/hosts/fas01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fas02.cfg b/roles/nagios/server/files/nagios/hosts/fas02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fas02.cfg rename to roles/nagios/server/files/nagios/hosts/fas02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fas03.cfg b/roles/nagios/server/files/nagios/hosts/fas03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fas03.cfg rename to roles/nagios/server/files/nagios/hosts/fas03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud03-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud03-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud03-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud03-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud03.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud03.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud04-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud04-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud04-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud04-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud04.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud04.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud04.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud04.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud05-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud05-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud05-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud05-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud05.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud05.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud05.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud05.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud06-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud06-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud06-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud06-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud06.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud06.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud06.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud06.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud07-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud07-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud07-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud07-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud07.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud07.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud07.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud07.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud08-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud08-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud08-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud08-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud08.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud08.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud08.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud08.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud09-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud09-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud09-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud09-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud09.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud09.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud09.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud09.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud10-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud10-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud10-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud10-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud10.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud10.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud10.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud10.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud11-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud11-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud11-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud11-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud11.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud11.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud11.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud11.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud12-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud12-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud12-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud12-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud12.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud12.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud12.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud12.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud13-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud13-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud13-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud13-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud13.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud13.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud13.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud13.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud14-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud14-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud14-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud14-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud14.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud14.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud14.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud14.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud15-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud15-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud15-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud15-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fed-cloud15.cfg b/roles/nagios/server/files/nagios/hosts/fed-cloud15.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fed-cloud15.cfg rename to roles/nagios/server/files/nagios/hosts/fed-cloud15.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fedimg01.cfg b/roles/nagios/server/files/nagios/hosts/fedimg01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fedimg01.cfg rename to roles/nagios/server/files/nagios/hosts/fedimg01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fedocal01.cfg b/roles/nagios/server/files/nagios/hosts/fedocal01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fedocal01.cfg rename to roles/nagios/server/files/nagios/hosts/fedocal01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fedocal02.cfg b/roles/nagios/server/files/nagios/hosts/fedocal02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fedocal02.cfg rename to roles/nagios/server/files/nagios/hosts/fedocal02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/fwsm01-gw.cfg b/roles/nagios/server/files/nagios/hosts/fwsm01-gw.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/fwsm01-gw.cfg rename to roles/nagios/server/files/nagios/hosts/fwsm01-gw.cfg diff --git a/roles/nagios_server/files/nagios/hosts/github2fedmsg01.cfg b/roles/nagios/server/files/nagios/hosts/github2fedmsg01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/github2fedmsg01.cfg rename to roles/nagios/server/files/nagios/hosts/github2fedmsg01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/host1plus01.cfg b/roles/nagios/server/files/nagios/hosts/host1plus01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/host1plus01.cfg rename to roles/nagios/server/files/nagios/hosts/host1plus01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/hosted-lists01.cfg b/roles/nagios/server/files/nagios/hosts/hosted-lists01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/hosted-lists01.cfg rename to roles/nagios/server/files/nagios/hosts/hosted-lists01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/hosted03.cfg b/roles/nagios/server/files/nagios/hosts/hosted03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/hosted03.cfg rename to roles/nagios/server/files/nagios/hosts/hosted03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/hosted04.cfg b/roles/nagios/server/files/nagios/hosts/hosted04.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/hosted04.cfg rename to roles/nagios/server/files/nagios/hosts/hosted04.cfg diff --git a/roles/nagios_server/files/nagios/hosts/hotness01.cfg b/roles/nagios/server/files/nagios/hosts/hotness01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/hotness01.cfg rename to roles/nagios/server/files/nagios/hosts/hotness01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/ibiblio-gw.cfg b/roles/nagios/server/files/nagios/hosts/ibiblio-gw.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/ibiblio-gw.cfg rename to roles/nagios/server/files/nagios/hosts/ibiblio-gw.cfg diff --git a/roles/nagios_server/files/nagios/hosts/ibiblio01.cfg b/roles/nagios/server/files/nagios/hosts/ibiblio01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/ibiblio01.cfg rename to roles/nagios/server/files/nagios/hosts/ibiblio01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/ibiblio02.cfg b/roles/nagios/server/files/nagios/hosts/ibiblio02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/ibiblio02.cfg rename to roles/nagios/server/files/nagios/hosts/ibiblio02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/ibiblio03.cfg b/roles/nagios/server/files/nagios/hosts/ibiblio03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/ibiblio03.cfg rename to roles/nagios/server/files/nagios/hosts/ibiblio03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/ibiblio04.cfg b/roles/nagios/server/files/nagios/hosts/ibiblio04.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/ibiblio04.cfg rename to roles/nagios/server/files/nagios/hosts/ibiblio04.cfg diff --git a/roles/nagios_server/files/nagios/hosts/ibiblio05.cfg b/roles/nagios/server/files/nagios/hosts/ibiblio05.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/ibiblio05.cfg rename to roles/nagios/server/files/nagios/hosts/ibiblio05.cfg diff --git a/roles/nagios_server/files/nagios/hosts/internetx01.cfg b/roles/nagios/server/files/nagios/hosts/internetx01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/internetx01.cfg rename to roles/nagios/server/files/nagios/hosts/internetx01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/ipsilon01.cfg b/roles/nagios/server/files/nagios/hosts/ipsilon01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/ipsilon01.cfg rename to roles/nagios/server/files/nagios/hosts/ipsilon01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/ipsilon02.cfg b/roles/nagios/server/files/nagios/hosts/ipsilon02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/ipsilon02.cfg rename to roles/nagios/server/files/nagios/hosts/ipsilon02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/koji01-stg.cfg b/roles/nagios/server/files/nagios/hosts/koji01-stg.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/koji01-stg.cfg rename to roles/nagios/server/files/nagios/hosts/koji01-stg.cfg diff --git a/roles/nagios_server/files/nagios/hosts/koji01.cfg b/roles/nagios/server/files/nagios/hosts/koji01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/koji01.cfg rename to roles/nagios/server/files/nagios/hosts/koji01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/koji02.cfg b/roles/nagios/server/files/nagios/hosts/koji02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/koji02.cfg rename to roles/nagios/server/files/nagios/hosts/koji02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/kojipkgs01.cfg b/roles/nagios/server/files/nagios/hosts/kojipkgs01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/kojipkgs01.cfg rename to roles/nagios/server/files/nagios/hosts/kojipkgs01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/kojipkgs02.cfg b/roles/nagios/server/files/nagios/hosts/kojipkgs02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/kojipkgs02.cfg rename to roles/nagios/server/files/nagios/hosts/kojipkgs02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/koschei01.cfg b/roles/nagios/server/files/nagios/hosts/koschei01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/koschei01.cfg rename to roles/nagios/server/files/nagios/hosts/koschei01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/lockbox01.cfg b/roles/nagios/server/files/nagios/hosts/lockbox01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/lockbox01.cfg rename to roles/nagios/server/files/nagios/hosts/lockbox01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/log01.cfg b/roles/nagios/server/files/nagios/hosts/log01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/log01.cfg rename to roles/nagios/server/files/nagios/hosts/log01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/mailman01.cfg b/roles/nagios/server/files/nagios/hosts/mailman01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/mailman01.cfg rename to roles/nagios/server/files/nagios/hosts/mailman01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/memcached01.cfg b/roles/nagios/server/files/nagios/hosts/memcached01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/memcached01.cfg rename to roles/nagios/server/files/nagios/hosts/memcached01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/memcached02.cfg b/roles/nagios/server/files/nagios/hosts/memcached02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/memcached02.cfg rename to roles/nagios/server/files/nagios/hosts/memcached02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/mirrorlist-dedicatedsolutions.cfg b/roles/nagios/server/files/nagios/hosts/mirrorlist-dedicatedsolutions.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/mirrorlist-dedicatedsolutions.cfg rename to roles/nagios/server/files/nagios/hosts/mirrorlist-dedicatedsolutions.cfg diff --git a/roles/nagios_server/files/nagios/hosts/mirrorlist-host1plus.cfg b/roles/nagios/server/files/nagios/hosts/mirrorlist-host1plus.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/mirrorlist-host1plus.cfg rename to roles/nagios/server/files/nagios/hosts/mirrorlist-host1plus.cfg diff --git a/roles/nagios_server/files/nagios/hosts/mirrorlist-ibiblio.cfg b/roles/nagios/server/files/nagios/hosts/mirrorlist-ibiblio.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/mirrorlist-ibiblio.cfg rename to roles/nagios/server/files/nagios/hosts/mirrorlist-ibiblio.cfg diff --git a/roles/nagios_server/files/nagios/hosts/mirrorlist-ibiblio02.cfg b/roles/nagios/server/files/nagios/hosts/mirrorlist-ibiblio02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/mirrorlist-ibiblio02.cfg rename to roles/nagios/server/files/nagios/hosts/mirrorlist-ibiblio02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/mirrorlist-osuosl.cfg b/roles/nagios/server/files/nagios/hosts/mirrorlist-osuosl.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/mirrorlist-osuosl.cfg rename to roles/nagios/server/files/nagios/hosts/mirrorlist-osuosl.cfg diff --git a/roles/nagios_server/files/nagios/hosts/mirrorlist-phx2.cfg b/roles/nagios/server/files/nagios/hosts/mirrorlist-phx2.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/mirrorlist-phx2.cfg rename to roles/nagios/server/files/nagios/hosts/mirrorlist-phx2.cfg diff --git a/roles/nagios_server/files/nagios/hosts/mm-backend01-stg.cfg b/roles/nagios/server/files/nagios/hosts/mm-backend01-stg.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/mm-backend01-stg.cfg rename to roles/nagios/server/files/nagios/hosts/mm-backend01-stg.cfg diff --git a/roles/nagios_server/files/nagios/hosts/mm-backend01.cfg b/roles/nagios/server/files/nagios/hosts/mm-backend01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/mm-backend01.cfg rename to roles/nagios/server/files/nagios/hosts/mm-backend01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/mm-crawler01-stg.cfg b/roles/nagios/server/files/nagios/hosts/mm-crawler01-stg.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/mm-crawler01-stg.cfg rename to roles/nagios/server/files/nagios/hosts/mm-crawler01-stg.cfg diff --git a/roles/nagios_server/files/nagios/hosts/mm-crawler01.cfg b/roles/nagios/server/files/nagios/hosts/mm-crawler01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/mm-crawler01.cfg rename to roles/nagios/server/files/nagios/hosts/mm-crawler01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/mm-crawler02.cfg b/roles/nagios/server/files/nagios/hosts/mm-crawler02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/mm-crawler02.cfg rename to roles/nagios/server/files/nagios/hosts/mm-crawler02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/mm-frontend01-stg.cfg b/roles/nagios/server/files/nagios/hosts/mm-frontend01-stg.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/mm-frontend01-stg.cfg rename to roles/nagios/server/files/nagios/hosts/mm-frontend01-stg.cfg diff --git a/roles/nagios_server/files/nagios/hosts/mm-frontend01.cfg b/roles/nagios/server/files/nagios/hosts/mm-frontend01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/mm-frontend01.cfg rename to roles/nagios/server/files/nagios/hosts/mm-frontend01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/mm-frontend02.cfg b/roles/nagios/server/files/nagios/hosts/mm-frontend02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/mm-frontend02.cfg rename to roles/nagios/server/files/nagios/hosts/mm-frontend02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/noc01.cfg b/roles/nagios/server/files/nagios/hosts/noc01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/noc01.cfg rename to roles/nagios/server/files/nagios/hosts/noc01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/noc02.cfg b/roles/nagios/server/files/nagios/hosts/noc02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/noc02.cfg rename to roles/nagios/server/files/nagios/hosts/noc02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/notifs-backend01.cfg b/roles/nagios/server/files/nagios/hosts/notifs-backend01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/notifs-backend01.cfg rename to roles/nagios/server/files/nagios/hosts/notifs-backend01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/notifs-web01.cfg b/roles/nagios/server/files/nagios/hosts/notifs-web01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/notifs-web01.cfg rename to roles/nagios/server/files/nagios/hosts/notifs-web01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/notifs-web02.cfg b/roles/nagios/server/files/nagios/hosts/notifs-web02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/notifs-web02.cfg rename to roles/nagios/server/files/nagios/hosts/notifs-web02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/ns-sb01.cfg b/roles/nagios/server/files/nagios/hosts/ns-sb01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/ns-sb01.cfg rename to roles/nagios/server/files/nagios/hosts/ns-sb01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/ns02.cfg b/roles/nagios/server/files/nagios/hosts/ns02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/ns02.cfg rename to roles/nagios/server/files/nagios/hosts/ns02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/ns03.cfg b/roles/nagios/server/files/nagios/hosts/ns03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/ns03.cfg rename to roles/nagios/server/files/nagios/hosts/ns03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/ns04.cfg b/roles/nagios/server/files/nagios/hosts/ns04.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/ns04.cfg rename to roles/nagios/server/files/nagios/hosts/ns04.cfg diff --git a/roles/nagios_server/files/nagios/hosts/ns05.cfg b/roles/nagios/server/files/nagios/hosts/ns05.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/ns05.cfg rename to roles/nagios/server/files/nagios/hosts/ns05.cfg diff --git a/roles/nagios_server/files/nagios/hosts/nuancier01.cfg b/roles/nagios/server/files/nagios/hosts/nuancier01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/nuancier01.cfg rename to roles/nagios/server/files/nagios/hosts/nuancier01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/nuancier02.cfg b/roles/nagios/server/files/nagios/hosts/nuancier02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/nuancier02.cfg rename to roles/nagios/server/files/nagios/hosts/nuancier02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/osuosl01.cfg b/roles/nagios/server/files/nagios/hosts/osuosl01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/osuosl01.cfg rename to roles/nagios/server/files/nagios/hosts/osuosl01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/osuosl02.cfg b/roles/nagios/server/files/nagios/hosts/osuosl02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/osuosl02.cfg rename to roles/nagios/server/files/nagios/hosts/osuosl02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/osuosl03.cfg b/roles/nagios/server/files/nagios/hosts/osuosl03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/osuosl03.cfg rename to roles/nagios/server/files/nagios/hosts/osuosl03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/packages03.cfg b/roles/nagios/server/files/nagios/hosts/packages03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/packages03.cfg rename to roles/nagios/server/files/nagios/hosts/packages03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/packages04.cfg b/roles/nagios/server/files/nagios/hosts/packages04.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/packages04.cfg rename to roles/nagios/server/files/nagios/hosts/packages04.cfg diff --git a/roles/nagios_server/files/nagios/hosts/paste01.cfg b/roles/nagios/server/files/nagios/hosts/paste01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/paste01.cfg rename to roles/nagios/server/files/nagios/hosts/paste01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/paste02.cfg b/roles/nagios/server/files/nagios/hosts/paste02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/paste02.cfg rename to roles/nagios/server/files/nagios/hosts/paste02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/pdc-backend01.cfg b/roles/nagios/server/files/nagios/hosts/pdc-backend01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/pdc-backend01.cfg rename to roles/nagios/server/files/nagios/hosts/pdc-backend01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/pdc-web01.cfg b/roles/nagios/server/files/nagios/hosts/pdc-web01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/pdc-web01.cfg rename to roles/nagios/server/files/nagios/hosts/pdc-web01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/pdc-web02.cfg b/roles/nagios/server/files/nagios/hosts/pdc-web02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/pdc-web02.cfg rename to roles/nagios/server/files/nagios/hosts/pdc-web02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/people01.cfg b/roles/nagios/server/files/nagios/hosts/people01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/people01.cfg rename to roles/nagios/server/files/nagios/hosts/people01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/people02.cfg b/roles/nagios/server/files/nagios/hosts/people02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/people02.cfg rename to roles/nagios/server/files/nagios/hosts/people02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/people03.cfg b/roles/nagios/server/files/nagios/hosts/people03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/people03.cfg rename to roles/nagios/server/files/nagios/hosts/people03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/pkgdb01.cfg b/roles/nagios/server/files/nagios/hosts/pkgdb01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/pkgdb01.cfg rename to roles/nagios/server/files/nagios/hosts/pkgdb01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/pkgdb01.stg.cfg b/roles/nagios/server/files/nagios/hosts/pkgdb01.stg.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/pkgdb01.stg.cfg rename to roles/nagios/server/files/nagios/hosts/pkgdb01.stg.cfg diff --git a/roles/nagios_server/files/nagios/hosts/pkgdb02.cfg b/roles/nagios/server/files/nagios/hosts/pkgdb02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/pkgdb02.cfg rename to roles/nagios/server/files/nagios/hosts/pkgdb02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/pkgs01-stg.cfg b/roles/nagios/server/files/nagios/hosts/pkgs01-stg.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/pkgs01-stg.cfg rename to roles/nagios/server/files/nagios/hosts/pkgs01-stg.cfg diff --git a/roles/nagios_server/files/nagios/hosts/pkgs02.cfg b/roles/nagios/server/files/nagios/hosts/pkgs02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/pkgs02.cfg rename to roles/nagios/server/files/nagios/hosts/pkgs02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/ppc-composer.cfg b/roles/nagios/server/files/nagios/hosts/ppc-composer.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/ppc-composer.cfg rename to roles/nagios/server/files/nagios/hosts/ppc-composer.cfg diff --git a/roles/nagios_server/files/nagios/hosts/ppc-hub.cfg b/roles/nagios/server/files/nagios/hosts/ppc-hub.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/ppc-hub.cfg rename to roles/nagios/server/files/nagios/hosts/ppc-hub.cfg diff --git a/roles/nagios_server/files/nagios/hosts/proxy01-stg.cfg b/roles/nagios/server/files/nagios/hosts/proxy01-stg.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/proxy01-stg.cfg rename to roles/nagios/server/files/nagios/hosts/proxy01-stg.cfg diff --git a/roles/nagios_server/files/nagios/hosts/proxy01.cfg b/roles/nagios/server/files/nagios/hosts/proxy01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/proxy01.cfg rename to roles/nagios/server/files/nagios/hosts/proxy01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/proxy02.cfg b/roles/nagios/server/files/nagios/hosts/proxy02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/proxy02.cfg rename to roles/nagios/server/files/nagios/hosts/proxy02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/proxy03.cfg b/roles/nagios/server/files/nagios/hosts/proxy03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/proxy03.cfg rename to roles/nagios/server/files/nagios/hosts/proxy03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/proxy04.cfg b/roles/nagios/server/files/nagios/hosts/proxy04.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/proxy04.cfg rename to roles/nagios/server/files/nagios/hosts/proxy04.cfg diff --git a/roles/nagios_server/files/nagios/hosts/proxy05.cfg b/roles/nagios/server/files/nagios/hosts/proxy05.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/proxy05.cfg rename to roles/nagios/server/files/nagios/hosts/proxy05.cfg diff --git a/roles/nagios_server/files/nagios/hosts/proxy06.cfg b/roles/nagios/server/files/nagios/hosts/proxy06.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/proxy06.cfg rename to roles/nagios/server/files/nagios/hosts/proxy06.cfg diff --git a/roles/nagios_server/files/nagios/hosts/proxy07.cfg b/roles/nagios/server/files/nagios/hosts/proxy07.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/proxy07.cfg rename to roles/nagios/server/files/nagios/hosts/proxy07.cfg diff --git a/roles/nagios_server/files/nagios/hosts/proxy08.cfg b/roles/nagios/server/files/nagios/hosts/proxy08.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/proxy08.cfg rename to roles/nagios/server/files/nagios/hosts/proxy08.cfg diff --git a/roles/nagios_server/files/nagios/hosts/proxy09.cfg b/roles/nagios/server/files/nagios/hosts/proxy09.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/proxy09.cfg rename to roles/nagios/server/files/nagios/hosts/proxy09.cfg diff --git a/roles/nagios_server/files/nagios/hosts/proxy10.cfg b/roles/nagios/server/files/nagios/hosts/proxy10.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/proxy10.cfg rename to roles/nagios/server/files/nagios/hosts/proxy10.cfg diff --git a/roles/nagios_server/files/nagios/hosts/proxy11.cfg b/roles/nagios/server/files/nagios/hosts/proxy11.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/proxy11.cfg rename to roles/nagios/server/files/nagios/hosts/proxy11.cfg diff --git a/roles/nagios_server/files/nagios/hosts/proxy12.cfg b/roles/nagios/server/files/nagios/hosts/proxy12.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/proxy12.cfg rename to roles/nagios/server/files/nagios/hosts/proxy12.cfg diff --git a/roles/nagios_server/files/nagios/hosts/qa01-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/qa01-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/qa01-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/qa01-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/qa02-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/qa02-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/qa02-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/qa02-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/qa03-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/qa03-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/qa03-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/qa03-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/qa04-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/qa04-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/qa04-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/qa04-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/qa05-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/qa05-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/qa05-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/qa05-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/qa06-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/qa06-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/qa06-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/qa06-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/qa07-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/qa07-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/qa07-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/qa07-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/qa08-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/qa08-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/qa08-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/qa08-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/qa09-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/qa09-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/qa09-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/qa09-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/qa09.qa.fedoraproject.org.cfg b/roles/nagios/server/files/nagios/hosts/qa09.qa.fedoraproject.org.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/qa09.qa.fedoraproject.org.cfg rename to roles/nagios/server/files/nagios/hosts/qa09.qa.fedoraproject.org.cfg diff --git a/roles/nagios_server/files/nagios/hosts/qa10-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/qa10-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/qa10-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/qa10-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/qa10.qa.fedoraproject.org.cfg b/roles/nagios/server/files/nagios/hosts/qa10.qa.fedoraproject.org.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/qa10.qa.fedoraproject.org.cfg rename to roles/nagios/server/files/nagios/hosts/qa10.qa.fedoraproject.org.cfg diff --git a/roles/nagios_server/files/nagios/hosts/qa11-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/qa11-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/qa11-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/qa11-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/qa11.qa.fedoraproject.org.cfg b/roles/nagios/server/files/nagios/hosts/qa11.qa.fedoraproject.org.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/qa11.qa.fedoraproject.org.cfg rename to roles/nagios/server/files/nagios/hosts/qa11.qa.fedoraproject.org.cfg diff --git a/roles/nagios_server/files/nagios/hosts/qa12-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/qa12-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/qa12-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/qa12-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/qa12.qa.fedoraproject.org.cfg b/roles/nagios/server/files/nagios/hosts/qa12.qa.fedoraproject.org.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/qa12.qa.fedoraproject.org.cfg rename to roles/nagios/server/files/nagios/hosts/qa12.qa.fedoraproject.org.cfg diff --git a/roles/nagios_server/files/nagios/hosts/qa13-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/qa13-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/qa13-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/qa13-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/qa13.qa.fedoraproject.org.cfg b/roles/nagios/server/files/nagios/hosts/qa13.qa.fedoraproject.org.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/qa13.qa.fedoraproject.org.cfg rename to roles/nagios/server/files/nagios/hosts/qa13.qa.fedoraproject.org.cfg diff --git a/roles/nagios_server/files/nagios/hosts/qa14-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/qa14-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/qa14-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/qa14-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/qa14.qa.fedoraproject.org.cfg b/roles/nagios/server/files/nagios/hosts/qa14.qa.fedoraproject.org.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/qa14.qa.fedoraproject.org.cfg rename to roles/nagios/server/files/nagios/hosts/qa14.qa.fedoraproject.org.cfg diff --git a/roles/nagios_server/files/nagios/hosts/rawhide-composer.cfg b/roles/nagios/server/files/nagios/hosts/rawhide-composer.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/rawhide-composer.cfg rename to roles/nagios/server/files/nagios/hosts/rawhide-composer.cfg diff --git a/roles/nagios_server/files/nagios/hosts/releng01-stg.cfg b/roles/nagios/server/files/nagios/hosts/releng01-stg.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/releng01-stg.cfg rename to roles/nagios/server/files/nagios/hosts/releng01-stg.cfg diff --git a/roles/nagios_server/files/nagios/hosts/releng04.cfg b/roles/nagios/server/files/nagios/hosts/releng04.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/releng04.cfg rename to roles/nagios/server/files/nagios/hosts/releng04.cfg diff --git a/roles/nagios_server/files/nagios/hosts/relepel01.cfg b/roles/nagios/server/files/nagios/hosts/relepel01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/relepel01.cfg rename to roles/nagios/server/files/nagios/hosts/relepel01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/resultsdb01.qa.fedoraproject.org.cfg b/roles/nagios/server/files/nagios/hosts/resultsdb01.qa.fedoraproject.org.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/resultsdb01.qa.fedoraproject.org.cfg rename to roles/nagios/server/files/nagios/hosts/resultsdb01.qa.fedoraproject.org.cfg diff --git a/roles/nagios_server/files/nagios/hosts/retrace01.cfg b/roles/nagios/server/files/nagios/hosts/retrace01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/retrace01.cfg rename to roles/nagios/server/files/nagios/hosts/retrace01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/secondary01.cfg b/roles/nagios/server/files/nagios/hosts/secondary01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/secondary01.cfg rename to roles/nagios/server/files/nagios/hosts/secondary01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/serverbeach06.cfg b/roles/nagios/server/files/nagios/hosts/serverbeach06.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/serverbeach06.cfg rename to roles/nagios/server/files/nagios/hosts/serverbeach06.cfg diff --git a/roles/nagios_server/files/nagios/hosts/serverbeach07.cfg b/roles/nagios/server/files/nagios/hosts/serverbeach07.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/serverbeach07.cfg rename to roles/nagios/server/files/nagios/hosts/serverbeach07.cfg diff --git a/roles/nagios_server/files/nagios/hosts/serverbeach08.cfg b/roles/nagios/server/files/nagios/hosts/serverbeach08.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/serverbeach08.cfg rename to roles/nagios/server/files/nagios/hosts/serverbeach08.cfg diff --git a/roles/nagios_server/files/nagios/hosts/serverbeach09.cfg b/roles/nagios/server/files/nagios/hosts/serverbeach09.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/serverbeach09.cfg rename to roles/nagios/server/files/nagios/hosts/serverbeach09.cfg diff --git a/roles/nagios_server/files/nagios/hosts/serverbeach10.cfg b/roles/nagios/server/files/nagios/hosts/serverbeach10.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/serverbeach10.cfg rename to roles/nagios/server/files/nagios/hosts/serverbeach10.cfg diff --git a/roles/nagios_server/files/nagios/hosts/sign-vault03-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/sign-vault03-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/sign-vault03-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/sign-vault03-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/sign-vault03.cfg b/roles/nagios/server/files/nagios/hosts/sign-vault03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/sign-vault03.cfg rename to roles/nagios/server/files/nagios/hosts/sign-vault03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/sign-vault04-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/sign-vault04-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/sign-vault04-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/sign-vault04-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/sign-vault04.cfg b/roles/nagios/server/files/nagios/hosts/sign-vault04.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/sign-vault04.cfg rename to roles/nagios/server/files/nagios/hosts/sign-vault04.cfg diff --git a/roles/nagios_server/files/nagios/hosts/smtp-mm-coloamer01.cfg b/roles/nagios/server/files/nagios/hosts/smtp-mm-coloamer01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/smtp-mm-coloamer01.cfg rename to roles/nagios/server/files/nagios/hosts/smtp-mm-coloamer01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/smtp-mm-ib01.cfg b/roles/nagios/server/files/nagios/hosts/smtp-mm-ib01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/smtp-mm-ib01.cfg rename to roles/nagios/server/files/nagios/hosts/smtp-mm-ib01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/smtp-mm-osuosl01.cfg b/roles/nagios/server/files/nagios/hosts/smtp-mm-osuosl01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/smtp-mm-osuosl01.cfg rename to roles/nagios/server/files/nagios/hosts/smtp-mm-osuosl01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/smtp-mm-tummy01.cfg b/roles/nagios/server/files/nagios/hosts/smtp-mm-tummy01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/smtp-mm-tummy01.cfg rename to roles/nagios/server/files/nagios/hosts/smtp-mm-tummy01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/status-fedora2.cfg b/roles/nagios/server/files/nagios/hosts/status-fedora2.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/status-fedora2.cfg rename to roles/nagios/server/files/nagios/hosts/status-fedora2.cfg diff --git a/roles/nagios_server/files/nagios/hosts/summershum01.cfg b/roles/nagios/server/files/nagios/hosts/summershum01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/summershum01.cfg rename to roles/nagios/server/files/nagios/hosts/summershum01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/sundries01.cfg b/roles/nagios/server/files/nagios/hosts/sundries01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/sundries01.cfg rename to roles/nagios/server/files/nagios/hosts/sundries01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/sundries01.stg.cfg b/roles/nagios/server/files/nagios/hosts/sundries01.stg.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/sundries01.stg.cfg rename to roles/nagios/server/files/nagios/hosts/sundries01.stg.cfg diff --git a/roles/nagios_server/files/nagios/hosts/sundries02.cfg b/roles/nagios/server/files/nagios/hosts/sundries02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/sundries02.cfg rename to roles/nagios/server/files/nagios/hosts/sundries02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/tagger01.cfg b/roles/nagios/server/files/nagios/hosts/tagger01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/tagger01.cfg rename to roles/nagios/server/files/nagios/hosts/tagger01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/tagger02.cfg b/roles/nagios/server/files/nagios/hosts/tagger02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/tagger02.cfg rename to roles/nagios/server/files/nagios/hosts/tagger02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/tape02-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/tape02-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/tape02-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/tape02-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/taskotron-dev01.qa.fedoraproject.org.cfg b/roles/nagios/server/files/nagios/hosts/taskotron-dev01.qa.fedoraproject.org.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/taskotron-dev01.qa.fedoraproject.org.cfg rename to roles/nagios/server/files/nagios/hosts/taskotron-dev01.qa.fedoraproject.org.cfg diff --git a/roles/nagios_server/files/nagios/hosts/taskotron-stg01.qa.fedoraproject.org.cfg b/roles/nagios/server/files/nagios/hosts/taskotron-stg01.qa.fedoraproject.org.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/taskotron-stg01.qa.fedoraproject.org.cfg rename to roles/nagios/server/files/nagios/hosts/taskotron-stg01.qa.fedoraproject.org.cfg diff --git a/roles/nagios_server/files/nagios/hosts/taskotron01.qa.fedoraproject.org.cfg b/roles/nagios/server/files/nagios/hosts/taskotron01.qa.fedoraproject.org.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/taskotron01.qa.fedoraproject.org.cfg rename to roles/nagios/server/files/nagios/hosts/taskotron01.qa.fedoraproject.org.cfg diff --git a/roles/nagios_server/files/nagios/hosts/telia01.cfg b/roles/nagios/server/files/nagios/hosts/telia01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/telia01.cfg rename to roles/nagios/server/files/nagios/hosts/telia01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/templates.cfg b/roles/nagios/server/files/nagios/hosts/templates.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/templates.cfg rename to roles/nagios/server/files/nagios/hosts/templates.cfg diff --git a/roles/nagios_server/files/nagios/hosts/torrent01.cfg b/roles/nagios/server/files/nagios/hosts/torrent01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/torrent01.cfg rename to roles/nagios/server/files/nagios/hosts/torrent01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/torrent02.cfg b/roles/nagios/server/files/nagios/hosts/torrent02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/torrent02.cfg rename to roles/nagios/server/files/nagios/hosts/torrent02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/tummy01.cfg b/roles/nagios/server/files/nagios/hosts/tummy01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/tummy01.cfg rename to roles/nagios/server/files/nagios/hosts/tummy01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/unbound-ib01.cfg b/roles/nagios/server/files/nagios/hosts/unbound-ib01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/unbound-ib01.cfg rename to roles/nagios/server/files/nagios/hosts/unbound-ib01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/unbound-osuosl01.cfg b/roles/nagios/server/files/nagios/hosts/unbound-osuosl01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/unbound-osuosl01.cfg rename to roles/nagios/server/files/nagios/hosts/unbound-osuosl01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/unbound-tummy01.cfg b/roles/nagios/server/files/nagios/hosts/unbound-tummy01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/unbound-tummy01.cfg rename to roles/nagios/server/files/nagios/hosts/unbound-tummy01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/value01-stg.cfg b/roles/nagios/server/files/nagios/hosts/value01-stg.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/value01-stg.cfg rename to roles/nagios/server/files/nagios/hosts/value01-stg.cfg diff --git a/roles/nagios_server/files/nagios/hosts/value01.cfg b/roles/nagios/server/files/nagios/hosts/value01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/value01.cfg rename to roles/nagios/server/files/nagios/hosts/value01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost-comm01-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost-comm01-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost-comm01-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost-comm01-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost-comm01.cfg b/roles/nagios/server/files/nagios/hosts/virthost-comm01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost-comm01.cfg rename to roles/nagios/server/files/nagios/hosts/virthost-comm01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost-comm02-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost-comm02-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost-comm02-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost-comm02-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost-comm02.cfg b/roles/nagios/server/files/nagios/hosts/virthost-comm02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost-comm02.cfg rename to roles/nagios/server/files/nagios/hosts/virthost-comm02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost-comm03-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost-comm03-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost-comm03-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost-comm03-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost-comm03.cfg b/roles/nagios/server/files/nagios/hosts/virthost-comm03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost-comm03.cfg rename to roles/nagios/server/files/nagios/hosts/virthost-comm03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost-comm04-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost-comm04-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost-comm04-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost-comm04-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost-comm04.cfg b/roles/nagios/server/files/nagios/hosts/virthost-comm04.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost-comm04.cfg rename to roles/nagios/server/files/nagios/hosts/virthost-comm04.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost01-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost01-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost01-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost01-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost01.cfg b/roles/nagios/server/files/nagios/hosts/virthost01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost01.cfg rename to roles/nagios/server/files/nagios/hosts/virthost01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost02-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost02-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost02-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost02-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost02.cfg b/roles/nagios/server/files/nagios/hosts/virthost02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost02.cfg rename to roles/nagios/server/files/nagios/hosts/virthost02.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost03-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost03-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost03-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost03-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost03.cfg b/roles/nagios/server/files/nagios/hosts/virthost03.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost03.cfg rename to roles/nagios/server/files/nagios/hosts/virthost03.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost04-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost04-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost04-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost04-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost04.cfg b/roles/nagios/server/files/nagios/hosts/virthost04.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost04.cfg rename to roles/nagios/server/files/nagios/hosts/virthost04.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost05-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost05-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost05-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost05-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost05.cfg b/roles/nagios/server/files/nagios/hosts/virthost05.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost05.cfg rename to roles/nagios/server/files/nagios/hosts/virthost05.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost06-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost06-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost06-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost06-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost06.cfg b/roles/nagios/server/files/nagios/hosts/virthost06.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost06.cfg rename to roles/nagios/server/files/nagios/hosts/virthost06.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost07-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost07-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost07-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost07-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost07.cfg b/roles/nagios/server/files/nagios/hosts/virthost07.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost07.cfg rename to roles/nagios/server/files/nagios/hosts/virthost07.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost08-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost08-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost08-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost08-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost08.cfg b/roles/nagios/server/files/nagios/hosts/virthost08.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost08.cfg rename to roles/nagios/server/files/nagios/hosts/virthost08.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost09-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost09-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost09-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost09-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost09.cfg b/roles/nagios/server/files/nagios/hosts/virthost09.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost09.cfg rename to roles/nagios/server/files/nagios/hosts/virthost09.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost11-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost11-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost11-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost11-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost11.cfg b/roles/nagios/server/files/nagios/hosts/virthost11.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost11.cfg rename to roles/nagios/server/files/nagios/hosts/virthost11.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost12-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost12-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost12-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost12-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost12.cfg b/roles/nagios/server/files/nagios/hosts/virthost12.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost12.cfg rename to roles/nagios/server/files/nagios/hosts/virthost12.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost14-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost14-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost14-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost14-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost14.cfg b/roles/nagios/server/files/nagios/hosts/virthost14.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost14.cfg rename to roles/nagios/server/files/nagios/hosts/virthost14.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost15-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost15-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost15-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost15-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost15.cfg b/roles/nagios/server/files/nagios/hosts/virthost15.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost15.cfg rename to roles/nagios/server/files/nagios/hosts/virthost15.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost16-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost16-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost16-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost16-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost16.cfg b/roles/nagios/server/files/nagios/hosts/virthost16.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost16.cfg rename to roles/nagios/server/files/nagios/hosts/virthost16.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost17-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost17-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost17-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost17-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost17.cfg b/roles/nagios/server/files/nagios/hosts/virthost17.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost17.cfg rename to roles/nagios/server/files/nagios/hosts/virthost17.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost18-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost18-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost18-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost18-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost18.cfg b/roles/nagios/server/files/nagios/hosts/virthost18.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost18.cfg rename to roles/nagios/server/files/nagios/hosts/virthost18.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost19-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost19-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost19-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost19-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost19.cfg b/roles/nagios/server/files/nagios/hosts/virthost19.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost19.cfg rename to roles/nagios/server/files/nagios/hosts/virthost19.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost20-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost20-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost20-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost20-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost20.cfg b/roles/nagios/server/files/nagios/hosts/virthost20.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost20.cfg rename to roles/nagios/server/files/nagios/hosts/virthost20.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost21-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost21-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost21-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost21-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost21.cfg b/roles/nagios/server/files/nagios/hosts/virthost21.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost21.cfg rename to roles/nagios/server/files/nagios/hosts/virthost21.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost22-mgmt.cfg b/roles/nagios/server/files/nagios/hosts/virthost22-mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost22-mgmt.cfg rename to roles/nagios/server/files/nagios/hosts/virthost22-mgmt.cfg diff --git a/roles/nagios_server/files/nagios/hosts/virthost22.cfg b/roles/nagios/server/files/nagios/hosts/virthost22.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/virthost22.cfg rename to roles/nagios/server/files/nagios/hosts/virthost22.cfg diff --git a/roles/nagios_server/files/nagios/hosts/wiki01.cfg b/roles/nagios/server/files/nagios/hosts/wiki01.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/wiki01.cfg rename to roles/nagios/server/files/nagios/hosts/wiki01.cfg diff --git a/roles/nagios_server/files/nagios/hosts/wiki01.stg.cfg b/roles/nagios/server/files/nagios/hosts/wiki01.stg.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/wiki01.stg.cfg rename to roles/nagios/server/files/nagios/hosts/wiki01.stg.cfg diff --git a/roles/nagios_server/files/nagios/hosts/wiki02.cfg b/roles/nagios/server/files/nagios/hosts/wiki02.cfg similarity index 100% rename from roles/nagios_server/files/nagios/hosts/wiki02.cfg rename to roles/nagios/server/files/nagios/hosts/wiki02.cfg diff --git a/roles/nagios_server/files/nagios/minimal.cfg b/roles/nagios/server/files/nagios/minimal.cfg similarity index 100% rename from roles/nagios_server/files/nagios/minimal.cfg rename to roles/nagios/server/files/nagios/minimal.cfg diff --git a/roles/nagios_server/files/nagios/misccommands.cfg b/roles/nagios/server/files/nagios/misccommands.cfg similarity index 100% rename from roles/nagios_server/files/nagios/misccommands.cfg rename to roles/nagios/server/files/nagios/misccommands.cfg diff --git a/roles/nagios_server/files/nagios/nagios.cfg b/roles/nagios/server/files/nagios/nagios.cfg similarity index 100% rename from roles/nagios_server/files/nagios/nagios.cfg rename to roles/nagios/server/files/nagios/nagios.cfg diff --git a/roles/nagios_server/files/nagios/private/resource.cfg b/roles/nagios/server/files/nagios/private/resource.cfg similarity index 100% rename from roles/nagios_server/files/nagios/private/resource.cfg rename to roles/nagios/server/files/nagios/private/resource.cfg diff --git a/roles/nagios_server/files/nagios/private/resource.cfg-sample b/roles/nagios/server/files/nagios/private/resource.cfg-sample similarity index 100% rename from roles/nagios_server/files/nagios/private/resource.cfg-sample rename to roles/nagios/server/files/nagios/private/resource.cfg-sample diff --git a/roles/nagios_server/files/nagios/send_nsca.cfg b/roles/nagios/server/files/nagios/send_nsca.cfg similarity index 100% rename from roles/nagios_server/files/nagios/send_nsca.cfg rename to roles/nagios/server/files/nagios/send_nsca.cfg diff --git a/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg b/roles/nagios/server/files/nagios/servicedeps/nrpe.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicedeps/nrpe.cfg rename to roles/nagios/server/files/nagios/servicedeps/nrpe.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/autoqa.cfg b/roles/nagios/server/files/nagios/servicegroups/autoqa.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/autoqa.cfg rename to roles/nagios/server/files/nagios/servicegroups/autoqa.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg b/roles/nagios/server/files/nagios/servicegroups/bodhi.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/bodhi.cfg rename to roles/nagios/server/files/nagios/servicegroups/bodhi.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/fas.cfg b/roles/nagios/server/files/nagios/servicegroups/fas.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/fas.cfg rename to roles/nagios/server/files/nagios/servicegroups/fas.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/fedorahosted.org.cfg b/roles/nagios/server/files/nagios/servicegroups/fedorahosted.org.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/fedorahosted.org.cfg rename to roles/nagios/server/files/nagios/servicegroups/fedorahosted.org.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/fp-wiki.cfg b/roles/nagios/server/files/nagios/servicegroups/fp-wiki.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/fp-wiki.cfg rename to roles/nagios/server/files/nagios/servicegroups/fp-wiki.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/freemedia.cfg b/roles/nagios/server/files/nagios/servicegroups/freemedia.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/freemedia.cfg rename to roles/nagios/server/files/nagios/servicegroups/freemedia.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/mgmt-http.cfg b/roles/nagios/server/files/nagios/servicegroups/mgmt-http.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/mgmt-http.cfg rename to roles/nagios/server/files/nagios/servicegroups/mgmt-http.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/mgmt-https.cfg b/roles/nagios/server/files/nagios/servicegroups/mgmt-https.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/mgmt-https.cfg rename to roles/nagios/server/files/nagios/servicegroups/mgmt-https.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/mirrorlist.cfg b/roles/nagios/server/files/nagios/servicegroups/mirrorlist.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/mirrorlist.cfg rename to roles/nagios/server/files/nagios/servicegroups/mirrorlist.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/pkgdb.cfg b/roles/nagios/server/files/nagios/servicegroups/pkgdb.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/pkgdb.cfg rename to roles/nagios/server/files/nagios/servicegroups/pkgdb.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/ppc-secondary.cfg b/roles/nagios/server/files/nagios/servicegroups/ppc-secondary.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/ppc-secondary.cfg rename to roles/nagios/server/files/nagios/servicegroups/ppc-secondary.cfg diff --git a/roles/nagios_server/files/nagios/servicegroups/retrace.cfg b/roles/nagios/server/files/nagios/servicegroups/retrace.cfg similarity index 100% rename from roles/nagios_server/files/nagios/servicegroups/retrace.cfg rename to roles/nagios/server/files/nagios/servicegroups/retrace.cfg diff --git a/roles/nagios_server/files/nagios/services/autocloud.cfg b/roles/nagios/server/files/nagios/services/autocloud.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/autocloud.cfg rename to roles/nagios/server/files/nagios/services/autocloud.cfg diff --git a/roles/nagios_server/files/nagios/services/copr.cfg b/roles/nagios/server/files/nagios/services/copr.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/copr.cfg rename to roles/nagios/server/files/nagios/services/copr.cfg diff --git a/roles/nagios_server/files/nagios/services/db_backups.cfg b/roles/nagios/server/files/nagios/services/db_backups.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/db_backups.cfg rename to roles/nagios/server/files/nagios/services/db_backups.cfg diff --git a/roles/nagios_server/files/nagios/services/disk.cfg b/roles/nagios/server/files/nagios/services/disk.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/disk.cfg rename to roles/nagios/server/files/nagios/services/disk.cfg diff --git a/roles/nagios_server/files/nagios/services/dns.cfg b/roles/nagios/server/files/nagios/services/dns.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/dns.cfg rename to roles/nagios/server/files/nagios/services/dns.cfg diff --git a/roles/nagios_server/files/nagios/services/fedmsg.cfg b/roles/nagios/server/files/nagios/services/fedmsg.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/fedmsg.cfg rename to roles/nagios/server/files/nagios/services/fedmsg.cfg diff --git a/roles/nagios_server/files/nagios/services/file_age.cfg b/roles/nagios/server/files/nagios/services/file_age.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/file_age.cfg rename to roles/nagios/server/files/nagios/services/file_age.cfg diff --git a/roles/nagios_server/files/nagios/services/haproxy.cfg b/roles/nagios/server/files/nagios/services/haproxy.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/haproxy.cfg rename to roles/nagios/server/files/nagios/services/haproxy.cfg diff --git a/roles/nagios_server/files/nagios/services/hosted.cfg b/roles/nagios/server/files/nagios/services/hosted.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/hosted.cfg rename to roles/nagios/server/files/nagios/services/hosted.cfg diff --git a/roles/nagios_server/files/nagios/services/koji.cfg b/roles/nagios/server/files/nagios/services/koji.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/koji.cfg rename to roles/nagios/server/files/nagios/services/koji.cfg diff --git a/roles/nagios_server/files/nagios/services/koschei.cfg b/roles/nagios/server/files/nagios/services/koschei.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/koschei.cfg rename to roles/nagios/server/files/nagios/services/koschei.cfg diff --git a/roles/nagios_server/files/nagios/services/locking.cfg b/roles/nagios/server/files/nagios/services/locking.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/locking.cfg rename to roles/nagios/server/files/nagios/services/locking.cfg diff --git a/roles/nagios_server/files/nagios/services/mail_queue.cfg b/roles/nagios/server/files/nagios/services/mail_queue.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/mail_queue.cfg rename to roles/nagios/server/files/nagios/services/mail_queue.cfg diff --git a/roles/nagios_server/files/nagios/services/memcached.cfg b/roles/nagios/server/files/nagios/services/memcached.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/memcached.cfg rename to roles/nagios/server/files/nagios/services/memcached.cfg diff --git a/roles/nagios_server/files/nagios/services/mgmt.cfg b/roles/nagios/server/files/nagios/services/mgmt.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/mgmt.cfg rename to roles/nagios/server/files/nagios/services/mgmt.cfg diff --git a/roles/nagios_server/files/nagios/services/nagios.cfg b/roles/nagios/server/files/nagios/services/nagios.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/nagios.cfg rename to roles/nagios/server/files/nagios/services/nagios.cfg diff --git a/roles/nagios_server/files/nagios/services/nrpe.cfg b/roles/nagios/server/files/nagios/services/nrpe.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/nrpe.cfg rename to roles/nagios/server/files/nagios/services/nrpe.cfg diff --git a/roles/nagios_server/files/nagios/services/pgsql.cfg b/roles/nagios/server/files/nagios/services/pgsql.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/pgsql.cfg rename to roles/nagios/server/files/nagios/services/pgsql.cfg diff --git a/roles/nagios_server/files/nagios/services/ping.cfg b/roles/nagios/server/files/nagios/services/ping.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/ping.cfg rename to roles/nagios/server/files/nagios/services/ping.cfg diff --git a/roles/nagios_server/files/nagios/services/procs.cfg b/roles/nagios/server/files/nagios/services/procs.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/procs.cfg rename to roles/nagios/server/files/nagios/services/procs.cfg diff --git a/roles/nagios_server/files/nagios/services/raid.cfg b/roles/nagios/server/files/nagios/services/raid.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/raid.cfg rename to roles/nagios/server/files/nagios/services/raid.cfg diff --git a/roles/nagios_server/files/nagios/services/smtp-mm.cfg b/roles/nagios/server/files/nagios/services/smtp-mm.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/smtp-mm.cfg rename to roles/nagios/server/files/nagios/services/smtp-mm.cfg diff --git a/roles/nagios_server/files/nagios/services/ssh.cfg b/roles/nagios/server/files/nagios/services/ssh.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/ssh.cfg rename to roles/nagios/server/files/nagios/services/ssh.cfg diff --git a/roles/nagios_server/files/nagios/services/ssl.cfg b/roles/nagios/server/files/nagios/services/ssl.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/ssl.cfg rename to roles/nagios/server/files/nagios/services/ssl.cfg diff --git a/roles/nagios_server/files/nagios/services/swap.cfg b/roles/nagios/server/files/nagios/services/swap.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/swap.cfg rename to roles/nagios/server/files/nagios/services/swap.cfg diff --git a/roles/nagios_server/files/nagios/services/templates.cfg b/roles/nagios/server/files/nagios/services/templates.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/templates.cfg rename to roles/nagios/server/files/nagios/services/templates.cfg diff --git a/roles/nagios_server/files/nagios/services/testcloud.cfg b/roles/nagios/server/files/nagios/services/testcloud.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/testcloud.cfg rename to roles/nagios/server/files/nagios/services/testcloud.cfg diff --git a/roles/nagios_server/files/nagios/services/unbound.cfg b/roles/nagios/server/files/nagios/services/unbound.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/unbound.cfg rename to roles/nagios/server/files/nagios/services/unbound.cfg diff --git a/roles/nagios_server/files/nagios/services/vpnclients.cfg b/roles/nagios/server/files/nagios/services/vpnclients.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/vpnclients.cfg rename to roles/nagios/server/files/nagios/services/vpnclients.cfg diff --git a/roles/nagios_server/files/nagios/services/websites.cfg b/roles/nagios/server/files/nagios/services/websites.cfg similarity index 100% rename from roles/nagios_server/files/nagios/services/websites.cfg rename to roles/nagios/server/files/nagios/services/websites.cfg diff --git a/roles/nagios_server/files/nagios/timeperiods.cfg b/roles/nagios/server/files/nagios/timeperiods.cfg similarity index 100% rename from roles/nagios_server/files/nagios/timeperiods.cfg rename to roles/nagios/server/files/nagios/timeperiods.cfg diff --git a/roles/nagios_server/files/nrpe.cfg b/roles/nagios/server/files/nrpe.cfg similarity index 100% rename from roles/nagios_server/files/nrpe.cfg rename to roles/nagios/server/files/nrpe.cfg diff --git a/roles/nagios_server/files/plugins/check_datanommer_timesince.py b/roles/nagios/server/files/plugins/check_datanommer_timesince.py similarity index 100% rename from roles/nagios_server/files/plugins/check_datanommer_timesince.py rename to roles/nagios/server/files/plugins/check_datanommer_timesince.py diff --git a/roles/nagios_server/files/plugins/check_dig_ssl b/roles/nagios/server/files/plugins/check_dig_ssl similarity index 100% rename from roles/nagios_server/files/plugins/check_dig_ssl rename to roles/nagios/server/files/plugins/check_dig_ssl diff --git a/roles/nagios_server/files/plugins/check_email_delivery_epn b/roles/nagios/server/files/plugins/check_email_delivery_epn similarity index 100% rename from roles/nagios_server/files/plugins/check_email_delivery_epn rename to roles/nagios/server/files/plugins/check_email_delivery_epn diff --git a/roles/nagios_server/files/plugins/check_fcomm_queue b/roles/nagios/server/files/plugins/check_fcomm_queue similarity index 100% rename from roles/nagios_server/files/plugins/check_fcomm_queue rename to roles/nagios/server/files/plugins/check_fcomm_queue diff --git a/roles/nagios_server/files/plugins/check_fedmsg_consumer_backlog.py b/roles/nagios/server/files/plugins/check_fedmsg_consumer_backlog.py similarity index 100% rename from roles/nagios_server/files/plugins/check_fedmsg_consumer_backlog.py rename to roles/nagios/server/files/plugins/check_fedmsg_consumer_backlog.py diff --git a/roles/nagios_server/files/plugins/check_fedmsg_consumer_exceptions.py b/roles/nagios/server/files/plugins/check_fedmsg_consumer_exceptions.py similarity index 100% rename from roles/nagios_server/files/plugins/check_fedmsg_consumer_exceptions.py rename to roles/nagios/server/files/plugins/check_fedmsg_consumer_exceptions.py diff --git a/roles/nagios_server/files/plugins/check_fedmsg_producers_consumers.py b/roles/nagios/server/files/plugins/check_fedmsg_producers_consumers.py similarity index 100% rename from roles/nagios_server/files/plugins/check_fedmsg_producers_consumers.py rename to roles/nagios/server/files/plugins/check_fedmsg_producers_consumers.py diff --git a/roles/nagios_server/files/plugins/check_haproxy_conns.py b/roles/nagios/server/files/plugins/check_haproxy_conns.py similarity index 100% rename from roles/nagios_server/files/plugins/check_haproxy_conns.py rename to roles/nagios/server/files/plugins/check_haproxy_conns.py diff --git a/roles/nagios_server/files/plugins/check_imap_receive_epn b/roles/nagios/server/files/plugins/check_imap_receive_epn similarity index 100% rename from roles/nagios_server/files/plugins/check_imap_receive_epn rename to roles/nagios/server/files/plugins/check_imap_receive_epn diff --git a/roles/nagios_server/files/plugins/check_ipmi b/roles/nagios/server/files/plugins/check_ipmi similarity index 100% rename from roles/nagios_server/files/plugins/check_ipmi rename to roles/nagios/server/files/plugins/check_ipmi diff --git a/roles/nagios_server/files/plugins/check_koji b/roles/nagios/server/files/plugins/check_koji similarity index 100% rename from roles/nagios_server/files/plugins/check_koji rename to roles/nagios/server/files/plugins/check_koji diff --git a/roles/nagios_server/files/plugins/check_lock b/roles/nagios/server/files/plugins/check_lock similarity index 100% rename from roles/nagios_server/files/plugins/check_lock rename to roles/nagios/server/files/plugins/check_lock diff --git a/roles/nagios_server/files/plugins/check_lock_file_age b/roles/nagios/server/files/plugins/check_lock_file_age similarity index 100% rename from roles/nagios_server/files/plugins/check_lock_file_age rename to roles/nagios/server/files/plugins/check_lock_file_age diff --git a/roles/nagios_server/files/plugins/check_postfix_queue b/roles/nagios/server/files/plugins/check_postfix_queue similarity index 100% rename from roles/nagios_server/files/plugins/check_postfix_queue rename to roles/nagios/server/files/plugins/check_postfix_queue diff --git a/roles/nagios_server/files/plugins/check_raid.py b/roles/nagios/server/files/plugins/check_raid.py similarity index 100% rename from roles/nagios_server/files/plugins/check_raid.py rename to roles/nagios/server/files/plugins/check_raid.py diff --git a/roles/nagios_server/files/plugins/check_readonly_fs b/roles/nagios/server/files/plugins/check_readonly_fs similarity index 100% rename from roles/nagios_server/files/plugins/check_readonly_fs rename to roles/nagios/server/files/plugins/check_readonly_fs diff --git a/roles/nagios_server/files/plugins/check_smtp_send_epn b/roles/nagios/server/files/plugins/check_smtp_send_epn similarity index 100% rename from roles/nagios_server/files/plugins/check_smtp_send_epn rename to roles/nagios/server/files/plugins/check_smtp_send_epn diff --git a/roles/nagios_server/files/plugins/check_supybot_plugin b/roles/nagios/server/files/plugins/check_supybot_plugin similarity index 100% rename from roles/nagios_server/files/plugins/check_supybot_plugin rename to roles/nagios/server/files/plugins/check_supybot_plugin diff --git a/roles/nagios_server/files/plugins/check_tape b/roles/nagios/server/files/plugins/check_tape similarity index 100% rename from roles/nagios_server/files/plugins/check_tape rename to roles/nagios/server/files/plugins/check_tape diff --git a/roles/nagios_server/files/plugins/check_testcloud b/roles/nagios/server/files/plugins/check_testcloud similarity index 100% rename from roles/nagios_server/files/plugins/check_testcloud rename to roles/nagios/server/files/plugins/check_testcloud diff --git a/roles/nagios_server/files/plugins/restart_httpd b/roles/nagios/server/files/plugins/restart_httpd similarity index 100% rename from roles/nagios_server/files/plugins/restart_httpd rename to roles/nagios/server/files/plugins/restart_httpd diff --git a/roles/nagios_server/files/plugins/restart_rsyslog b/roles/nagios/server/files/plugins/restart_rsyslog similarity index 100% rename from roles/nagios_server/files/plugins/restart_rsyslog rename to roles/nagios/server/files/plugins/restart_rsyslog diff --git a/roles/nagios_server/files/selinux/Makefile b/roles/nagios/server/files/selinux/Makefile similarity index 100% rename from roles/nagios_server/files/selinux/Makefile rename to roles/nagios/server/files/selinux/Makefile diff --git a/roles/nagios_server/files/selinux/nagios_hostname.pp b/roles/nagios/server/files/selinux/nagios_hostname.pp similarity index 100% rename from roles/nagios_server/files/selinux/nagios_hostname.pp rename to roles/nagios/server/files/selinux/nagios_hostname.pp diff --git a/roles/nagios_server/files/selinux/nagios_hostname.te b/roles/nagios/server/files/selinux/nagios_hostname.te similarity index 100% rename from roles/nagios_server/files/selinux/nagios_hostname.te rename to roles/nagios/server/files/selinux/nagios_hostname.te diff --git a/roles/nagios_server/handlers/main.yml b/roles/nagios/server/handlers/main.yml similarity index 100% rename from roles/nagios_server/handlers/main.yml rename to roles/nagios/server/handlers/main.yml diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios/server/tasks/main.yml similarity index 89% rename from roles/nagios_server/tasks/main.yml rename to roles/nagios/server/tasks/main.yml index d581f17464..802efd823a 100644 --- a/roles/nagios_server/tasks/main.yml +++ b/roles/nagios/server/tasks/main.yml @@ -1,19 +1,19 @@ - name: Add nagios group as 420 group: name=nagios gid=420 state=present system=yes tags: - - nagios_server + - nagios/server - name: Add nagios user as 420 user: name=nagios uid=420 state=present home=/var/spool/nagios comment="Nagios Monitoring User" createhome=yes system=yes shell=/bin/bash tags: - - nagios_server + - nagios/server # Add the apache user to the nagios group so that it has permissions # to do stuff in /var/spool/nagios/* - name: Add apache to nagios group user: name=apache append=yes groups=nagios tags: - - nagios_server + - nagios/server - name: Install nagios packages yum: name={{ item }} state=present @@ -35,56 +35,56 @@ - stunnel - mod_auth_openid tags: - - nagios_server + - nagios/server - name: Copy /etc/nagios config synchronize: src={{nagios_srcdir}}/ dest=/etc/nagios/ tags: - nagios-config - - nagios_server + - nagios/server notify: restart nagios - name: copy over nagios/checkcommands.cfg template template: src={{nagios_srcdir}}/checkcommands.cfg dest=/etc/nagios/checkcommands.cfg tags: - nagios-config - - nagios_server + - nagios/server notify: restart nagios - name: Copy httpd config template: src=nagios-httpd.conf dest=/etc/httpd/conf.d/nagios.conf tags: - - nagios_server + - nagios/server - name: Create eventhandlers directory file: dest=/usr/lib64/nagios/plugins/eventhandlers/ state=directory tags: - - nagios_server + - nagios/server - name: Copy plugins copy: src=plugins/ dest=/usr/lib64/nagios/plugins/ mode=0755 owner=root group=root tags: - - nagios_server + - nagios/server - name: Create log directory file: dest=/var/log/nagios state=directory group=nagios owner=nagios mode=0755 tags: - - nagios_server + - nagios/server - name: Create spool directory file: dest=/var/log/nagios/spool state=directory group=nagios owner=nagios mode=0755 tags: - - nagios_server + - nagios/server - name: Create checkresults directory file: dest=/var/log/nagios/spool/checkresults state=directory group=nagios owner=nagios mode=0755 tags: - - nagios_server + - nagios/server - name: Copy irc-colorize.py copy: src=irc-colorize.py dest=/usr/local/bin/irc-colorize.py mode=0755 group=root owner=root tags: - - nagios_server + - nagios/server - name: Copy specialized nrpe.cfg for nagios server copy: src=nrpe.cfg dest=/etc/nagios/nrpe.cfg mode=0644 group=root owner=root @@ -92,51 +92,51 @@ - restart nrpe tags: - config - - nagios_server + - nagios/server - name: Copy check_nagios_notifications.py copy: src=check_nagios_notifications.py dest=/usr/local/bin/check_nagios_notifications.py mode=0755 group=root owner=root tags: - - nagios_server + - nagios/server - name: Nuke default nagios passwd file: dest=/etc/nagios/passwd state=absent tags: - - nagios_server + - nagios/server - name: Nuke default nagios objects file: dest=/etc/nagios/objects state=absent tags: - - nagios_server + - nagios/server - name: Install check_nagios_notifications cron cron: name="check_nagios_notifications" minute=0 hour=0 weekday=1 user=nagios job="/usr/local/bin/check_nagios_notifications.py" tags: - - nagios_server + - nagios/server - name: Override config.inc.php for the given environment template: src=config.inc.php dest=/usr/share/nagios/html/config.inc.php mode=0640 owner=root group=apache tags: - - nagios_server + - nagios/server # Handle selinux annoyances - roughly copied from fedmsg role - name: Ensure a directory exists for our custom selinux module file: dest=/usr/local/share/nagios-policy state=directory tags: - - nagios_server + - nagios/server - name: Copy over our custom selinux module copy: src=selinux/nagios_hostname.pp dest=/usr/local/share/nagios-policy/nagios_hostname.pp register: selinux_module tags: - - nagios_server + - nagios/server - name: Install our custom selinux module command: semodule -i /usr/local/share/nagios-policy/nagios_hostname.pp when: selinux_module|changed tags: - - nagios_server + - nagios/server - name: Start and autostart services service: name={{item}} state=started enabled=yes @@ -147,4 +147,4 @@ - postfix - rsyslog tags: - - nagios_server + - nagios/server diff --git a/roles/nagios_server/templates/config.inc.php b/roles/nagios/server/templates/config.inc.php similarity index 100% rename from roles/nagios_server/templates/config.inc.php rename to roles/nagios/server/templates/config.inc.php diff --git a/roles/nagios_server/templates/nagios-external/checkcommands.cfg b/roles/nagios/server/templates/nagios-external/checkcommands.cfg similarity index 100% rename from roles/nagios_server/templates/nagios-external/checkcommands.cfg rename to roles/nagios/server/templates/nagios-external/checkcommands.cfg diff --git a/roles/nagios_server/templates/nagios-httpd.conf b/roles/nagios/server/templates/nagios-httpd.conf similarity index 100% rename from roles/nagios_server/templates/nagios-httpd.conf rename to roles/nagios/server/templates/nagios-httpd.conf diff --git a/roles/nagios_server/templates/nagios/checkcommands.cfg b/roles/nagios/server/templates/nagios/checkcommands.cfg similarity index 100% rename from roles/nagios_server/templates/nagios/checkcommands.cfg rename to roles/nagios/server/templates/nagios/checkcommands.cfg