Commit Graph
511 Commits
Author SHA1 Message Date
Bertrand Gouny 56311f1869 Merge branch 'asacamano-patch-1' into release-1.1.10 2017-10-04 17:08:13 +02:00
asacamano 9cd74a6a23 Let ldapmodify and ldapadd use the same auth
I think this fixes https://github.com/osixia/docker-openldap/issues/139
2017-10-04 06:49:39 -06:00
Bertrand Gouny 071a5b8404 Merge remote-tracking branch 'origin/stable' into release-1.1.10 2017-09-28 15:45:43 +02:00
Osixia! 464f554241 Merge pull request #144 from Jonher937/indentation
Formatting of readme + spelling
2017-09-28 15:45:06 +02:00
Jonathan Herlin 709fd4cb94 Spelling error
Change "beacause" to "because"
2017-09-28 15:37:37 +02:00
Jonathan Herlin 7fdd2b7372 Formatting of readme
Indentation fix
2017-09-28 14:56:00 +02:00
Bertrand Gouny d1e78fdef1 not time lmit for admin 2017-09-25 11:52:30 +02:00
Bertrand Gouny 3e86e1d1d4 v1.1.10 2017-09-23 18:50:36 +02:00
Bertrand Gouny 66d7d7fba2 Merge branch 'stable' into release-1.1.10 2017-09-23 18:49:56 +02:00
Bertrand Gouny a16b2303ec [twgit] Init release 'release-1.1.10'. 2017-09-23 18:48:26 +02:00
Osixia! 3900e78904 Merge pull request #137 from mrtnsn/patch-1
Fixed readme heading
2017-08-24 11:13:43 +02:00
Christoffer Martinsen 7dee970ee6 Fixed readme heading 2017-08-24 09:29:58 +02:00
Osixia! 2c080c1025 Update CHANGELOG.md 2017-08-06 11:33:04 +02:00
Bertrand Gouny aee872140c Merge branch 'hotfix-1.1.9' into stable v1.1.9 2017-07-19 22:26:10 +02:00
Bertrand Gouny 5b560b2234 Makefile 2017-07-19 22:25:22 +02:00
Bertrand Gouny ad82829add add custom ldif dir 2017-07-19 14:27:13 +02:00
Bertrand Gouny d11265c859 Merge branch 'bersace-ldapadd' into hotfix-1.1.9 2017-07-19 13:54:05 +02:00
Bertrand Gouny dc5fbb9de6 Merge branch 'ldapadd' of https://github.com/bersace/docker-openldap into bersace-ldapadd 2017-07-19 13:53:42 +02:00
Bertrand Gouny 6353a84f97 fix ldap ssl client with KEEP_EXISTING_CONFIG 2017-07-19 13:51:48 +02:00
Étienne BERSAC 536e918530 Document bootstrap seeding 2017-07-19 08:36:11 +02:00
Étienne BERSAC 752ac6d7f9 Use ldapadd to load ldif without changetype 2017-07-19 07:58:17 +02:00
Bertrand Gouny 990b9c6dba update example with new variables and fix docker-compose 2017-07-18 11:34:25 +02:00
Bertrand Gouny 13ac8533ff ldap debug with trace loglevel 2017-07-18 11:05:53 +02:00
Bertrand Gouny d537ba1ded remove debug ls 2017-07-18 10:37:10 +02:00
Bertrand Gouny 55ff5d6ed8 Merge branch 'bersace-sasl' into hotfix-1.1.9 2017-07-13 16:37:46 +02:00
Étienne BERSAC 7958ccceb6 Install libsasl2 modules 2017-07-13 16:27:26 +02:00
Bertrand Gouny c221c1cfb2 KEEP_EXISTING_CONFIG 2017-07-12 15:05:44 +02:00
Bertrand Gouny a3f7fb31ed RFC2307bis schema 2017-07-11 12:15:56 +02:00
Bertrand Gouny d25b09366d Makefile 2017-07-06 17:07:42 +02:00
Bertrand Gouny 54eccded1a osixia/light-baseimage:1.1.0 2017-07-05 17:39:39 +02:00
Bertrand Gouny 6748d12677 openldap 2.4.44 2017-07-05 10:34:24 +02:00
Bertrand Gouny c61ac55c6e light-baseimage:1.1.0 (debian stretch) 2017-07-05 09:35:56 +02:00
osixia d7ab83243f Update README.md 2017-05-23 10:38:05 +02:00
osixia c6d76bfbdb Update README.md 2017-05-23 10:36:18 +02:00
Bertrand Gouny a433ca7b52 Merge branch 'fir4-cibats' into hotfix-1.1.9 2017-05-23 10:31:57 +02:00
Bertrand Gouny 8c171142a1 Merge branch 'cibats' of https://github.com/fir4/docker-openldap into fir4-cibats 2017-05-23 10:29:44 +02:00
Bertrand Gouny 6387bd3045 Merge branch 'xueshanf-patch-1' into hotfix-1.1.9 2017-05-23 10:22:49 +02:00
Bertrand Gouny 7a9a5e0f87 v1.1.9 2017-05-23 10:08:13 +02:00
Bertrand Gouny d43a62dc1a [twgit] Init hotfix 'hotfix-1.1.9'. 2017-05-23 10:03:24 +02:00
Xueshan Feng 5d52900185 Fix chmod to make it work on MacOS as well.
This should fix #43.
2017-05-22 17:43:48 -07:00
osixia 1bc98e68a8 Update README.md 2017-03-26 12:55:48 +02:00
osixia 1d79dae771 Merge pull request #117 from timelot/patch-1
ports 636:636 instead of 639:639
2017-03-01 16:50:10 +01:00
timelot 5384c257c3 ports 636:636 instead of 639:639 2017-03-01 15:59:40 +01:00
osixia 318ab23b8d Merge pull request #115 from Anton-Latukha/stable
README.md - change deprecated '-h' to now favoured '-H ldap://'
2017-02-25 16:09:18 +01:00
Anton-Latukha 52e22d813a README.md - change deprecated -h to now favoured -H ldap:// 2017-02-25 01:20:36 +02:00
osixia ae213fc9b6 Merge pull request #113 from Anton-Latukha/stable
small rephrase of README.md TLS section
2017-02-24 22:17:47 +01:00
Anton Latukha 3d9522f422 phrasing TLS sentence in README.md
This way I think text is less rigid.
2017-02-24 21:39:29 +02:00
Anton Latukha cd933384ad fix small typo 2017-02-24 21:34:16 +02:00
osixia 0a15ed79df Merge pull request #111 from ngpestelos/patch-1
Fix typo (README.md)
2017-02-22 10:23:06 +01:00
Nestor G Pestelos Jr 98f5f1b984 Fix typo (README.md) 2017-02-22 06:50:29 +08:00