Skip to content

Commit bceb4de

Browse files
unidevelunidevel
committed
Fix centos7-oj8-openldap
1 parent af12215 commit bceb4de

5 files changed

Lines changed: 20 additions & 12 deletions

File tree

‎bin/test.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function retry() {
2121
}
2222

2323
function environment_compose() {
24-
docker-compose -f "${DOCKER_CONF_LOCATION}/${ENVIRONMENT}/docker-compose.yml" "$@"
24+
docker compose -f "${DOCKER_CONF_LOCATION}/${ENVIRONMENT}/docker-compose.yml" "$@"
2525
}
2626

2727
function run_in_hadoop_master_container() {
@@ -116,7 +116,7 @@ fi
116116
shift 1
117117

118118
# check docker and docker compose installation
119-
docker-compose version
119+
docker compose version
120120
docker version
121121

122122
stop_all_containers

‎prestodb/centos7-oj8-openldap/Dockerfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,17 @@ RUN yum -y install openldap openldap-clients openldap-servers openssl && \
2121
# Configure openldap
2222
ldapmodify -Y EXTERNAL -H ldapi:/// -f /etc/openldap/setup/modify_server.ldif && \
2323
ldapmodify -Y EXTERNAL -H ldapi:/// -f /etc/openldap/setup/ldap_disable_bind_anon.ldif && \
24+
ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/corba.ldif && \
25+
ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/cosine.ldif && \
26+
ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/duaconf.ldif && \
27+
ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/dyngroup.ldif && \
28+
ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/inetorgperson.ldif && \
29+
ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/java.ldif && \
30+
ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/misc.ldif && \
31+
ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/nis.ldif && \
32+
ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/openldap.ldif && \
33+
ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/ppolicy.ldif && \
34+
ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/collective.ldif && \
2435
ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/setup/memberof.ldif && \
2536
ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/setup/refint.ldif && \
2637
ldapadd -f /etc/openldap/setup/createOU.ldif -D cn=admin,dc=presto,dc=testldap,dc=com -w admin && \
@@ -60,4 +71,6 @@ RUN yum -y install openldap openldap-clients openldap-servers openssl && \
6071
# Cleanup
6172
yum -y clean all && rm -rf /tmp/* /var/tmp/*
6273

74+
EXPOSE 389 636
75+
6376
CMD supervisord -c /etc/supervisord.conf

‎prestodb/centos7-oj8-openldap/files/etc/openldap/setup/ldap_disable_bind_anon.ldif‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
dn: cn=config
2-
changetype: modify
3-
add: olcDisallows
4-
olcDisallows: bind_anon
1+
#dn: cn=config
2+
#changetype: modify
3+
#add: olcDisallows
4+
#olcDisallows: bind_anon
55

66
dn: cn=config
77
changetype: modify

‎prestodb/centos7-oj8-openldap/files/etc/openldap/setup/memberof.ldif‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ objectClass: olcModuleList
55
olcModuleLoad: memberof.la
66
olcModulePath: /usr/lib64/openldap
77

8-
dn: cn=manager,cn=schema,cn=config
9-
objectClass: olcSchemaConfig
10-
cn: manager
11-
olcAttributeTypes: ( 2.5.4.70 NAME 'manager' SUP distinguishedName )
12-
138
dn: olcOverlay={0}memberof,olcDatabase={2}hdb,cn=config
149
objectClass: olcConfig
1510
objectClass: olcMemberOf

‎prestodb/centos7-oj8-openldap/files/etc/supervisord.d/slapd.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[program:slapd]
2-
command=/usr/bin/pidproxy /var/run/openldap/slapd.pid /usr/sbin/slapd -d 1 -F /etc/openldap/slapd.d/ -h 'ldaps://0.0.0.0:636 ldap://0.0.0.0:389'
2+
command=/usr/bin/pidproxy /var/run/openldap/slapd.pid /usr/sbin/slapd -d 1 -F /etc/openldap/slapd.d/ -h 'ldaps://0.0.0.0:636 ldap://0.0.0.0:389 ldapi:///'
33
startsecs=2
44
stopwaitsecs=10
55
startretries=30

0 commit comments

Comments
 (0)