Skip to content

Commit

Permalink
Merge pull request #14 from NkolasN/feature/replace-Gerrit-variables-…
Browse files Browse the repository at this point in the history
…with-GitLab

replaced Gerrit variables with GitLab ones
  • Loading branch information
dsingh07 authored Nov 1, 2018
2 parents 6673c16 + 3d04945 commit b3adbb3
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ MAINTAINER Darren Jackson, <darren.a.jackson>
# This is to be able to use a custom entrypoint and perform all needed settings

ENV INITIAL_ADMIN_USER admin.user
ENV INITIAL_ADMIN_PASSWORD="" GERRIT_PASSWORD="" JENKINS_PASSWORD=""
ENV INITIAL_ADMIN_PASSWORD="" GITLAB_PASSWORD="" JENKINS_PASSWORD=""
ENV SLAPD_PASSWORD=""
ENV SLAPD_DOMAIN ldap.example.com
ENV SLAPD_FULL_DOMAIN "dc=ldap,dc=example,dc=com"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Runtime configuration can be provided using environment variables:
This image enforces password policies for ldap users to include password ageing and failures. There are two policies added in this image -

* **default** : Default policy is applied to all the accounts which haven't got _pwdPolicySubentry_ operational attribute.
* **service-users** : This policy is applied to service accounts like jenkins, gerrit and nexus.
* **service-users** : This policy is applied to service accounts like Jenkins, GitLab and Nexus.

**Note** : Password policies also include the password complexity using password checker module and following rules are applied -

Expand Down
2 changes: 1 addition & 1 deletion resources/ldifs/service-users.ldif
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ changetype: modify
add: pwdPolicySubentry
pwdPolicySubentry: cn=service-users,ou=policies,${SLAPD_FULL_DOMAIN}

dn: cn=gerrit,ou=people,${SLAPD_FULL_DOMAIN}
dn: cn=gitlab,ou=people,${SLAPD_FULL_DOMAIN}
changetype: modify
add: pwdPolicySubentry
pwdPolicySubentry: cn=service-users,ou=policies,${SLAPD_FULL_DOMAIN}
Expand Down
16 changes: 8 additions & 8 deletions resources/ldifs/structure.ldif
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ objectClass: organizationalUnit
objectClass: top
ou: people

dn: cn=gerrit,ou=people,${SLAPD_FULL_DOMAIN}
dn: cn=gitlab,ou=people,${SLAPD_FULL_DOMAIN}
objectClass: inetOrgPerson
objectClass: organizationalPerson
objectClass: person
objectClass: top
cn: gerrit
displayName: gerrit
givenName: gerrit
mail: gerrit@${SLAPD_DOMAIN}
sn: gerrit
uid: gerrit
userPassword:: ${GERRIT_PASSWORD}
cn: gitlab
displayName: gitlab
givenName: gitlab
mail: gitlab@${SLAPD_DOMAIN}
sn: gitlab
uid: gitlab
userPassword:: ${GITLAB_PASSWORD}

dn: cn=jenkins,ou=people,${SLAPD_FULL_DOMAIN}
objectClass: inetOrgPerson
Expand Down

0 comments on commit b3adbb3

Please sign in to comment.