Skip to content

Commit

Permalink
fix configuration examples in separate folder (#351)
Browse files Browse the repository at this point in the history
* missing interceptors.auth things

* missing interceptors.auth things

* prefix match fix

* prefix match fix

* prefix match fix
  • Loading branch information
madsi1m authored and labkode committed Nov 6, 2019
1 parent 1d96536 commit 1713e9f
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 4 deletions.
6 changes: 6 additions & 0 deletions examples/separate/frontend-basic.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ auth_manager = "json"
[grpc.services.authprovider.auth_managers.json]
users = "./examples/separate/users.demo.json"

[grpc.interceptors.auth]
token_manager = "jwt"

[grpc.interceptors.auth.token_managers.jwt]
secret = "Pive-Fumkiu4"

[http]
enabled_services = ["ocdav", "ocs"]
enabled_middlewares = ["cors", "auth"]
Expand Down
6 changes: 6 additions & 0 deletions examples/separate/frontend-oidc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ insecure = true
client_id = "reva"
client_secret = "foobar"

[grpc.interceptors.auth]
token_manager = "jwt"

[grpc.interceptors.auth.token_managers.jwt]
secret = "Pive-Fumkiu4"

[http]
#enabled_services = ["ocdav", "ocs"] # use this if you want to use your own oidc provider.
enabled_services = ["wellknown", "oidcprovider", "ocdav", "ocs"]
Expand Down
4 changes: 2 additions & 2 deletions examples/separate/gateway.toml
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ driver = "static"
[grpc.services.storageregistry.drivers.static.rules]
# mount a home storage provider that uses a context based path wrapper
# to jail users into their home dir
"/home/" = "localhost:12000"
"/home" = "localhost:12000"
# the home storage cannot be access by fileid, because it is 'virtual'
# check the storage-home.toml. it uses the same storageid, so id based requests are routed to the next storage

# mount a storage provider without a path wrapper for direct access to files
"/oc/" = "localhost:11000"
"/oc" = "localhost:11000"
"123e4567-e89b-12d3-a456-426655440000" = "localhost:11000"

[http]
Expand Down
2 changes: 1 addition & 1 deletion examples/separate/storage-home.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ enabled_interceptors = ["auth"]
driver = "owncloud"
# the context path wrapper reads tho username from the context and prefixes the relative storage path with it
path_wrapper = "context"
mount_path = "/home/"
mount_path = "/home"
# TODO same storage id as the /oc/ storage provider
# if we have an id, we can directly go to that storage, no need to wrap paths
mount_id = "123e4567-e89b-12d3-a456-426655440000"
Expand Down
2 changes: 1 addition & 1 deletion examples/separate/storage.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ enabled_interceptors = ["auth"]
# This is a storage proider that grants direct acces to the wrapped storage
[grpc.services.storageprovider]
driver = "owncloud"
mount_path = "/oc/"
mount_path = "/oc"
mount_id = "123e4567-e89b-12d3-a456-426655440000"
# we have a locally running dataprovider
expose_data_server = true
Expand Down

0 comments on commit 1713e9f

Please sign in to comment.