From 7fb6fe097582a715b1a329e9e74f86ca5d6122ce Mon Sep 17 00:00:00 2001 From: Ludovico Pavesi Date: Thu, 3 Jun 2021 01:23:43 +0200 Subject: [PATCH] Fix lint, ignore invalid role name --- .ansible-lint | 2 ++ defaults/main.yml | 2 ++ molecule/backwards_compatibility/converge.yml | 3 +-- molecule/default/converge.yml | 3 +-- molecule/other_features/converge.yml | 3 +-- molecule/tls/converge.yml | 3 +-- tasks/configure_authentication.yml | 1 + 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.ansible-lint b/.ansible-lint index ff3d85e..305e7f3 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -1,3 +1,5 @@ +--- skip_list: - 106 - 503 + - 'role-name' # Cannot start with a number, which is unfortunate for a software named 389DS diff --git a/defaults/main.yml b/defaults/main.yml index 4edcb78..dae1a24 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -16,6 +16,8 @@ dirsrv_server_uri: "ldap://localhost:{{ dirsrv_port }}" dirsrv_install_examples: false dirsrv_install_additional_ldif: [] +# Cannot use /tmp, see https://github.com/lvps/389ds-server/issues/18 +dirsrv_install_additional_ldif_dir: "/var/lib/dirsrv/slapd-{{ dirsrv_serverid }}/ldif" # Logging diff --git a/molecule/backwards_compatibility/converge.yml b/molecule/backwards_compatibility/converge.yml index ac7cef6..444fdcb 100644 --- a/molecule/backwards_compatibility/converge.yml +++ b/molecule/backwards_compatibility/converge.yml @@ -61,8 +61,7 @@ force: true roles: - - - role: 389ds-server + - role: lvps.389ds_server tasks: - name: Ensure we can access the server, for testing diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index b03fc65..1bd8902 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -56,8 +56,7 @@ force: true roles: - - - role: 389ds-server + - role: lvps.389ds_server tasks: - name: Ensure we can access the server, for testing diff --git a/molecule/other_features/converge.yml b/molecule/other_features/converge.yml index dfd3553..df57246 100644 --- a/molecule/other_features/converge.yml +++ b/molecule/other_features/converge.yml @@ -78,8 +78,7 @@ force: true roles: - - - role: 389ds-server + - role: lvps.389ds_server tasks: - name: Ensure container entries exist, for testing diff --git a/molecule/tls/converge.yml b/molecule/tls/converge.yml index 9c7ac9e..513f8c2 100644 --- a/molecule/tls/converge.yml +++ b/molecule/tls/converge.yml @@ -70,8 +70,7 @@ dirsrv_tls_minssf: "{%if ansible_facts['distribution_major_version'] | int == 8 %}128{% else %}256{% endif %}" roles: - - - role: 389ds-server + - role: lvps.389ds_server tasks: - name: Ensure we can access the server, for testing diff --git a/tasks/configure_authentication.yml b/tasks/configure_authentication.yml index 6caf8b6..6afbfe3 100644 --- a/tasks/configure_authentication.yml +++ b/tasks/configure_authentication.yml @@ -74,6 +74,7 @@ # With 389DS version 1.4.X the option to delete this attribute to reset it to the default value has been removed. # Instead, we have to set it to "DEFAULT" (case sensitive). - name: Normalize password storage scheme + no_log: true # Could be logged but ansible-lint complains as it detects the word "password" set_fact: dirsrv_normalized_password_storage_scheme: >- {% if not dirsrv_legacy and dirsrv_password_storage_scheme == [] %}DEFAULT{% else %}{{ dirsrv_password_storage_scheme }}{% endif %}