diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 541b4dad4f..5c36b38193 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -7,6 +7,7 @@ - Hugo Gonzalez Labrador - Ilja Neumann - Jörn Friedrich Dreyer +- LovisaLugnegard - Michael D'Silva - Michael D'Silva - Mohitty diff --git a/examples/separate/frontend.toml b/examples/oc-phoenix/frontend.toml similarity index 61% rename from examples/separate/frontend.toml rename to examples/oc-phoenix/frontend.toml index 8aeece11f1..b91f5d4090 100644 --- a/examples/separate/frontend.toml +++ b/examples/oc-phoenix/frontend.toml @@ -67,7 +67,7 @@ chunk_folder = "/var/tmp/reva/chunks" # for eos we need to rewrite the path # TODO strip the username from the path so the CS3 namespace can be mounted # at the files/ endpoint? what about migration? separate reva instance -files_namespace = "/oc" +files_namespace = "/" # similar to the dav/files endpoint we can configure a prefix for the old webdav endpoint # we use the old webdav endpoint to present the cs3 namespace @@ -80,89 +80,4 @@ files_namespace = "/oc" # - TODO android? no sync ... but will see different tree webdav_namespace = "/home" -# options for the /ocs/v1.php/config endpoint -[http.services.ocs.config] -version = "1.8" -website = "reva" -host = "http://localhost:20080" -contact = "admin@localhost" -ssl = "false" - -# options for the /ocs/v1.php/cloud/capabilities endpoint -[http.services.ocs.capabilities.capabilities.core] -poll_interval = 60 -webdav_root = "remote.php/webdav" - -[http.services.ocs.capabilities.capabilities.core.status] -installed = true -maintenance = false -needsDbUpgrade = false -version = "10.1.0.5" -versionstring = "10.1.0" -edition = "community" -productname = "reva" -hostname = "" - -[http.services.ocs.capabilities.capabilities.checksums] -supported_types = ["SHA256"] -preferred_upload_type = "SHA256" - -[http.services.ocs.capabilities.capabilities.files] -private_links = false -bigfilechunking = false -blacklisted_files = [] -undelete = true -versioning = true - -[http.services.ocs.capabilities.capabilities.dav] -chunking = "1.0" - -[http.services.ocs.capabilities.capabilities.files_sharing] -api_enabled = true -resharing = true -group_sharing = true -auto_accept_share = true -share_with_group_members_only = true -share_with_membership_groups_only = true -default_permissions = 22 -search_min_length = 3 - -[http.services.ocs.capabilities.capabilities.files_sharing.public] -enabled = true -send_mail = true -social_share = true -upload = true -multiple = true -supports_upload_only = true - -[http.services.ocs.capabilities.capabilities.files_sharing.public.password] -enforced = true - -[http.services.ocs.capabilities.capabilities.files_sharing.public.password.enforced_for] -read_only = true -read_write = true -upload_only = true - -[http.services.ocs.capabilities.capabilities.files_sharing.public.expire_date] -enabled = true - -[http.services.ocs.capabilities.capabilities.files_sharing.user] -send_mail = true - -[http.services.ocs.capabilities.capabilities.files_sharing.user_enumeration] -enabled = true -group_members_only = true - -[http.services.ocs.capabilities.capabilities.files_sharing.federation] -outgoing = true -incoming = true - -[http.services.ocs.capabilities.capabilities.notifications] -endpoints = ["list", "get", "delete"] - -[http.services.ocs.capabilities.version] -edition = "reva" -major = 10 -minor = 1 -micro = 0 -string = "10.1.0" +[http.services.ocs] diff --git a/examples/separate/gateway.toml b/examples/oc-phoenix/gateway.toml similarity index 100% rename from examples/separate/gateway.toml rename to examples/oc-phoenix/gateway.toml diff --git a/examples/separate/phoenix.oidc.config.json b/examples/oc-phoenix/phoenix.oidc.config.json similarity index 87% rename from examples/separate/phoenix.oidc.config.json rename to examples/oc-phoenix/phoenix.oidc.config.json index 454f5661a0..95792a6ba3 100644 --- a/examples/separate/phoenix.oidc.config.json +++ b/examples/oc-phoenix/phoenix.oidc.config.json @@ -4,7 +4,6 @@ "theme": "owncloud", "version": "0.1.0", "openIdConnect": { - "metadataUrl": "http://localhost:20080/.well-known/openid-configuration", "authority": "http://localhost:20080", "client_id": "phoenix", "response_type": "code", diff --git a/examples/separate/shares.toml b/examples/oc-phoenix/shares.toml similarity index 100% rename from examples/separate/shares.toml rename to examples/oc-phoenix/shares.toml diff --git a/examples/separate/storage-home.toml b/examples/oc-phoenix/storage-home.toml similarity index 97% rename from examples/separate/storage-home.toml rename to examples/oc-phoenix/storage-home.toml index ad7f0911b2..1184d47703 100644 --- a/examples/separate/storage-home.toml +++ b/examples/oc-phoenix/storage-home.toml @@ -43,7 +43,7 @@ address = "0.0.0.0:12001" [http.services.dataprovider] driver = "owncloud" -temp_folder = "/var/tmp/" +temp_folder = "/var/tmp/reva/tmp" [http.services.dataprovider.drivers.owncloud] datadirectory = "/var/tmp/reva/data" diff --git a/examples/separate/storage-oc.toml b/examples/oc-phoenix/storage-oc.toml similarity index 96% rename from examples/separate/storage-oc.toml rename to examples/oc-phoenix/storage-oc.toml index 2ae464fe18..7774e2733b 100644 --- a/examples/separate/storage-oc.toml +++ b/examples/oc-phoenix/storage-oc.toml @@ -29,7 +29,7 @@ address = "0.0.0.0:11001" [http.services.dataprovider] driver = "owncloud" -temp_folder = "/var/tmp/" +temp_folder = "/var/tmp/reva/tmp" [http.services.dataprovider.drivers.owncloud] datadirectory = "/var/tmp/reva/data" diff --git a/examples/separate/users.demo.json b/examples/oc-phoenix/users.demo.json similarity index 100% rename from examples/separate/users.demo.json rename to examples/oc-phoenix/users.demo.json diff --git a/examples/separate/users.toml b/examples/oc-phoenix/users.toml similarity index 100% rename from examples/separate/users.toml rename to examples/oc-phoenix/users.toml