Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update reva config #336

Merged
merged 2 commits into from
Jun 26, 2020
Merged

update reva config #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1892c9
update reva config
butonic Jun 26, 2020
bf1c342
tell data providers where to find the gateway
butonic Jun 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,18 +250,20 @@ eos-ocis-storage-home:
# configure the home storage to use the eos driver and return the mount id of the eos driver in responses
docker exec -i \
--env OCIS_LOG_LEVEL=debug \
--env REVA_STORAGE_HOME_DRIVER=eos \
--env REVA_STORAGE_HOME_MOUNT_ID=1284d238-aa92-42ce-bdc4-0b0000009158 \
--env REVA_STORAGE_HOME_DRIVER=eoshome \
--env REVA_STORAGE_HOME_MOUNT_ID=1284d238-aa92-42ce-bdc4-0b0000009154 \
eos-cli1 ocis reva-storage-home &
docker exec -i \
--env OCIS_LOG_LEVEL=debug \
--env REVA_STORAGE_HOME_DATA_DRIVER=eos \
--env REVA_STORAGE_HOME_DATA_DRIVER=eoshome \
--env REVA_GATEWAY_URL=host.docker.internal:9142 \
eos-cli1 ocis reva-storage-home-data &
docker exec -i \
--env OCIS_LOG_LEVEL=debug \
eos-cli1 ocis reva-storage-eos &
docker exec -i \
--env OCIS_LOG_LEVEL=debug \
--env REVA_GATEWAY_URL=host.docker.internal:9142 \
eos-cli1 ocis reva-storage-eos-data &

.PHONY: eos-ocis
Expand All @@ -279,6 +281,7 @@ eos-ocis:
bin/ocis reva-auth-basic & \
bin/ocis reva-auth-bearer & \
bin/ocis reva-frontend & \
bin/ocis reva-storage-public-link & \
bin/ocis reva-gateway & \
bin/ocis reva-sharing & \
bin/ocis reva-users & \
Expand All @@ -296,3 +299,8 @@ eos-clean:
eos-stop: eos-docker
./eos-docker/scripts/shutdown_services.sh

.PHONY: eos-install-go
eos-install-go:
docker exec -i eos-cli1 curl https://dl.google.com/go/go1.14.4.linux-amd64.tar.gz -O
docker exec -i eos-cli1 tar -C /usr/local -xzf go1.14.4.linux-amd64.tar.gz
# export PATH=$PATH:/usr/local/go/bin
20 changes: 12 additions & 8 deletions pkg/command/reva-storage-public-link.go → pkg/command/revastoragepubliclink.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,25 @@ import (
"github.com/owncloud/ocis/pkg/register"
)

// RevaPublicLinkStorage is the entry point for the proxy command.
func RevaPublicLinkStorage(cfg *config.Config) *cli.Command {
// RevaStoragePublicLinkCommand is the entrypoint for the reva-storage-oc command.
func RevaStoragePublicLinkCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "reva-storage-public-link",
Usage: "Start public link storage driver",
Usage: "Start reva public link storage",
Category: "Extensions",
Flags: flagset.StoragePublicLink(cfg.Reva),
Action: func(ctx *cli.Context) error {
publicStorageCmd := command.StoragePublicLink(configurePublicStorage(cfg))
return cli.HandleAction(publicStorageCmd.Action, ctx)
Action: func(c *cli.Context) error {
scfg := configureRevaStoragePublicLink(cfg)

return cli.HandleAction(
command.StoragePublicLink(scfg).Action,
c,
)
},
}
}

func configurePublicStorage(cfg *config.Config) *svcconfig.Config {
func configureRevaStoragePublicLink(cfg *config.Config) *svcconfig.Config {
cfg.Reva.Log.Level = cfg.Log.Level
cfg.Reva.Log.Pretty = cfg.Log.Pretty
cfg.Reva.Log.Color = cfg.Log.Color
Expand All @@ -34,5 +38,5 @@ func configurePublicStorage(cfg *config.Config) *svcconfig.Config {
}

func init() {
register.AddCommand(RevaPublicLinkStorage)
register.AddCommand(RevaStorageOCCommand)
}
3 changes: 1 addition & 2 deletions pkg/runtime/runtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,13 @@ var (
"reva-users",
"reva-auth-basic",
"reva-auth-bearer",
// "reva-storage-root",
"reva-storage-home",
"reva-storage-public-link",
"reva-storage-home-data",
"reva-storage-eos",
"reva-storage-eos-data",
"reva-storage-oc",
"reva-storage-oc-data",
"reva-storage-public-link",
"accounts",
"glauth",
"konnectd",
Expand Down