From 9cbe5733c895e3f1655807581584746ca926411c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20G=C3=B6tz?= Date: Thu, 18 Apr 2019 00:16:03 +0200 Subject: [PATCH] Fix wrong user rdn, Fix ldap image collision, Fix inkonsistent docker start --- docker-compose.yml | 6 +++--- docker/lama/dev.env | 6 +----- docker/ldap/data/var/openldap-data/data.mdb | Bin 417792 -> 417792 bytes docker/ldap/data/var/openldap-data/lock.mdb | Bin 8192 -> 8192 bytes docker/traefik/traefik.toml | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 931a19b..3b21c02 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ networks: ldap_net: internal: true frontend_net: - external: false + external: true services: @@ -43,7 +43,7 @@ services: - docker/lama/dev.env ldap: - image: docker.clkl.de/ldap/ladap:0.1 + image: docker.clkl.de/ldap/ldap:0.1-lama build: context: docker/ldap dockerfile: Dockerfile.ldap @@ -54,7 +54,7 @@ services: - ldap_net ldap_admin: - image: docker.clkl.de/ldap/admin:0.1 + image: docker.clkl.de/ldap/admin:0.1-lama build: context: docker/ldap dockerfile: Dockerfile.admin diff --git a/docker/lama/dev.env b/docker/lama/dev.env index 1a047bf..e8782d6 100644 --- a/docker/lama/dev.env +++ b/docker/lama/dev.env @@ -19,16 +19,12 @@ LDAP_ADMIN_USER_NAME=cn=admin,dc=test,dc=de LDAP_ADMIN_USER_PASSWORD=secret LDAP_USER_ENTRY=dc=test,dc=de -LDAP_USER_SELECTOR=(cn=%(user)s) +LDAP_USER_SELECTOR=(uid=%(user)s) LDAP_GROUP_ENTRY=dc=test,dc=de LDAP_GROUP_SELECTOR=(objectClass=groupOfNames) LDAP_GROUP_NAME_ATTR=cn EMAIL_BACKEND=file -#EMAIL_HOST=smtp.uni-bamberg.de -#EMAIL_PORT=587 -#EMAIL_USE_TLS=False -#EMAIL_USE_SSL=False DEFAULT_FROM_EMAIL= SERVER_EMAIL= diff --git a/docker/ldap/data/var/openldap-data/data.mdb b/docker/ldap/data/var/openldap-data/data.mdb index 8e6b0480359cb15b5b46600ced7f658fd730e1ad..4bd60d4f6b82c2b6804e0f937399050cc5633b79 100644 GIT binary patch delta 11691 zcmeHNdr(x@89(Pf_5r)xMO2UqED<9bSoh^VL?bJp$V1)+H|@w{F&aT0f-!~)%w$^r za2lA~w3r64V1%OgB4rj>w$JO(b9HlP?3y!T02Bk>S%?j zWDgHoUX%EfU`m#(O>klxg?!_+I%vV=Mmf-zAoBQ(m-{MyDSuqj z-Ba1xd8EGaNK*&s2%o){S9!3!`iB{wjB3Y$=1{4vrlzyKBE#2F*;&$jytHud0eAa} zsv1{8u*=?B-&*Y0d${Cuv#)WV)3vAeSW%b9o!^;XbnNAq3W`1LEk}z3?#|l0Qb+Yc zr?bHus&M9oY65M|E_eRn=B;*n)V#RuZf_72)gK2h<8OGroOt>?Hvcx4--jIC+#1yT z8_pF^hFZNshI+Y!U4~zt41V-rBUsPoU=y7KT7Y_09e_-FTQ8Whm) z#)Mr-4OGgyLbgFJ$j~FptZ3sh^m4A%9a%qXVTzqh{DQsYBqH3XSN_4?;$^L{Orw>q zL!JCl=>{}$lP?kR6MA>bDFq+MO?lhp)IHB5yQtHf@%%WPcApLJIJ*PYZ{!QNs*^^9 zLD1QBqBAShxU6M;D0*3ci2E$y7x^RUJU${LPzjRoX9{$JeDEv$0bnWJcR?Y(K2O%y-{m=2r%zwosUJ})I$qxjJU~6ToKAf#u zs1EYHt@{0h4XabZ5V&QYjh!)0>xaO5Vn1HivejD6O_|WA>2P~^6@N`9X%SAMB%RJJ zm-HD>?E#o%o`;Yqpwk89-&cgtr#fAKPc>en>OuuICon{Ik)H@U9zN|UYT4J|w*||0 zXH=ALb32_K$8A-os+``gnvPcjU8h=I!P8}J{#Li^WMjzj%AT67O{MkjqX%9++*;f0 zZ?0_Xa31sLm9;gWb_H$6%9`C3owd!uJuNN4#*&8WQ=7cD2nu3*<#0xuD^j=FJs!6Y z4QBI&F{P*_eOvlZ{^-JfZ;R}{r6FPsBH(U;! z<1e2#S@~x0C6Wfjn)ox~e(@RcOJPEITexMKF+Bv^EDr_})g6l_ekyJuKO@S!Z;I71 zmnY-wtH$|B^Ef|kIH${utrg!hziuXT`v`FC3AL0MTHQ9k%jNUR75^&KY$TE0-9~c5 zQ>B^Qhy|MJ5>mlH+(6t_X+Wx#tkO)}P+YT|X03?~{|dG}GHlC2(7|ZPM#=+d0T|6- zG-N66u*t|YH_P?c5|KfIR+x#drwNH@MuJK4>@wp!0=kqcBnDojka>`nOzm0P5oT%Y z=ygVWG*$&bu`<^KXh0v8S_= zEC0v)sdPN<*dOG(A-G`(wcHToky&W65^BF%v9`fX12kM3+@)W{^l~(&XH%ITY*gmb zxPo=!G)WF2OW(DowEZS)&ZU7@jixx?i`=SV$WamAS8Z3~Ngo(5ED(p}}qx z4B?mtf}7c-Z=jRPCcTsnBU>c*WVL!8*lI0komt<7t0j@@X>UQcgLQcV$e42PbacALlJ^>}@9Ab%f; zb`a6sVo{W54+tg;GEEArk#(9&<*w>5eD>>#3Cu-XWyUCoRbG!j#44|+c3E3u&*B(g z#3Dw{405}74Vo<%g|}AW5Qg3RF-#5HY7aJmB&d-pU-2o>ET8c2!{?*^k6@yVw*Oj+ z&@Mu2ismmeRYVt*Z%lN<7gSCoG4x!ChJ4F`OFcg_t}dru!NM={)mBUmaS-m^)EM3n za^UkQ|02wQE_C#USOwG3=tY>9#=xCG|B{w|$%re?USyMu1%~$d*$XTSXELJC)vQL( z{bV&fHXH(QxNsC898-6={0@iBwaw#oFAzJOHmA$$^v#Pkg%c?~%gv-bgf{(JS6n!J zvB9n$8|=t5$E{U!EoL>|<-$r27W_9dR+54Ka7Ij<7lgl0NBX;_B}Huy2nr+@$}M|L$fS|dP)og+urk2eqmpP#kQC)Qimaz9LyKF zkJR0LqJ}Z-$S8A?DAg$jt1kC$A)+iTM3kz9h<4z>n;37wiMU1Ss3&xm7Y4pGz?<)J zVt#a9G+9=!0#l|b8bDY9!2g@9|Gfa<6er)xJ(ZG#ESl3~?|15ccj#0>?nUqxQe#ai6hmOGl zy6jcZ=>8$;0WP8#?|68bcXRGPlLu;OZn}sK;}} zL-lUFMlSHko-t)eq3no9QcYb+44qWFfc@t3T}jzldYTo zd^a2}8L@n3#_~@;fXFZN>>*;lr6N9vE^)w5{*jt=rxQqdPIL_OXfZ=bK-x7l~uJLGNib^55@ zOLU{5H{|7qto4LFS?s5dtCyg3g!OTgv<=U?F)oN6K?~X2hkk&bMJv%l^Qp5Wu575a z#$@CcHt)24BczJ{T+uHYv_p)yh;g47@QD6hMzlVk_Kgso%2!E&J39}9hN0ExgO`3h zLh{}DLfB0;pCcbU#>Xr2;W1it4d-iNF|i^hCNz2tm%NqnMzl#?=srsqMo@orzQMli z3>0pjrktEvm7{~79XtqGEogc6frYT8k6@v#4{h4;4jN~A(bQ?(3A*1Fa$Ex`sIw}b-reh;;vMpR%LXUV-v)K-Cf6BS$s%OI5p zNTvIlFtSCoae#!Ng6eeD8_P6@u}o#_nZ zs5B=DUe^`hc3+wAQ`(V{o=SDA_u$WSRT1|7YSoGt5<(3!Gvg(woUZGKEg{i|GB_)E zwB^$H7pDmR6DeS}egr2lZFr2x9i3{x7X3D8QKUvatw-%?S1e15&9YXgx`(*G@EsC&Opkoj_blm znG2_NNl8vj$wEgLFuh#P(dws*o8y-xzh4cYA*VKrHy1Ap71-iQQ3ZHg}{aFcV>5Tx9UOW9E0>MqWLBy7Bai=Ut9$w zlY7P2g)PhUQhg8?aC>gTK`u4bKJ9P0eTGq(+h?=Kwjyqq^(H&~A23+$Z?Ku^hX_e$ zFgJhZ(oVII1~4=4K$A2(QGd_Dy-pphv%F1V1>XRBY?|y6N_>bO;!>+EFQjKJh0F01 zb&^RE{j}F6Wu|Re?O-%@$>210cP*yNFW@ysdsm3=Iqg_!{A1}opJiTsk|?S_fRf&% zAYD_4#@yAjOv;T^)y8VeYhv-53cC02VDUzu)wvb%_u1Xg>zsyKNyYrlO=czdWj_IJ z27RQ*4?;dwuVJ}p4Tl?hR%aVzM=sl{ZaV2 zG~LcT1mhQj7QYyr&M%VxoBVq&6aiKn5P5FySo)0BP8eunrNaZi#36VX1)-k&Cho~WR0SMU-zOW!c10PVkmJ;sj`1yE$Xop^@cH;h$! z`Nu?|D~It~c*uNZ7@vb1(rKrN*lRhRHejs@4bGrU^#V!%cbs`4tsBN$;9>KXQs-Bk z48@Ryd|4z9lN9B@vFU@c^_C8^Il$vWpV>bCgL94p6D;b$bQaZ!X{;Z*Zh+^{MR+vu5; zR7qD2NiDF=e0xX&VD0H)=|QL7B$njZUWC@em}fM1$UW#f;b_I{nSZc~eyP`0YqiZJ zCoC$l*O2jHxR_U@Up_Qhkaiw!n5Qwt&_7BVry!^xs+yGS+9wz_* delta 89 zcmZp0XmFUIC~!NA&$*s~VFHvEo@l7SyZRL`SPV>0TqrfMfrF2e0RmpE0!dDMsD&bU P3uMa1hw}0hH*f<0^Q#;Q diff --git a/docker/traefik/traefik.toml b/docker/traefik/traefik.toml index 7400dbf..2fdcea1 100644 --- a/docker/traefik/traefik.toml +++ b/docker/traefik/traefik.toml @@ -1,6 +1,6 @@ debug = false logLevel = "WARN" -defaultEntryPoints = ["https", "http"] +defaultEntryPoints = ["http"] [api]