forked from evolix/ansible-roles
check_domains: Fix script and check
This commit is contained in:
parent
4bb2edae69
commit
16e0f923ef
|
@ -220,14 +220,14 @@ def main(argv):
|
||||||
print('Domains not specified, looking for all domains (default).')
|
print('Domains not specified, looking for all domains (default).')
|
||||||
args.all_domains = True
|
args.all_domains = True
|
||||||
|
|
||||||
doms = []
|
doms = {}
|
||||||
|
|
||||||
if args.all_domains:
|
if args.all_domains:
|
||||||
doms.extend(list_apache_domains())
|
doms.update(list_apache_domains())
|
||||||
|
|
||||||
else:
|
else:
|
||||||
if args.apache_domains:
|
if args.apache_domains:
|
||||||
doms.extend(list_apache_domains())
|
doms.update(list_apache_domains())
|
||||||
if args.nginx_domains:
|
if args.nginx_domains:
|
||||||
print("Option --nginx-domains not supported yet.")
|
print("Option --nginx-domains not supported yet.")
|
||||||
if args.haproxy_domains:
|
if args.haproxy_domains:
|
||||||
|
@ -243,7 +243,7 @@ def main(argv):
|
||||||
|
|
||||||
timeout_domains, none_domains, outside_ips, ok_domains = run_check_domains(doms.keys())
|
timeout_domains, none_domains, outside_ips, ok_domains = run_check_domains(doms.keys())
|
||||||
|
|
||||||
if args.check:
|
if args.output_style == 'nrpe':
|
||||||
output_check_mode(timeout_domains, none_domains, outside_ips, ok_domains)
|
output_check_mode(timeout_domains, none_domains, outside_ips, ok_domains)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/bash
|
#!/bin/bash
|
||||||
#
|
#
|
||||||
# Check domains using script inspect-domains.
|
# Check domains using script inspect-domains.
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in a new issue