diff --git a/roles/nagios_server/files/nagios-external/services/websites.cfg b/roles/nagios_server/files/nagios-external/services/websites.cfg
index f5a9066664..b453595310 100644
--- a/roles/nagios_server/files/nagios-external/services/websites.cfg
+++ b/roles/nagios_server/files/nagios-external/services/websites.cfg
@@ -1,6 +1,6 @@
 
 define service {
-  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, , 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
+  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
   service_description  	https 
   max_check_attempts    2
   normal_check_interval 2
@@ -10,7 +10,7 @@ define service {
 
 
 define service {
-  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, , 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
+  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
   service_description   bodhi
   max_check_attempts    8
   check_command         check_website_ssl!admin.fedoraproject.org!/updates/!Latest
@@ -18,14 +18,14 @@ define service {
 }
 
 define service {
-  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, , 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
+  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
   service_description   pkgdb
   check_command         check_website_ssl!admin.fedoraproject.org!/pkgdb/collections/!EPEL
   use                   websitetemplate
 }
 
 define service {
-  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, , 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
+  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
   service_description	packages
   max_check_attempts	8
   check_command		check_website_ssl!apps.fedoraproject.org!/packages/!Packages
@@ -33,7 +33,7 @@ define service {
 }
 
 define service {
-  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, , 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
+  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
   service_description   elections
   check_command         check_website_ssl!admin.fedoraproject.org!/voting/!Last 5 elections
   use                   websitetemplate
@@ -47,42 +47,42 @@ define service {
 }
 
 define service {
-  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, , 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
+  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
   service_description   fedoraproject.org
   check_command         check_website!fedoraproject.org!/!People world-wide
   use                   websitetemplate
 }
 
 define service {
-  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, , 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
+  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
   service_description   fedoraproject.org - wiki
   check_command         check_website!fedoraproject.org!/wiki/Special:Version!MediaWiki is free software
   use                   websitetemplate
 }
 
 define service {
-  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, , 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
+  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
   service_description   docs.fedoraproject.org
   check_command         check_website!docs.fedoraproject.org!/en-US/index.html!Fedora Documentation
   use                   websitetemplate
 }
 
 define service {
-  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, , 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
+  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
   service_description   mirrors.fedoraproject.org - mirrorlist
   check_command         check_website!mirrors.fedoraproject.org!/mirrorlist?repo=rawhide&arch=x86_64&country=global!development
   use                   websitetemplate
 }
 
 define service {
-  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, , 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
+  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
   service_description   mirrors.fedoraproject.org - publiclist
   check_command         check_website!mirrors.fedoraproject.org!/publiclist/Fedora/!Fedora Public Active Mirrors
   use                   websitetemplate
 }
 
 define service {
-  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, , 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
+  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
   service_description   start.fedoraproject.org
   check_command         check_website!start.fedoraproject.org!/!The Fedora Project is maintained
   use                   websitetemplate
@@ -101,14 +101,14 @@ define service {
 }
 
 define service {
-  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, , 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
+  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
   service_description   accounts
   check_command         check_website_ssl!admin.fedoraproject.org!/accounts/help/get_help/user_telephone!emergency
   use                   websitetemplate
 }
 
 define service {
-  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, , 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
+  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
   service_description   ask
   check_command         check_website_ssl!ask.fedoraproject.org!/en/questions/!RSS
   use                   websitetemplate
@@ -122,21 +122,21 @@ define service {
 }
 
 define service {
-  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, , 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
+  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
   service_description   blockerbugs
   check_command         check_website_ssl!qa.fedoraproject.org!/blockerbugs/!Currently Active Milestones
   use                   websitetemplate
 }
 
 define service {
-  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, , 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
+  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
   service_description   fedocal
   check_command         check_website_ssl!apps.fedoraproject.org!/calendar/list/infrastructure-outages/!Description
   use                   websitetemplate
 }
 
 define service {
-  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, , 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
+  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
   service_description   taskotron_taskmaster
   max_check_attempts    8
   check_command         check_website_ssl!taskotron.fedoraproject.org!/taskmaster/
@@ -144,7 +144,7 @@ define service {
 }
 
 define service {
-  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, , 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
+  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
   service_description   taskotron_resultsdb
   max_check_attempts    8
   check_command         check_website_ssl!taskotron.fedoraproject.org!/resultsdb/
@@ -152,7 +152,7 @@ define service {
 }
 
 define service {
-  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, , 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
+  host_name             209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.166-tummy, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach
   service_description   taskotron_resultsdb_api
   max_check_attempts    8
   check_command         check_website_ssl!taskotron.fedoraproject.org!/resultsdb_api/