copr: use already existing copr.cfg

roles/nagios_server/files/nagios/services/copr.cfg

@@ -39,3 +39,27 @@ define service {
     check_command          check_by_nrpe!check_copr_cdn
     use                    defaulttemplate
 }
+
+define service {
+    hostgroup_name        copr_dist_git_aws
+    service_description   http-copr-be.aws.fedoraproject.org
+    check_command         check_https!copr-be.aws.fedoraproject.org
+    max_check_attempts    8
+    use                   websitetemplate
+}
+
+define service {
+    hostgroup_name        copr_front_aws
+    service_description   http-copr-dist-git.fedorainfracloud.org
+    check_command         check_website_ssl!copr-dist-git.fedorainfracloud.org!/cgit/!Git repository browser
+    max_check_attempts    8
+    use                   websitetemplate
+}
+
+define service {
+    hostgroup_name        copr_back_aws
+    service_description   http-copr.fedorainfracloud.org
+    check_command         check_website_ssl!copr.fedorainfracloud.org!Copr hosts
+    max_check_attempts    8
+    use                   websitetemplate
+}

roles/nagios_server/tasks/main.yml

@@ -394,16 +394,6 @@
   - nagios_config
   notify: restart nagios
 
-- name: Template over services
-  template: src=nagios/services/{{item}}.j2 dest=/etc/nagios/services/{{item}} mode=0644 owner=root group=root
-  with_items:
-    - copr.cfg
-  when: env == "production"
-  tags:
-  - nagios_server
-  - nagios_config
-  notify: restart nagios
-
 - name: Template over services (both)
   template: src=nagios/services/{{item}}.j2 dest=/etc/nagios/services/{{item}} mode=0644 owner=root group=root
   with_items:

roles/nagios_server/templates/nagios/services/copr.cfg.j2

@@ -1,23 +0,0 @@
-define service {
-  hostgroup_name        copr_dist_git_aws
-  service_description   http-copr-be.aws.fedoraproject.org
-  check_command         check_https!copr-be.aws.fedoraproject.org
-  max_check_attempts    8
-  use                   websitetemplate
-}
-
-define service {
-  hostgroup_name        copr_front_aws
-  service_description   http-copr-dist-git.fedorainfracloud.org
-  check_command         check_website_ssl!copr-dist-git.fedorainfracloud.org!/cgit/!Git repository browser
-  max_check_attempts    8
-  use                   websitetemplate
-}
-
-define service {
-  hostgroup_name        copr_back_aws
-  service_description   http-copr.fedorainfracloud.org
-  check_command         check_website_ssl!copr.fedorainfracloud.org!Copr hosts
-  max_check_attempts    8
-  use                   websitetemplate
-}