From f75354bb843a0744266037f0c0a6cb7dd99bb37b Mon Sep 17 00:00:00 2001 From: Ludovic Poujol Date: Thu, 16 Sep 2021 17:26:58 +0200 Subject: [PATCH] generate-ldif: detect mdadm --- CHANGELOG.md | 3 ++- generate-ldif/templates/generateldif.sh.j2 | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c952a12d..ff905a42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,8 @@ The **patch** part changes incrementally at each release. * apache: new variable for mpm mode (+ updated default config accordingly) * certbot: add script for manual deploy hooks execution * evolinux-base: install molly-guard by default -* generate-ldid: detect hardware raid card +* generate-ldif: detect hardware raid card +* generate-ldif: detect mdadm * listupgrade: crontab is configurable * mongodb: create munin plugins directory if missing * mysql: script "mysql_connections" to display a compact list of connections diff --git a/generate-ldif/templates/generateldif.sh.j2 b/generate-ldif/templates/generateldif.sh.j2 index a90a2b03..e0463078 100755 --- a/generate-ldif/templates/generateldif.sh.j2 +++ b/generate-ldif/templates/generateldif.sh.j2 @@ -583,10 +583,27 @@ objectClass: EvoService ServiceName: postgresql ipServicePort: 5432 ServiceType: database -ServiceVersion: PostgreSQL ${elasticsearch_version} +ServiceVersion: PostgreSQL ${postgresql_version} EOT fi +# mdadm +if is_pkg_installed mdadm; then + mdadm_version=$(get_pkg_version mdadm) +fi +if [ -n "${mdadm_version}" ]; then + cat <> "${ldif_file}" + +dn: ServiceName=mdadm,${computer_dn} +NagiosEnabled: TRUE +objectClass: EvoService +ServiceName: mdadm +ServiceType: raid +ServiceVersion: mdadm ${mdadm_version} +EOT +fi + + # test if we have a stdout if [ -t 1 ]; then echo "Output is in ${ldif_file}"