diff --git a/roles/haproxy/files/503.http b/roles/haproxy/files/503.http
index b1b86fe152..ea833c3c84 100644
--- a/roles/haproxy/files/503.http
+++ b/roles/haproxy/files/503.http
@@ -55,7 +55,7 @@ Content-Type: text/html; charset=UTF-8
The service that you are trying to access is currently unavailable. Please try refreshing this page in a couple of minutes. If you still see this message, then please follow the steps below:
- Check on the status page if there are any known outages for our services.
- - Check the fedora-infrastructure trac instance for an outage notification.
+ - Check the fedora-infrastructure pagure instance for an outage notification.
- Ask around in #fedora-admin on irc.freenode.net.
- If it is accessible, check the Outage SOP for more information.
diff --git a/roles/nagios/server/files/nagios/servicegroups/fedorahosted.org.cfg b/roles/nagios/server/files/nagios/servicegroups/fedorahosted.org.cfg
index aa36349824..8a55dc89c7 100644
--- a/roles/nagios/server/files/nagios/servicegroups/fedorahosted.org.cfg
+++ b/roles/nagios/server/files/nagios/servicegroups/fedorahosted.org.cfg
@@ -1,5 +1,5 @@
-define servicegroup {
- servicegroup_name fedorahosted
- alias Fedora Hosted
- members hosted03,BZR,hosted03,GIT,hosted03,bzr.fedorahosted.org,hosted03,fedorahosted.org,hosted03,git.fedorahosted.org,hosted03,hg.fedorahosted.org,hosted03,svn.fedorahosted.org
-}
+#define servicegroup {
+# servicegroup_name fedorahosted
+# alias Fedora Hosted
+# members hosted03,BZR,hosted03,GIT,hosted03,bzr.fedorahosted.org,hosted03,fedorahosted.org,hosted03,git.fedorahosted.org,hosted03,hg.fedorahosted.org,hosted03,svn.fedorahosted.org
+#}
diff --git a/roles/nagios/server/files/nagios/services/fedmsg.cfg b/roles/nagios/server/files/nagios/services/fedmsg.cfg
index 71b51c4b84..380a854509 100644
--- a/roles/nagios/server/files/nagios/services/fedmsg.cfg
+++ b/roles/nagios/server/files/nagios/services/fedmsg.cfg
@@ -195,12 +195,12 @@ define service {
check_command check_by_nrpe!check_datanommer_copr
use defaulttemplate
}
-define service {
- host_name busgateway01
- service_description Check datanommer for recent trac messages
- check_command check_by_nrpe!check_datanommer_trac
- use defaulttemplate
-}
+#define service {
+# host_name busgateway01
+# service_description Check datanommer for recent trac messages
+# check_command check_by_nrpe!check_datanommer_trac
+# use defaulttemplate
+#}
define service {
host_name busgateway01
service_description Check datanommer for recent askbot messages
diff --git a/roles/nagios/server/files/nagios/services/hosted.cfg b/roles/nagios/server/files/nagios/services/hosted.cfg
index 0816af7a3a..b581591dbf 100644
--- a/roles/nagios/server/files/nagios/services/hosted.cfg
+++ b/roles/nagios/server/files/nagios/services/hosted.cfg
@@ -12,46 +12,46 @@ define service {
use defaulttemplate
}
-define service {
- hostgroup hosted
- service_description bzr.fedorahosted.org
- check_command check_website!bzr.fedorahosted.org!/bzr/!loggerheadCont
- use websitetemplate
-}
-
-define service {
- hostgroup hosted
- service_description fedorahosted.org
- check_command check_website!fedorahosted.org!/!
- use websitetemplate
-}
-
-define service {
- hostgroup hosted
- service_description git.fedorahosted.org
- check_command check_website!git.fedorahosted.org!/git/fedora-infrastructure.git/!