diff --git a/CHANGELOG b/CHANGELOG
index c36f70a..9c23b4d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - base: fix shell configuration, increase $HISTSIZE, and change history alias so it displays full history
 - nagios-nrpe : handle the case where cached_mem is in GB to convert it in MB in check_free_mem.sh
+- post-install : improve management of ldif file for ldap
 
 ### Removed
 
diff --git a/evolixisation.yml b/evolixisation.yml
index c93ccdd..edd31be 100644
--- a/evolixisation.yml
+++ b/evolixisation.yml
@@ -17,6 +17,10 @@
     - vars/evolix-main.yml
     - vars/evolinux-secrets.yml
 
+  vars:
+    client_number: "XXX"
+    monitoring_mode: "everytime"
+
   roles:
     - etc-git
     - base
diff --git a/roles/post-install/defaults/main.yml b/roles/post-install/defaults/main.yml
new file mode 100644
index 0000000..773a5e2
--- /dev/null
+++ b/roles/post-install/defaults/main.yml
@@ -0,0 +1,5 @@
+---
+general_scripts_dir: "/usr/share/scripts"
+
+client_number: XXX
+monitoring_mode: "everytime"
diff --git a/roles/post-install/tasks/ldif.yml b/roles/post-install/tasks/ldif.yml
index 4247fc4..09e65eb 100644
--- a/roles/post-install/tasks/ldif.yml
+++ b/roles/post-install/tasks/ldif.yml
@@ -1,5 +1,23 @@
 ---
-- name: Generate ldif for LDAP
-  script: ldap.sh
-  args:
-    creates: "/root/*.ldif"
+- name: "copy generateldif.sh"
+  template:
+    src: templates/generateldif.sh.j2
+    dest: '{{ general_scripts_dir }}/generateldif.sh'
+    owner: root
+    group: root
+    mode: "0750"
+
+- name: run generateldif
+  command: '{{ general_scripts_dir }}/generateldif.sh'
+  register: generateldif_run
+  changed_when: False
+  failed_when: False
+  check_mode: no
+  tags:
+    - generateldif-exec
+
+- debug:
+    var: generateldif_run.stdout_lines
+    verbosity: 1
+  tags:
+    - generateldif-exec
diff --git a/roles/post-install/files/ldap.sh b/roles/post-install/template/generateldif.sh.j2
similarity index 97%
rename from roles/post-install/files/ldap.sh
rename to roles/post-install/template/generateldif.sh.j2
index 4e7ebea..ade6ba9 100755
--- a/roles/post-install/files/ldap.sh
+++ b/roles/post-install/template/generateldif.sh.j2
@@ -9,7 +9,8 @@ computerKernel=$(sysctl kern.osrelease | sed 's#kern.osrelease=##')
 computerOS="OpenBSD $computerKernel"
 HardwareSerial=$(sysctl hw.serialno 2>/dev/null | sed 's#hw.serialno=##')
 if [ -z $HardwareSerial ]; then sysctl hw | grep -qi qemu && HardwareSerial="Not Specified"; fi
-clientNumber="XXX"
+clientNumber="{{ client_number | mandatory }}"
+monitoringMode="{{ monitoring_mode | mandatory }}"
 cpuMark=$(sysctl hw.model| sed 's#hw.model=##')
 cpuModel=$(sysctl hw.model| sed 's#hw.model=##')
 cpuFreq=$(sysctl hw.cpuspeed| sed 's#hw.cpuspeed=##')
@@ -51,7 +52,7 @@ computerOS: $computerOS
 computerKernel: $computerKernel
 isActive: TRUE
 NagiosEnabled: TRUE
-NagiosComments: icmp,everytime,10
+NagiosComments: icmp,${monitoringMode},10
 HardwareSerial: $HardwareSerial
 clientNumber: $clientNumber