Proxies: use a single path on the proxy as destination for the ticketkey

This also removes the Nagios config - it'll be looking in the wrong
place. A Zabbix replacement check will follow in the next commit.

Signed-off-by: Greg Sutcliffe <fedora@emeraldreverie.org>

playbooks/check-etc.yml

@@ -1055,7 +1055,7 @@
       - /etc/httpd/conf/cacert.pem
       - /etc/httpd/conf/pkgs.fedoraproject.org_key_and_cert.pem
 
-      - /etc/httpd/ticketkey_staging.tkey
+      - /etc/httpd/ticketkey.tkey
 
       # IPA files:
       - /etc/ipa/certprofiles/README

playbooks/groups/proxies.yml

@@ -141,7 +141,7 @@
   # If it's not, doesn't hurt to copy it over again
   #
   - name: Deploy ticket key
-    ansible.builtin.copy: src=/root/ticketkey_{{env}}.tkey dest=/etc/httpd/ticketkey_{{env}}.tkey
+    ansible.builtin.copy: src=/root/ticketkey_{{env}}.tkey dest=/etc/httpd/ticketkey.tkey
           owner=root group=root mode=0600
     notify:
     - Reload proxyhttpd

playbooks/update_ticketkey.yml

@@ -33,7 +33,7 @@
   tasks:
 
   - name: deploy ticket key
-    ansible.builtin.copy: src=/root/ticketkey_{{env}}.tkey dest=/etc/httpd/ticketkey_{{env}}.tkey
+    ansible.builtin.copy: src=/root/ticketkey_{{env}}.tkey dest=/etc/httpd/ticketkey.tkey
           owner=root group=root mode=0600
     notify:
     - Reload proxyhttpd

roles/base/files/common-scripts/proxy-conditional-reload.sh

@@ -9,7 +9,7 @@ rpm -q $PACKAGE
 
 INSTALLED=$?
 
-if [[ ! -f "/etc/httpd/ticketkey_*.tkey" && "$HOST" =~ "^proxy" ]]; then
+if [[ ! -f "/etc/httpd/ticketkey.tkey" && "$HOST" =~ "^proxy" ]]; then
     # This host is not configured yet and not proxy host, do not try and restart httpd
     exit 0
 fi

roles/httpd/proxy/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
 - name: Make sure the ticketkey is deployed
-  ansible.builtin.copy: src=/root/ticketkey_{{env}}.tkey dest=/etc/httpd/ticketkey_{{env}}.tkey
+  ansible.builtin.copy: src=/root/ticketkey_{{env}}.tkey dest=/etc/httpd/ticketkey.tkey
         owner=root group=root mode=0600
   notify:
   - Reload proxyhttpd

roles/httpd/proxy/templates/02-ticketkey.conf

@@ -1 +1 @@
-SSLSessionTicketKeyFile /etc/httpd/ticketkey_{{env}}.tkey
+SSLSessionTicketKeyFile /etc/httpd/ticketkey.tkey

roles/nagios_client/templates/check_proxies.cfg.j2

@@ -1,2 +1 @@
-command[check_ticketkey_age]={{ libdir }}/nagios/plugins/check_file_age -w 3600 -c 7200 -f /etc/httpd/ticketkey_{{env}}.tkey
 command[check_ostree_summary_file_age]=/usr/lib64/nagios/plugins/check_file_age -w 1800 -c 3600 /srv/web/ostree/summary

roles/nagios_server/files/nagios/services/rdu3_internal/file_age.cfg

@@ -16,15 +16,6 @@ define service {
   notification_interval 130
 }
 
-define service {
-  hostgroup_name	proxies
-  service_description   Check TicketKey age
-  check_command         check_by_nrpe!check_ticketkey_age
-  use                   defaulttemplate
-  check_interval 120
-  notification_interval 130
-}
-
 define service {
   hostgroup_name	proxies
   service_description   Check ostree summary age