From 5227becd13dd87db5cc80278ff9d586d2be576fd Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 7 Nov 2018 13:30:14 +0100 Subject: [PATCH 1/3] Fix for issue #24 and #22 --- meta/main.yml | 1 + tasks/configure_ldap.yml | 2 +- tasks/install_ldap.yml | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index dce6ead..f7f6fa2 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -8,6 +8,7 @@ galaxy_info: versions: - 5 - 6 + - 7 - name: Fedora versions: - 16 diff --git a/tasks/configure_ldap.yml b/tasks/configure_ldap.yml index 12929d6..28b7cd8 100644 --- a/tasks/configure_ldap.yml +++ b/tasks/configure_ldap.yml @@ -44,4 +44,4 @@ register: result - name: add the base domain - shell: ldapadd -x -D "cn=Manager,dc={{ openldap_server_domain_name.split('.')[0] }},dc={{ openldap_server_domain_name.split('.')[1] }}" -w {{ openldap_server_rootpw }} -f {{ result.dest|default(result.path) }} && touch {{ openldap_server_app_path }}/rootdn_created creates={{ openldap_server_app_path }}/rootdn_created + shell: ldapadd -x -h localhost -D "cn=Manager,dc={{ openldap_server_domain_name.split('.')[0] }},dc={{ openldap_server_domain_name.split('.')[1] }}" -w {{ openldap_server_rootpw }} -f {{ result.dest|default(result.path) }} && touch {{ openldap_server_app_path }}/rootdn_created creates={{ openldap_server_app_path }}/rootdn_created diff --git a/tasks/install_ldap.yml b/tasks/install_ldap.yml index c2aba5e..62a9979 100644 --- a/tasks/install_ldap.yml +++ b/tasks/install_ldap.yml @@ -5,13 +5,13 @@ - name: Install the openldap and required Packages for RedHat yum: name={{ item }} state=installed - with_items: openldap_server_pkgs + with_items: "{{ openldap_server_pkgs }}" when: ansible_os_family == 'RedHat' - name: Install the openldap and required Packages for Ubuntu apt: name={{ item }} state=installed update_cache=yes - with_items: openldap_server_pkgs + with_items: "{{ openldap_server_pkgs }}" environment: env when: ansible_os_family == 'Debian' From 440c7d3bc065269760b50dd6ee1c2a1aaf0b205f Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 7 Nov 2018 13:36:00 +0100 Subject: [PATCH 2/3] Fixed preview of examples --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 081cbe1..d90244a 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,7 @@ Examples openldap_server_rootpw: passme openldap_server_enable_ssl: false + 2) Configure an OpenLDAP server with SSL: - hosts: all @@ -66,5 +67,3 @@ Author Information ------------------ Benno Joy - - From 25dae0248ae8b1c0a363b55110fa843424aa6ef7 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 7 Nov 2018 13:37:47 +0100 Subject: [PATCH 3/3] Fixed readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d90244a..342ae85 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ them are as follows: Examples -------- -1) Configure an OpenLDAP server without SSL: +Configure an OpenLDAP server without SSL: - hosts: all sudo: true @@ -39,7 +39,7 @@ Examples openldap_server_enable_ssl: false -2) Configure an OpenLDAP server with SSL: +Configure an OpenLDAP server with SSL: - hosts: all sudo: true