Skip to content

Commit

Permalink
Update config files
Browse files Browse the repository at this point in the history
  • Loading branch information
williamleven committed May 23, 2019
1 parent 0117182 commit 5a55c09
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 89 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ RUN apk add --update git
# Copy sources
RUN mkdir -p /goldapps
COPY . /goldapps
WORKDIR /goldapps/cmd
WORKDIR /goldapps/cmd/goldapps

# Grab dependencies
#RUN go get -d -v ./...

# build binary
RUN go install -v
RUN mkdir /app && mv $GOPATH/bin/cmd /app/goldapps
RUN mkdir /app && mv $GOPATH/bin/goldapps /app/goldapps

##########################
# PRODUCTION STAGE #
Expand Down
64 changes: 0 additions & 64 deletions chalmers.it.config.toml

This file was deleted.

50 changes: 30 additions & 20 deletions example.config.toml
Original file line number Diff line number Diff line change
@@ -1,31 +1,41 @@
[gapps.consumer]
servicekeyfile = "gapps1.json"
adminaccount = "admin@example1.ex"
servicekeyfile = "gapps.json"
adminaccount = "admin@mydomain.ex"

[gapps.provider]
servicekeyfile = "gapps2.json"
adminaccount = "admin@example2.ex"
servicekeyfile = "gapps.json"
adminaccount = "admin@mydomain.ex"

[ldap]
url = "ldap.example.ex:999"
servername = "example.ex"
user = "cn=god,dc=example,dc=ex"
password = "secret"
custom = ["my_custom_filter"]
url = "ldap.mydomain.ex:636"
servername = "mydomain.ex"
user = "cn=admin,dc=mydomain,dc=ex"
password = "PASSWORD"
custom = ["fkit", "kit"]

[ldap.groups]
basedn = "ou=some,ou=groups,dc=example,dc=ex"
filter = "(&(objectClass=Group))"
attributes = ["cn", "displayName", "mail", "member"]
basedn = "ou=groups,dc=mydomain,dc=ex"
filter = "(|(objectClass=itGroup)(objectClass=itPosition))"
attibutes = ["cn", "displayName", "mail", "member"]

[ldap.users]
basedn = "ou=people,dc=example,dc=ex"
filter = "(&(objectClass=Group))"
attributes = ["uid", "mail"]
basedn = "ou=people,dc=mydomain,dc=ex"
filter = "(&(objectClass=chalmersstudent))"
attibutes = ["uid", "mail"]

[ldap.my_custom_filter]
mail = "[email protected]"
basedn = "ou=groups,dc=chalmers,dc=it"
filter = "(&(objectClass=Group))"
#### CUSTOM FILTERS ####
[ldap.fkit]
mail = "[email protected]"
basedn = "ou=fkit,ou=groups,dc=mydomain,dc=ex"
filter = "(&(objectClass=itGroup))"
parent_filter = "(&(ou=%childRDN%))"
attributes = ["cn", "displayName", "mail"]
attibutes = ["cn", "displayName", "mail"]


[ldap.kit]
mail = "[email protected]"
basedn = "ou=fkit,ou=groups,dc=mydomain,dc=ex"
filter = "(&(objectClass=itGroup)(type=Committee))"
parent_filter = "(&(ou=%childRDN%))"
attibutes = ["cn", "displayName", "mail"]
#### ============== ####
6 changes: 3 additions & 3 deletions prod.docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ services:
"-dry"
]
volumes:
- ./cmd/config.toml:/app/config.toml:ro
- ./cmd/gapps.json:/app/gapps.json:ro
- ./cmd/additions.json:/app/additions.json:ro
- ./config.toml:/app/config.toml:ro
- ./gapps.json:/app/gapps.json:ro
- ./additions.json:/app/additions.json:ro
environment:
- WAIT=1h

0 comments on commit 5a55c09

Please sign in to comment.