diff --git a/.drone.star b/.drone.star index 459fb85f48..4e76e385e4 100644 --- a/.drone.star +++ b/.drone.star @@ -1693,7 +1693,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = # TODO: redis is not yet supported "STORAGE_USERS_DRIVER_OWNCLOUDSQL_REDIS_ADDR": "redis:6379", # ownCloudSQL sharing driver - "STORAGE_SHARING_USER_DRIVER": "oc10-sql", + "STORAGE_SHARING_USER_DRIVER": "owncloudsql", "STORAGE_SHARING_USER_SQL_USERNAME": "owncloud", "STORAGE_SHARING_USER_SQL_PASSWORD": "owncloud", "STORAGE_SHARING_USER_SQL_HOST": "oc10-db", diff --git a/deployments/examples/oc10_ocis_parallel/docker-compose.yml b/deployments/examples/oc10_ocis_parallel/docker-compose.yml index 4538ba147d..edd065c6c3 100644 --- a/deployments/examples/oc10_ocis_parallel/docker-compose.yml +++ b/deployments/examples/oc10_ocis_parallel/docker-compose.yml @@ -97,7 +97,7 @@ services: STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBNAME: owncloud STORAGE_USERS_DRIVER_OWNCLOUDSQL_REDIS_ADDR: redis:6379 # TODO: redis is not yet supported # ownCloudSQL sharing driver - STORAGE_SHARING_USER_DRIVER: oc10-sql + STORAGE_SHARING_USER_DRIVER: owncloudsql STORAGE_SHARING_USER_SQL_USERNAME: owncloud STORAGE_SHARING_USER_SQL_PASSWORD: owncloud STORAGE_SHARING_USER_SQL_HOST: oc10-db diff --git a/extensions/storage/pkg/command/sharing.go b/extensions/storage/pkg/command/sharing.go index f472e362d0..274eda3423 100644 --- a/extensions/storage/pkg/command/sharing.go +++ b/extensions/storage/pkg/command/sharing.go @@ -134,7 +134,7 @@ func sharingConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]inte "enable_expired_shares_cleanup": cfg.Reva.Sharing.PublicEnableExpiredSharesCleanup, "janitor_run_interval": cfg.Reva.Sharing.PublicJanitorRunInterval, }, - "oc10-sql": map[string]interface{}{ + "owncloudsql": map[string]interface{}{ "gateway_addr": cfg.Reva.Gateway.Endpoint, "storage_mount_id": cfg.Reva.Sharing.UserStorageMountID, "db_username": cfg.Reva.Sharing.UserSQLUsername, @@ -169,7 +169,7 @@ func sharingConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]inte "enable_expired_shares_cleanup": cfg.Reva.Sharing.PublicEnableExpiredSharesCleanup, "janitor_run_interval": cfg.Reva.Sharing.PublicJanitorRunInterval, }, - "oc10-sql": map[string]interface{}{ + "owncloudsql": map[string]interface{}{ "gateway_addr": cfg.Reva.Gateway.Endpoint, "storage_mount_id": cfg.Reva.Sharing.UserStorageMountID, "db_username": cfg.Reva.Sharing.UserSQLUsername,