add more UWLDAP users
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
This commit is contained in:
parent
dca957d61a
commit
ae34b6b7ce
|
@ -7,12 +7,14 @@ set -ex
|
||||||
# set FQDN in /etc/hosts
|
# set FQDN in /etc/hosts
|
||||||
add_fqdn_to_hosts $(get_ip_addr $(hostname)) auth1
|
add_fqdn_to_hosts $(get_ip_addr $(hostname)) auth1
|
||||||
|
|
||||||
# I'm not sure why, but we also need to remove the hosts entry for the
|
if [ -n "$CI" ]; then
|
||||||
# container's real hostname, otherwise slapd only looks for the principal
|
# I'm not sure why, but we also need to remove the hosts entry for the
|
||||||
# ldap/<container hostname> (this is with the sasl-host option)
|
# container's real hostname, otherwise slapd only looks for the principal
|
||||||
sed -E "/\\b$(hostname)\\b/d" /etc/hosts > /tmp/hosts
|
# ldap/<container hostname> (this is with the sasl-host option)
|
||||||
cat /tmp/hosts > /etc/hosts
|
sed -E "/\\b$(hostname)\\b/d" /etc/hosts > /tmp/hosts
|
||||||
rm /tmp/hosts
|
cat /tmp/hosts > /etc/hosts
|
||||||
|
rm /tmp/hosts
|
||||||
|
fi
|
||||||
|
|
||||||
export DEBIAN_FRONTEND=noninteractive
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
apt update
|
apt update
|
||||||
|
|
|
@ -65,7 +65,7 @@ mail: exec1@uwaterloo.internal
|
||||||
dn: uid=exec2,ou=UWLDAP,dc=csclub,dc=internal
|
dn: uid=exec2,ou=UWLDAP,dc=csclub,dc=internal
|
||||||
displayName: Exec Two
|
displayName: Exec Two
|
||||||
givenName: Exec
|
givenName: Exec
|
||||||
sn: One
|
sn: Two
|
||||||
cn: Exec Two
|
cn: Exec Two
|
||||||
ou: MAT/Mathematics Computer Science
|
ou: MAT/Mathematics Computer Science
|
||||||
mailLocalAddress: exec2@uwaterloo.internal
|
mailLocalAddress: exec2@uwaterloo.internal
|
||||||
|
@ -76,3 +76,228 @@ objectClass: person
|
||||||
objectClass: top
|
objectClass: top
|
||||||
uid: exec2
|
uid: exec2
|
||||||
mail: exec2@uwaterloo.internal
|
mail: exec2@uwaterloo.internal
|
||||||
|
|
||||||
|
dn: uid=ctdalek,ou=UWLDAP,dc=csclub,dc=internal
|
||||||
|
displayName: Calum Dalek
|
||||||
|
givenName: Calum
|
||||||
|
sn: Dalek
|
||||||
|
cn: Calum Dalek
|
||||||
|
ou: MAT/Mathematics Computer Science
|
||||||
|
mailLocalAddress: ctdalek@uwaterloo.internal
|
||||||
|
objectClass: inetLocalMailRecipient
|
||||||
|
objectClass: inetOrgPerson
|
||||||
|
objectClass: organizationalPerson
|
||||||
|
objectClass: person
|
||||||
|
objectClass: top
|
||||||
|
uid: ctdalek
|
||||||
|
mail: ctdalek@uwaterloo.internal
|
||||||
|
|
||||||
|
dn: uid=regular1,ou=UWLDAP,dc=csclub,dc=internal
|
||||||
|
displayName: Regular One
|
||||||
|
givenName: Regular
|
||||||
|
sn: One
|
||||||
|
cn: Regular One
|
||||||
|
ou: MAT/Mathematics Computer Science
|
||||||
|
mailLocalAddress: regular1@uwaterloo.internal
|
||||||
|
objectClass: inetLocalMailRecipient
|
||||||
|
objectClass: inetOrgPerson
|
||||||
|
objectClass: organizationalPerson
|
||||||
|
objectClass: person
|
||||||
|
objectClass: top
|
||||||
|
uid: regular1
|
||||||
|
mail: regular1@uwaterloo.internal
|
||||||
|
|
||||||
|
dn: uid=regular2,ou=UWLDAP,dc=csclub,dc=internal
|
||||||
|
displayName: Regular Two
|
||||||
|
givenName: Regular
|
||||||
|
sn: Two
|
||||||
|
cn: Regular Two
|
||||||
|
ou: MAT/Mathematics Computer Science
|
||||||
|
mailLocalAddress: regular2@uwaterloo.internal
|
||||||
|
objectClass: inetLocalMailRecipient
|
||||||
|
objectClass: inetOrgPerson
|
||||||
|
objectClass: organizationalPerson
|
||||||
|
objectClass: person
|
||||||
|
objectClass: top
|
||||||
|
uid: regular2
|
||||||
|
mail: regular2@uwaterloo.internal
|
||||||
|
|
||||||
|
dn: uid=exec1,ou=UWLDAP,dc=csclub,dc=internal
|
||||||
|
displayName: Exec One
|
||||||
|
givenName: Exec
|
||||||
|
sn: One
|
||||||
|
cn: Exec One
|
||||||
|
ou: MAT/Mathematics Computer Science
|
||||||
|
mailLocalAddress: exec1@uwaterloo.internal
|
||||||
|
objectClass: inetLocalMailRecipient
|
||||||
|
objectClass: inetOrgPerson
|
||||||
|
objectClass: organizationalPerson
|
||||||
|
objectClass: person
|
||||||
|
objectClass: top
|
||||||
|
uid: exec1
|
||||||
|
mail: exec1@uwaterloo.internal
|
||||||
|
|
||||||
|
dn: uid=ctdalek,ou=UWLDAP,dc=csclub,dc=internal
|
||||||
|
displayName: Calum Dalek
|
||||||
|
givenName: Calum
|
||||||
|
sn: Dalek
|
||||||
|
cn: Calum Dalek
|
||||||
|
ou: MAT/Mathematics Computer Science
|
||||||
|
mailLocalAddress: ctdalek@uwaterloo.internal
|
||||||
|
objectClass: inetLocalMailRecipient
|
||||||
|
objectClass: inetOrgPerson
|
||||||
|
objectClass: organizationalPerson
|
||||||
|
objectClass: person
|
||||||
|
objectClass: top
|
||||||
|
uid: ctdalek
|
||||||
|
mail: ctdalek@uwaterloo.internal
|
||||||
|
|
||||||
|
dn: uid=regular1,ou=UWLDAP,dc=csclub,dc=internal
|
||||||
|
displayName: Regular One
|
||||||
|
givenName: Regular
|
||||||
|
sn: One
|
||||||
|
cn: Regular One
|
||||||
|
ou: MAT/Mathematics Computer Science
|
||||||
|
mailLocalAddress: regular1@uwaterloo.internal
|
||||||
|
objectClass: inetLocalMailRecipient
|
||||||
|
objectClass: inetOrgPerson
|
||||||
|
objectClass: organizationalPerson
|
||||||
|
objectClass: person
|
||||||
|
objectClass: top
|
||||||
|
uid: regular1
|
||||||
|
mail: regular1@uwaterloo.internal
|
||||||
|
|
||||||
|
dn: uid=regular2,ou=UWLDAP,dc=csclub,dc=internal
|
||||||
|
displayName: Regular Two
|
||||||
|
givenName: Regular
|
||||||
|
sn: Two
|
||||||
|
cn: Regular Two
|
||||||
|
ou: MAT/Mathematics Computer Science
|
||||||
|
mailLocalAddress: regular2@uwaterloo.internal
|
||||||
|
objectClass: inetLocalMailRecipient
|
||||||
|
objectClass: inetOrgPerson
|
||||||
|
objectClass: organizationalPerson
|
||||||
|
objectClass: person
|
||||||
|
objectClass: top
|
||||||
|
uid: regular2
|
||||||
|
mail: regular2@uwaterloo.internal
|
||||||
|
|
||||||
|
dn: uid=exec1,ou=UWLDAP,dc=csclub,dc=internal
|
||||||
|
displayName: Exec One
|
||||||
|
givenName: Exec
|
||||||
|
sn: One
|
||||||
|
cn: Exec One
|
||||||
|
ou: MAT/Mathematics Computer Science
|
||||||
|
mailLocalAddress: exec1@uwaterloo.internal
|
||||||
|
objectClass: inetLocalMailRecipient
|
||||||
|
objectClass: inetOrgPerson
|
||||||
|
objectClass: organizationalPerson
|
||||||
|
objectClass: person
|
||||||
|
objectClass: top
|
||||||
|
uid: exec1
|
||||||
|
mail: exec1@uwaterloo.internal
|
||||||
|
|
||||||
|
dn: uid=ctdalek,ou=UWLDAP,dc=csclub,dc=internal
|
||||||
|
displayName: Calum Dalek
|
||||||
|
givenName: Calum
|
||||||
|
sn: Dalek
|
||||||
|
cn: Calum Dalek
|
||||||
|
ou: MAT/Mathematics Computer Science
|
||||||
|
mailLocalAddress: ctdalek@uwaterloo.internal
|
||||||
|
objectClass: inetLocalMailRecipient
|
||||||
|
objectClass: inetOrgPerson
|
||||||
|
objectClass: organizationalPerson
|
||||||
|
objectClass: person
|
||||||
|
objectClass: top
|
||||||
|
uid: ctdalek
|
||||||
|
mail: ctdalek@uwaterloo.internal
|
||||||
|
|
||||||
|
dn: uid=regular1,ou=UWLDAP,dc=csclub,dc=internal
|
||||||
|
displayName: Regular One
|
||||||
|
givenName: Regular
|
||||||
|
sn: One
|
||||||
|
cn: Regular One
|
||||||
|
ou: MAT/Mathematics Computer Science
|
||||||
|
mailLocalAddress: regular1@uwaterloo.internal
|
||||||
|
objectClass: inetLocalMailRecipient
|
||||||
|
objectClass: inetOrgPerson
|
||||||
|
objectClass: organizationalPerson
|
||||||
|
objectClass: person
|
||||||
|
objectClass: top
|
||||||
|
uid: regular1
|
||||||
|
mail: regular1@uwaterloo.internal
|
||||||
|
|
||||||
|
dn: uid=regular2,ou=UWLDAP,dc=csclub,dc=internal
|
||||||
|
displayName: Regular Two
|
||||||
|
givenName: Regular
|
||||||
|
sn: Two
|
||||||
|
cn: Regular Two
|
||||||
|
ou: MAT/Mathematics Computer Science
|
||||||
|
mailLocalAddress: regular2@uwaterloo.internal
|
||||||
|
objectClass: inetLocalMailRecipient
|
||||||
|
objectClass: inetOrgPerson
|
||||||
|
objectClass: organizationalPerson
|
||||||
|
objectClass: person
|
||||||
|
objectClass: top
|
||||||
|
uid: regular2
|
||||||
|
mail: regular2@uwaterloo.internal
|
||||||
|
|
||||||
|
dn: uid=regular3,ou=UWLDAP,dc=csclub,dc=internal
|
||||||
|
displayName: Regular Three
|
||||||
|
givenName: Regular
|
||||||
|
sn: Three
|
||||||
|
cn: Regular Three
|
||||||
|
ou: MAT/Mathematics Computer Science
|
||||||
|
mailLocalAddress: regular3@uwaterloo.internal
|
||||||
|
objectClass: inetLocalMailRecipient
|
||||||
|
objectClass: inetOrgPerson
|
||||||
|
objectClass: organizationalPerson
|
||||||
|
objectClass: person
|
||||||
|
objectClass: top
|
||||||
|
uid: regular3
|
||||||
|
mail: regular3@uwaterloo.internal
|
||||||
|
|
||||||
|
dn: uid=exec1,ou=UWLDAP,dc=csclub,dc=internal
|
||||||
|
displayName: Exec One
|
||||||
|
givenName: Exec
|
||||||
|
sn: One
|
||||||
|
cn: Exec One
|
||||||
|
ou: MAT/Mathematics Computer Science
|
||||||
|
mailLocalAddress: exec1@uwaterloo.internal
|
||||||
|
objectClass: inetLocalMailRecipient
|
||||||
|
objectClass: inetOrgPerson
|
||||||
|
objectClass: organizationalPerson
|
||||||
|
objectClass: person
|
||||||
|
objectClass: top
|
||||||
|
uid: exec1
|
||||||
|
mail: exec1@uwaterloo.internal
|
||||||
|
|
||||||
|
dn: uid=exec2,ou=UWLDAP,dc=csclub,dc=internal
|
||||||
|
displayName: Exec Two
|
||||||
|
givenName: Exec
|
||||||
|
sn: Two
|
||||||
|
cn: Exec Two
|
||||||
|
ou: MAT/Mathematics Computer Science
|
||||||
|
mailLocalAddress: exec2@uwaterloo.internal
|
||||||
|
objectClass: inetLocalMailRecipient
|
||||||
|
objectClass: inetOrgPerson
|
||||||
|
objectClass: organizationalPerson
|
||||||
|
objectClass: person
|
||||||
|
objectClass: top
|
||||||
|
uid: exec2
|
||||||
|
mail: exec2@uwaterloo.internal
|
||||||
|
|
||||||
|
dn: uid=exec3,ou=UWLDAP,dc=csclub,dc=internal
|
||||||
|
displayName: Exec Three
|
||||||
|
givenName: Exec
|
||||||
|
sn: Three
|
||||||
|
cn: Exec Three
|
||||||
|
ou: MAT/Mathematics Computer Science
|
||||||
|
mailLocalAddress: exec3@uwaterloo.internal
|
||||||
|
objectClass: inetLocalMailRecipient
|
||||||
|
objectClass: inetOrgPerson
|
||||||
|
objectClass: organizationalPerson
|
||||||
|
objectClass: person
|
||||||
|
objectClass: top
|
||||||
|
uid: exec3
|
||||||
|
mail: exec3@uwaterloo.internal
|
||||||
|
|
|
@ -4,10 +4,10 @@ set -x
|
||||||
|
|
||||||
case $1 in
|
case $1 in
|
||||||
up)
|
up)
|
||||||
if ! [ -d venv ]; then
|
if ! [ -d venv ]; then
|
||||||
docker run --rm -v "$PWD:$PWD" -w "$PWD" python:3.7-buster \
|
docker run --rm -v "$PWD:$PWD" -w "$PWD" python:3.7-buster \
|
||||||
sh -c "python -m venv venv && . venv/bin/activate && pip install -r dev-requirements.txt && pip install -r requirements.txt"
|
sh -c "python -m venv venv && . venv/bin/activate && pip install -r dev-requirements.txt && pip install -r requirements.txt"
|
||||||
fi
|
fi
|
||||||
docker network create ceod
|
docker network create ceod
|
||||||
for host in auth1 coffee mail phosphoric-acid; do
|
for host in auth1 coffee mail phosphoric-acid; do
|
||||||
if [ $host = auth1 -o $host = coffee ]; then
|
if [ $host = auth1 -o $host = coffee ]; then
|
||||||
|
|
Loading…
Reference in New Issue