From 6ae2c34e8fbedb2f77a64b9529cc48797dbd625a Mon Sep 17 00:00:00 2001 From: Felix Lombard-Platet Date: Tue, 7 Feb 2017 17:36:24 -0500 Subject: [PATCH 1/5] added new conf for simple auth --- defaults/main.yml | 3 +++ files/groovy/setup_ldap.groovy | 9 ++++++++- tasks/setup_ldap_each.yml | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index bfc9b8d..eaf4125 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -27,6 +27,9 @@ ldap_connections: [] # ldap_protocol: 'ldaps' # ldap or ldaps # ldap_hostname: 'ldap.mycompany.com' # ldap_port: 636 +# ldap_auth: 'simple' +# ldap_auth_username: 'username' (or DN) +# ldap_auth_password: 'password' # ldap_search_base: 'dc=mycompany,dc=net' # ldap_user_base_dn: 'ou=users' # ldap_user_object_class: 'inetOrgPerson' diff --git a/files/groovy/setup_ldap.groovy b/files/groovy/setup_ldap.groovy index 6d24a84..6f3f4fb 100644 --- a/files/groovy/setup_ldap.groovy +++ b/files/groovy/setup_ldap.groovy @@ -26,7 +26,14 @@ ldapConfig.setName(parsed_args.name) // Connection connection = new Connection() connection.setHost(new Connection.Host(Connection.Protocol.valueOf(parsed_args.protocol), parsed_args.hostname, Integer.valueOf(parsed_args.port))) -connection.setAuthScheme("none") +if(parsed_args.auth != null && parsed_args.auth.equals("simple")){ + connection.setAuthScheme("simple") + connection.setSystemUsername(parsed_args.username) + connection.setSystemPassword(parsed_args.password) +} +else { + connection.setAuthScheme("none") +} connection.setSearchBase(parsed_args.search_base) connection.setConnectionTimeout(30) connection.setConnectionRetryDelay(300) diff --git a/tasks/setup_ldap_each.yml b/tasks/setup_ldap_each.yml index 656ce0d..c61c745 100644 --- a/tasks/setup_ldap_each.yml +++ b/tasks/setup_ldap_each.yml @@ -7,6 +7,9 @@ protocol: "{{ item.ldap_protocol }}" hostname: "{{ item.ldap_hostname }}" port: "{{ item.ldap_port }}" + auth: "{{ item.ldap_auth }}" + username: "{{ item.ldap_auth_username }}" + password: "{{ item.ldap_auth_password }}" search_base: "{{ item.ldap_search_base }}" user_base_dn: "{{ item.ldap_user_base_dn }}" user_object_class: "{{ item.ldap_user_object_class }}" From 1c08701c5fd1184a5b4b100e91c43f9c54aa7540 Mon Sep 17 00:00:00 2001 From: Felix Lombard-Platet Date: Tue, 7 Feb 2017 18:10:23 -0500 Subject: [PATCH 2/5] fixed potential future bug when none ldap auth --- defaults/main.yml | 6 +++--- tasks/setup_ldap_each.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index eaf4125..056963c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -27,9 +27,9 @@ ldap_connections: [] # ldap_protocol: 'ldaps' # ldap or ldaps # ldap_hostname: 'ldap.mycompany.com' # ldap_port: 636 -# ldap_auth: 'simple' -# ldap_auth_username: 'username' (or DN) -# ldap_auth_password: 'password' +# ldap_auth: 'simple' or 'none' +# ldap_auth_username: 'username' (or DN) (optional) +# ldap_auth_password: 'password' (optional) # ldap_search_base: 'dc=mycompany,dc=net' # ldap_user_base_dn: 'ou=users' # ldap_user_object_class: 'inetOrgPerson' diff --git a/tasks/setup_ldap_each.yml b/tasks/setup_ldap_each.yml index c61c745..b6a3774 100644 --- a/tasks/setup_ldap_each.yml +++ b/tasks/setup_ldap_each.yml @@ -7,9 +7,9 @@ protocol: "{{ item.ldap_protocol }}" hostname: "{{ item.ldap_hostname }}" port: "{{ item.ldap_port }}" - auth: "{{ item.ldap_auth }}" - username: "{{ item.ldap_auth_username }}" - password: "{{ item.ldap_auth_password }}" + auth: "{{ item.ldap_auth | default('none') }}" + username: "{{ item.ldap_auth_username | default('') }}" + password: "{{ item.ldap_auth_password | default('') }}" search_base: "{{ item.ldap_search_base }}" user_base_dn: "{{ item.ldap_user_base_dn }}" user_object_class: "{{ item.ldap_user_object_class }}" From 2ad1a04263a9dd1e5c1ac9e38b6df6305cf88949 Mon Sep 17 00:00:00 2001 From: chrislevi Date: Wed, 10 May 2017 14:34:08 +0300 Subject: [PATCH 3/5] docker group members fixes #11 --- defaults/main.yml | 12 +++++++++--- files/groovy/create_repo_docker_group.groovy | 5 +---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index c160d31..0840671 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -22,6 +22,9 @@ nexus_backup_log: '/var/log/nexus-backup.log' # Nexus default properties nexus_default_port: 8081 +nexus_docker_hosted_port: 9080 +nexus_docker_proxy_port: 9081 +nexus_docker_group_port: 9082 nexus_default_context_path: '/' nexus_admin_password: 'changeme' # Note : admin password change subsequent to first-time install is *not implemented* yet @@ -232,12 +235,12 @@ _nexus_repos_docker_defaults: nexus_repos_docker_hosted: - name: docker-hosted - http_port: 9080 + http_port: "{{ nexus_docker_hosted_port }}" v1_enabled: True nexus_repos_docker_proxy: - name: docker-proxy - http_port: 9081 + http_port: "{{ nexus_docker_proxy_port }}" v1_enabled: True index_type: "HUB" proxy_url: "https://registry-1.docker.io" @@ -245,8 +248,11 @@ nexus_repos_docker_proxy: nexus_repos_docker_group: - name: docker-group - http_port: 9082 + http_port: "{{ nexus_docker_group_port }}" v1_enabled: True + member_repos: + - docker-hosted + - docker-proxy # RubyGems support _nexus_repos_rubygems_defaults: diff --git a/files/groovy/create_repo_docker_group.groovy b/files/groovy/create_repo_docker_group.groovy index ab2a1ba..6b144a2 100644 --- a/files/groovy/create_repo_docker_group.groovy +++ b/files/groovy/create_repo_docker_group.groovy @@ -13,10 +13,7 @@ configuration = new Configuration( v1Enabled : parsed_args.v1_enabled ], group: [ - memberNames: [ - "private-registry", - "proxy-registry" - ] + memberNames: parsed_args.member_repos ], storage: [ writePolicy: parsed_args.write_policy.toUpperCase(), From 995170e3924cc810f781b37130443ac57f2a5552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Herv=C3=A9?= Date: Wed, 10 May 2017 09:09:47 -0400 Subject: [PATCH 4/5] Bumped default Nexus version to latest 3.3.1-01 release --- defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 0840671..d4d365b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,5 @@ --- -nexus_version: '3.3.0-01' +nexus_version: '3.3.1-01' nexus_package: "nexus-{{ nexus_version }}-unix.tar.gz" nexus_download_dir: '/tmp' nexus_backup_dir: '/var/nexus-backup' From 85189f0800c318f82a5bf29c2d4f9848514578e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Herv=C3=A9?= Date: Wed, 10 May 2017 09:10:31 -0400 Subject: [PATCH 5/5] Fixed #12 : pom.xml is using wrong path for *.groovy files --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 923f8d4..eab49ae 100644 --- a/pom.xml +++ b/pom.xml @@ -10,10 +10,10 @@ Fake project meant to be imported in an IDE (IntelliJ) to edit groovy scripts with classpath-aware completion - 3.0.2-02 + 3.3.1-01 - templates/groovy + files/groovy