From c120e2da16043dacea5b49154a3e0c16f89fb736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20-=20Le=20Filament?= <theo@le-filament.com>
Date: Thu, 18 Jul 2024 15:10:31 +0200
Subject: [PATCH] feat: check all service URLs
---
templates/templates.cfg.j2 | 2 +-
templates/vps.cfg.j2 | 19 +++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/templates/templates.cfg.j2 b/templates/templates.cfg.j2
index adfb8e1..a5df96a 100644
--- a/templates/templates.cfg.j2
+++ b/templates/templates.cfg.j2
@@ -90,7 +90,7 @@ define host{
define servicegroup{
servicegroup_name web-services
alias Services Web
- members {% for host in groups['odoo_server'] | sort %}{{ host }},Odoo {{ hostvars[host].odoo_url }},{% endfor %}{% for host in groups['owncloud_server'] | sort %}{{ host }},OwnCloud {{ hostvars[host].cloud_url }},{% endfor %}{% for host in groups['docker_odoo'] | sort %}{% for name, values in hostvars[host].odoo_instances.items() | default([]) %}{{ host }},{{ name }} server {{ values.url }},{% endfor %}{% endfor %}{% for host in groups['docker_owncloud'] | union(groups['docker_nextcloud']) | sort %}{{ host }},Cloud Server {{ hostvars[host].cloud_url }},{% if hostvars[host].cloud_onlyoffice is defined %}{{ host }},OnlyOffice Server {{ hostvars[host].cloud_onlyoffice_url }},{% endif %}{% endfor %}{% for host in groups['docker_auth'] | sort %}{% if loop.index == loop.length %}{{ host }},PhpLdapAdmin {{ hostvars[host].ldap_url }},{{ host }},SSO Server {{ hostvars[host].sso_url }}{% else %}{{ host }},PhpLdapAdmin {{ hostvars[host].ldap_url }},{{ host }},SSO Server {{ hostvars[host].sso_url }},{% endif %}{% endfor %}
+ members {% for host in groups['odoo_server'] | sort %}{{ host }},Odoo {{ hostvars[host].odoo_url }},{% endfor %}{% for host in groups['owncloud_server'] | sort %}{{ host }},OwnCloud {{ hostvars[host].cloud_url }},{% endfor %}{% for host in groups['docker_odoo'] | sort %}{% for name, values in hostvars[host].odoo_instances.items() | default([]) %}{% if values.url is defined %}{{ host }},{{ name }} server {{ values.url }},{% endif %}{% if values.domains is defined and values.domains is string %}{{ host }},{{ name }} server {{ values.domains }},{% else %}{% for domain in values.domains | default([]) %}{{ host }},{{ name }} server {{ domain }},{% endfor %}{% endif %}{% endfor %}{% endfor %}{% for host in groups['docker_owncloud'] | union(groups['docker_nextcloud']) | sort %}{{ host }},Cloud Server {{ hostvars[host].cloud_url }},{% if hostvars[host].cloud_onlyoffice is defined %}{{ host }},OnlyOffice Server {{ hostvars[host].cloud_onlyoffice_url }},{% endif %}{% endfor %}{% for host in groups['docker_auth'] | sort %}{% if loop.index == loop.length %}{{ host }},PhpLdapAdmin {{ hostvars[host].ldap_url }},{{ host }},SSO Server {{ hostvars[host].sso_url }}{% else %}{{ host }},PhpLdapAdmin {{ hostvars[host].ldap_url }},{{ host }},SSO Server {{ hostvars[host].sso_url }},{% endif %}{% endfor %}
}
diff --git a/templates/vps.cfg.j2 b/templates/vps.cfg.j2
index 59a0e93..0b4666d 100644
--- a/templates/vps.cfg.j2
+++ b/templates/vps.cfg.j2
@@ -327,12 +327,31 @@ define service{
{% endif %}
{% for name, values in hostvars[host].odoo_instances.items() | default([]) %}
+{% if values.url is defined %}
define service{
use generic-service
host_name {{ host }}
service_description {{ name }} server {{ values.url }}
check_command check_https!'{{ values.url }}'!/web/login
}
+{% endif %}
+{% if values.domains is defined and values.domains is string %}
+define service{
+ use generic-service
+ host_name {{ host }}
+ service_description {{ name }} server {{ values.domains }}
+ check_command check_https!'{{ values.domains }}'!/web/login
+ }
+{% else %}
+{% for domain in values.domains | default([]) %}
+define service{
+ use generic-service
+ host_name {{ host }}
+ service_description {{ name }} server {{ domain }}
+ check_command check_https!'{{ domain }}'!/web/login
+ }
+{% endfor %}
+{% endif %}
# Docker {{ name }} instance
define service{
--
GitLab