Browse Source

Icinga2: CheckCommand for check_ssl_cert is needed on Stretch, too.

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>
Maximilian Wilhelm 4 years ago
parent
commit
1b61dfd546
2 changed files with 4 additions and 4 deletions
  1. 1 1
      icinga2/commands.d/ssl_cert.conf
  2. 3 3
      icinga2/init.sls

+ 1 - 1
icinga2/commands.d/ssl_cert.conf

@@ -2,7 +2,7 @@
 # Old Icinga2 doesn't ship with check command for ssl_cert check
 #
 
-{%- if grains['oscodename'] == 'jessie' %}
+{%- if grains['oscodename'] == 'jessie' or grains['oscodename'] == 'stretch' %}
 object CheckCommand "ssl_cert" {
 	import "plugin-check-command"
 	command = [ PluginDir + "/check_ssl_cert" ]

+ 3 - 3
icinga2/init.sls

@@ -254,13 +254,13 @@ Cleanup /etc/icinga2/ffho-conf.d/net/wbbl/:
     - watch_in:
       - service: icinga2
 
-/etc/icinga2/check-commands.conf:
+# Client should not notify by themselves
+/etc/icinga2/features-enable/notification.conf:
   file.absent:
     - watch_in:
       - service: icinga2
-{% endif %}
-
 
+{% endif %}
 
 
 ################################################################################