diff --git a/CHANGELOG.md b/CHANGELOG.md index 52fa0a8a..4228d173 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ The **patch** part changes is incremented if multiple releases happen the same m ### Fixed * Repair keepalived role +* generate-ldif: Correct generated entries for php-fpm in containers ### Removed diff --git a/generate-ldif/templates/generateldif.sh.j2 b/generate-ldif/templates/generateldif.sh.j2 index cfae731c..86bfc0eb 100755 --- a/generate-ldif/templates/generateldif.sh.j2 +++ b/generate-ldif/templates/generateldif.sh.j2 @@ -608,11 +608,11 @@ if is_pkg_installed lxc; then if lxc-ls | grep -q php56 ; then cat <> "${ldif_file}" -dn: ServiceName=ServiceName=php-fpm56,${computer_dn} +dn: ServiceName=php-fpm56,${computer_dn} NagiosEnabled: TRUE ipServiceProtocol: tcp objectClass: EvoService -ServiceName: PHP-FPM (multiphp) +ServiceName: php-fpm56 ipServicePort: 443 ServiceType: web ServiceVersion: PHP-FPM 5.6 (multiphp) @@ -622,11 +622,11 @@ fi if lxc-ls | grep -q php70 ; then cat <> "${ldif_file}" -dn: ServiceName=ServiceName=php-fpm70,${computer_dn} +dn: ServiceName=php-fpm70,${computer_dn} NagiosEnabled: TRUE ipServiceProtocol: tcp objectClass: EvoService -ServiceName: PHP-FPM (multiphp) +ServiceName: php-fpm70 ipServicePort: 443 ServiceType: web ServiceVersion: PHP-FPM 7.0 (multiphp) @@ -636,11 +636,11 @@ fi if lxc-ls | grep -q php73 ; then cat <> "${ldif_file}" -dn: ServiceName=ServiceName=php-fpm73,${computer_dn} +dn: ServiceName=php-fpm73,${computer_dn} NagiosEnabled: TRUE ipServiceProtocol: tcp objectClass: EvoService -ServiceName: PHP-FPM (multiphp) +ServiceName: php-fpm73 ipServicePort: 443 ServiceType: web ServiceVersion: PHP-FPM 7.3 (multiphp) @@ -650,11 +650,11 @@ fi if lxc-ls | grep -q php74 ; then cat <> "${ldif_file}" -dn: ServiceName=ServiceName=php-fpm74,${computer_dn} +dn: ServiceName=php-fpm74,${computer_dn} NagiosEnabled: TRUE ipServiceProtocol: tcp objectClass: EvoService -ServiceName: PHP-FPM (multiphp) +ServiceName: php-fpm74 ipServicePort: 443 ServiceType: web ServiceVersion: PHP-FPM 7.4 (multiphp) @@ -664,11 +664,11 @@ fi if lxc-ls | grep -q php80 ; then cat <> "${ldif_file}" -dn: ServiceName=ServiceName=php-fpm80,${computer_dn} +dn: ServiceName=php-fpm80,${computer_dn} NagiosEnabled: TRUE ipServiceProtocol: tcp objectClass: EvoService -ServiceName: PHP-FPM (multiphp) +ServiceName: php-fpm80 ipServicePort: 443 ServiceType: web ServiceVersion: PHP-FPM 8.0 (multiphp) @@ -678,11 +678,11 @@ fi if lxc-ls | grep -q php81 ; then cat <> "${ldif_file}" -dn: ServiceName=ServiceName=php-fpm81,${computer_dn} +dn: ServiceName=php-fpm81,${computer_dn} NagiosEnabled: TRUE ipServiceProtocol: tcp objectClass: EvoService -ServiceName: PHP-FPM (multiphp) +ServiceName: php-fpm81 ipServicePort: 443 ServiceType: web ServiceVersion: PHP-FPM 8.1 (multiphp)