From 917d2b9a2c2bb3ad9a1252eaf48c98675ddf3431 Mon Sep 17 00:00:00 2001 From: Rico Ullmann Date: Tue, 4 Jan 2022 13:15:36 +0100 Subject: [PATCH] monit: remove postfix check; sort service items --- bundles/monit/files/monitrc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/bundles/monit/files/monitrc b/bundles/monit/files/monitrc index 2682ad1..46a4960 100644 --- a/bundles/monit/files/monitrc +++ b/bundles/monit/files/monitrc @@ -39,19 +39,14 @@ check process sshd matching "/usr/sbin/sshd" if failed port 22 for 2 cycles then restart if 3 restarts within 5 cycles then alert -check process postfix matching "/usr/lib/postfix/sbin/master" - start program = "/bin/systemctl start postfix.service" - stop program = "/bin/systemctl stop postfix.service" - if failed port 25 protocol smtp for 5 cycles then restart - -% for service,options in monit.get('services', {}).items(): +% for service,options in sorted(monit.get('services', {}).items()): check process ${service} matching "${options['bin']}" start program = "/bin/systemctl start ${options.get('systemd_unit', 'service')}.service" stop program = "/bin/systemctl stop ${options.get('systemd_unit', 'service')}.service" -% for port,port_options in options.get('ports', {}).items(): +% for port,port_options in sorted(options.get('ports', {}).items()): if failed port ${port} protocol ${port_options['protocol']} for ${port_options.get('cycles', '5')} cycles then restart % endfor -% for domain,http_options in options.get('http', {}).items(): +% for domain,http_options in sorted(options.get('http', {}).items()): if failed host ${domain} % if http_options['scheme'] == 'https': port 443