Merge pull request #40 from resposit/master

lvps · Dec 13, 2023 · 7367f6a · 7367f6a
2 parents abe6b91 + d5ee1a2
commit 7367f6a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/tasks/install_389ds.yml b/tasks/install_389ds.yml
@@ -1,8 +1,8 @@
 ---
-- include: tasks/install_389ds_EL7.yml
+- import_tasks: tasks/install_389ds_EL7.yml
   when: "ansible_facts['distribution_major_version'] | int == 7"
 
-- include: tasks/install_389ds_EL8.yml
+- import_tasks: tasks/install_389ds_EL8.yml
   when: "ansible_facts['distribution_major_version'] | int >= 8"
 
 - name: Determine installed server type (1.3.X or 1.4.X)

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -4,7 +4,7 @@
 # TODO: are nsCertFile and nsKeyFile still allowed, instead of the NSS database which is nearly impossible to handle correctly?
 # https://www.port389.org/docs/389ds/howto/howto-ssl.html
 
-- include: install_389ds.yml
+- import_tasks: install_389ds.yml
 
 - name: Check that tls_enforced makes sense
   assert:
@@ -63,17 +63,17 @@
   register: dirsrv_restart_condition_main
   when: dirsrv_listen_host != None
 
-- include: configure_authentication.yml
+- import_tasks: configure_authentication.yml
   when: not dirsrv_factory
 
-- include: configure_logging.yml
+- import_tasks: configure_logging.yml
   when: not dirsrv_factory
 
-- include: configure_plugins.yml
+- import_tasks: configure_plugins.yml
 
-- include: configure_schema.yml
+- import_tasks: configure_schema.yml
 
-- include: configure_tls.yml
+- import_tasks: configure_tls.yml
 
 # Required also to enforce TLS as TLS must be enabled beforehand (requiring a restart).
 - name: "Restart {{ dirsrv_serverid }} to enable TLS, authentication, plugins"
@@ -119,7 +119,7 @@
         (dirsrv_restart_condition_schema_reload_2 is defined and dirsrv_restart_condition_schema_reload_2.changed)\
         )"
 
-- include: configure_tls_enforcing.yml
+- import_tasks: configure_tls_enforcing.yml
 
 # This only happens if TLS is being enforced.
 - name: "Restart {{ dirsrv_serverid }} to enforce TLS"