From 3c87a0d0dcc822ae53b65edd1878e5e1f18ab5a6 Mon Sep 17 00:00:00 2001 From: emyarod Date: Sun, 8 Jan 2017 21:09:19 -0800 Subject: [PATCH] Update remote docs to show correct setup process --- docs/content/amazonclouddrive.md | 34 ++++++++------ docs/content/b2.md | 22 +++++---- docs/content/crypt.md | 2 +- docs/content/drive.md | 30 ++++++------ docs/content/dropbox.md | 26 ++++++----- docs/content/googlecloudstorage.md | 75 +++++++++++++++--------------- docs/content/hubic.md | 28 +++++------ docs/content/onedrive.md | 52 +++++++++++---------- docs/content/s3.md | 51 +++++++++++++------- docs/content/swift.md | 43 +++++++++-------- docs/content/yandex.md | 28 +++++------ 11 files changed, 216 insertions(+), 175 deletions(-) diff --git a/docs/content/amazonclouddrive.md b/docs/content/amazonclouddrive.md index f553a26cf..973d2fd04 100644 --- a/docs/content/amazonclouddrive.md +++ b/docs/content/amazonclouddrive.md @@ -31,40 +31,48 @@ Type of storage to configure. Choose a number from below, or type in your own value 1 / Amazon Drive \ "amazon cloud drive" - 2 / Amazon S3 (also Dreamhost, Ceph) + 2 / Amazon S3 (also Dreamhost, Ceph, Minio) \ "s3" 3 / Backblaze B2 \ "b2" 4 / Dropbox \ "dropbox" - 5 / Google Cloud Storage (this is not Google Drive) + 5 / Encrypt/Decrypt a remote + \ "crypt" + 6 / Google Cloud Storage (this is not Google Drive) \ "google cloud storage" - 6 / Google Drive + 7 / Google Drive \ "drive" - 7 / Hubic + 8 / Hubic \ "hubic" - 8 / Local Disk + 9 / Local Disk \ "local" - 9 / Microsoft OneDrive +10 / Microsoft OneDrive \ "onedrive" -10 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH) +11 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH) \ "swift" -11 / Yandex Disk +12 / Yandex Disk \ "yandex" Storage> 1 Amazon Application Client Id - leave blank normally. -client_id> +client_id> Amazon Application Client Secret - leave blank normally. -client_secret> +client_secret> Remote config +Use auto config? + * Say Y if not sure + * Say N if you are working on a remote or headless machine +y) Yes +n) No +y/n> y If your browser doesn't open automatically go to the following link: http://127.0.0.1:53682/auth Log in and authorize rclone for access Waiting for code... Got code -------------------- [remote] -client_id = -client_secret = +client_id = +client_secret = token = {"access_token":"xxxxxxxxxxxxxxxxxxxxxxx","token_type":"bearer","refresh_token":"xxxxxxxxxxxxxxxxxx","expiry":"2015-09-06T16:07:39.658438471+01:00"} -------------------- y) Yes this is OK @@ -173,7 +181,7 @@ larger than this will fail. At the time of writing (Jan 2016) is in the area of 50GB per file. This means that larger files are likely to fail. -Unfortunatly there is no way for rclone to see that this failure is +Unfortunatly there is no way for rclone to see that this failure is because of file size, so it will retry the operation, as any other failure. To avoid this problem, use `--max-size 50000M` option to limit the maximum size of uploaded files. Note that `--max-size` does not split diff --git a/docs/content/b2.md b/docs/content/b2.md index bb4a1800b..5008f08a1 100644 --- a/docs/content/b2.md +++ b/docs/content/b2.md @@ -30,25 +30,27 @@ Type of storage to configure. Choose a number from below, or type in your own value 1 / Amazon Drive \ "amazon cloud drive" - 2 / Amazon S3 (also Dreamhost, Ceph) + 2 / Amazon S3 (also Dreamhost, Ceph, Minio) \ "s3" 3 / Backblaze B2 \ "b2" 4 / Dropbox \ "dropbox" - 5 / Google Cloud Storage (this is not Google Drive) + 5 / Encrypt/Decrypt a remote + \ "crypt" + 6 / Google Cloud Storage (this is not Google Drive) \ "google cloud storage" - 6 / Google Drive + 7 / Google Drive \ "drive" - 7 / Hubic + 8 / Hubic \ "hubic" - 8 / Local Disk + 9 / Local Disk \ "local" - 9 / Microsoft OneDrive +10 / Microsoft OneDrive \ "onedrive" -10 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH) +11 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH) \ "swift" -11 / Yandex Disk +12 / Yandex Disk \ "yandex" Storage> 3 Account ID @@ -56,13 +58,13 @@ account> 123456789abc Application Key key> 0123456789abcdef0123456789abcdef0123456789 Endpoint for the service - leave blank normally. -endpoint> +endpoint> Remote config -------------------- [remote] account = 123456789abc key = 0123456789abcdef0123456789abcdef0123456789 -endpoint = +endpoint = -------------------- y) Yes this is OK e) Edit this remote diff --git a/docs/content/crypt.md b/docs/content/crypt.md index 1901d3bd2..58aa6d9f1 100644 --- a/docs/content/crypt.md +++ b/docs/content/crypt.md @@ -61,7 +61,7 @@ Choose a number from below, or type in your own value Storage> 5 Remote to encrypt/decrypt. Normally should contain a ':' and a path, eg "myremote:path/to/dir", -"myremote:bucket" or "myremote:" +"myremote:bucket" or maybe "myremote:" (not recommended). remote> remote:path How to encrypt the filenames. Choose a number from below, or type in your own value diff --git a/docs/content/drive.md b/docs/content/drive.md index e38276507..c0728f52d 100644 --- a/docs/content/drive.md +++ b/docs/content/drive.md @@ -31,31 +31,33 @@ Type of storage to configure. Choose a number from below, or type in your own value 1 / Amazon Drive \ "amazon cloud drive" - 2 / Amazon S3 (also Dreamhost, Ceph) + 2 / Amazon S3 (also Dreamhost, Ceph, Minio) \ "s3" 3 / Backblaze B2 \ "b2" 4 / Dropbox \ "dropbox" - 5 / Google Cloud Storage (this is not Google Drive) + 5 / Encrypt/Decrypt a remote + \ "crypt" + 6 / Google Cloud Storage (this is not Google Drive) \ "google cloud storage" - 6 / Google Drive + 7 / Google Drive \ "drive" - 7 / Hubic + 8 / Hubic \ "hubic" - 8 / Local Disk + 9 / Local Disk \ "local" - 9 / Microsoft OneDrive +10 / Microsoft OneDrive \ "onedrive" -10 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH) +11 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH) \ "swift" -11 / Yandex Disk +12 / Yandex Disk \ "yandex" -Storage> 6 +Storage> 7 Google Application Client Id - leave blank normally. -client_id> +client_id> Google Application Client Secret - leave blank normally. -client_secret> +client_secret> Remote config Use auto config? * Say Y if not sure @@ -69,8 +71,8 @@ Waiting for code... Got code -------------------- [remote] -client_id = -client_secret = +client_id = +client_secret = token = {"AccessToken":"xxxx.x.xxxxx_xxxxxxxxxxx_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx","RefreshToken":"1/xxxxxxxxxxxxxxxx_xxxxxxxxxxxxxxxxxxxxxxxxxx","Expiry":"2014-03-16T13:57:58.955387075Z","Extra":null} -------------------- y) Yes this is OK @@ -186,7 +188,7 @@ Here are the possible extensions with their corresponding mime types. | epub | application/epub+zip | E-book format | | html | text/html | An HTML Document | | jpg | image/jpeg | A JPEG Image File | -| odp | application/vnd.oasis.opendocument.presentation | Openoffice Presentation | +| odp | application/vnd.oasis.opendocument.presentation | Openoffice Presentation | | ods | application/vnd.oasis.opendocument.spreadsheet | Openoffice Spreadsheet | | ods | application/x-vnd.oasis.opendocument.spreadsheet | Openoffice Spreadsheet | | odt | application/vnd.oasis.opendocument.text | Openoffice Document | diff --git a/docs/content/dropbox.md b/docs/content/dropbox.md index 2ac2d3824..f29f193c2 100644 --- a/docs/content/dropbox.md +++ b/docs/content/dropbox.md @@ -32,39 +32,41 @@ Type of storage to configure. Choose a number from below, or type in your own value 1 / Amazon Drive \ "amazon cloud drive" - 2 / Amazon S3 (also Dreamhost, Ceph) + 2 / Amazon S3 (also Dreamhost, Ceph, Minio) \ "s3" 3 / Backblaze B2 \ "b2" 4 / Dropbox \ "dropbox" - 5 / Google Cloud Storage (this is not Google Drive) + 5 / Encrypt/Decrypt a remote + \ "crypt" + 6 / Google Cloud Storage (this is not Google Drive) \ "google cloud storage" - 6 / Google Drive + 7 / Google Drive \ "drive" - 7 / Hubic + 8 / Hubic \ "hubic" - 8 / Local Disk + 9 / Local Disk \ "local" - 9 / Microsoft OneDrive +10 / Microsoft OneDrive \ "onedrive" -10 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH) +11 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH) \ "swift" -11 / Yandex Disk +12 / Yandex Disk \ "yandex" Storage> 4 Dropbox App Key - leave blank normally. -app_key> +app_key> Dropbox App Secret - leave blank normally. -app_secret> +app_secret> Remote config Please visit: https://www.dropbox.com/1/oauth2/authorize?client_id=XXXXXXXXXXXXXXX&response_type=code Enter the code: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX_XXXXXXXXXX -------------------- [remote] -app_key = -app_secret = +app_key = +app_secret = token = XXXXXXXXXXXXXXXXXXXXXXXXXXXXX_XXXX_XXXXXXXXXXXXXXXXXXXXXXXXXXXXX -------------------- y) Yes this is OK diff --git a/docs/content/googlecloudstorage.md b/docs/content/googlecloudstorage.md index dd4fd35f9..e8f90d24f 100644 --- a/docs/content/googlecloudstorage.md +++ b/docs/content/googlecloudstorage.md @@ -30,65 +30,66 @@ Type of storage to configure. Choose a number from below, or type in your own value 1 / Amazon Drive \ "amazon cloud drive" - 2 / Amazon S3 (also Dreamhost, Ceph) + 2 / Amazon S3 (also Dreamhost, Ceph, Minio) \ "s3" 3 / Backblaze B2 \ "b2" 4 / Dropbox \ "dropbox" - 5 / Google Cloud Storage (this is not Google Drive) + 5 / Encrypt/Decrypt a remote + \ "crypt" + 6 / Google Cloud Storage (this is not Google Drive) \ "google cloud storage" - 6 / Google Drive + 7 / Google Drive \ "drive" - 7 / Hubic + 8 / Hubic \ "hubic" - 8 / Local Disk + 9 / Local Disk \ "local" - 9 / Microsoft OneDrive +10 / Microsoft OneDrive \ "onedrive" -10 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH) +11 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH) \ "swift" -11 / Yandex Disk +12 / Yandex Disk \ "yandex" -Storage> 5 +Storage> 6 Google Application Client Id - leave blank normally. -client_id> +client_id> Google Application Client Secret - leave blank normally. -client_secret> +client_secret> Project number optional - needed only for list/create/delete buckets - see your developer console. project_number> 12345678 Service Account Credentials JSON file path - needed only if you want use SA instead of interactive login. -service_account_file> +service_account_file> Access Control List for new objects. Choose a number from below, or type in your own value - * Object owner gets OWNER access, and all Authenticated Users get READER access. - 1) authenticatedRead - * Object owner gets OWNER access, and project team owners get OWNER access. - 2) bucketOwnerFullControl - * Object owner gets OWNER access, and project team owners get READER access. - 3) bucketOwnerRead - * Object owner gets OWNER access [default if left blank]. - 4) private - * Object owner gets OWNER access, and project team members get access according to their roles. - 5) projectPrivate - * Object owner gets OWNER access, and all Users get READER access. - 6) publicRead + 1 / Object owner gets OWNER access, and all Authenticated Users get READER access. + \ "authenticatedRead" + 2 / Object owner gets OWNER access, and project team owners get OWNER access. + \ "bucketOwnerFullControl" + 3 / Object owner gets OWNER access, and project team owners get READER access. + \ "bucketOwnerRead" + 4 / Object owner gets OWNER access [default if left blank]. + \ "private" + 5 / Object owner gets OWNER access, and project team members get access according to their roles. + \ "projectPrivate" + 6 / Object owner gets OWNER access, and all Users get READER access. + \ "publicRead" object_acl> 4 Access Control List for new buckets. Choose a number from below, or type in your own value - * Project team owners get OWNER access, and all Authenticated Users get READER access. - 1) authenticatedRead - * Project team owners get OWNER access [default if left blank]. - 2) private - * Project team members get access according to their roles. - 3) projectPrivate - * Project team owners get OWNER access, and all Users get READER access. - 4) publicRead - * Project team owners get OWNER access, and all Users get WRITER access. - 5) publicReadWrite + 1 / Project team owners get OWNER access, and all Authenticated Users get READER access. + \ "authenticatedRead" + 2 / Project team owners get OWNER access [default if left blank]. + \ "private" + 3 / Project team members get access according to their roles. + \ "projectPrivate" + 4 / Project team owners get OWNER access, and all Users get READER access. + \ "publicRead" + 5 / Project team owners get OWNER access, and all Users get WRITER access. + \ "publicReadWrite" bucket_acl> 2 Remote config -Remote config Use auto config? * Say Y if not sure * Say N if you are working on a remote or headless machine or Y didn't work @@ -102,8 +103,8 @@ Got code -------------------- [remote] type = google cloud storage -client_id = -client_secret = +client_id = +client_secret = token = {"AccessToken":"xxxx.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx","RefreshToken":"x/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_xxxxxxxxx","Expiry":"2014-07-17T20:49:14.929208288+01:00","Extra":null} project_number = 12345678 object_acl = private diff --git a/docs/content/hubic.md b/docs/content/hubic.md index 29ade0420..216cb6f44 100644 --- a/docs/content/hubic.md +++ b/docs/content/hubic.md @@ -30,31 +30,33 @@ Type of storage to configure. Choose a number from below, or type in your own value 1 / Amazon Drive \ "amazon cloud drive" - 2 / Amazon S3 (also Dreamhost, Ceph) + 2 / Amazon S3 (also Dreamhost, Ceph, Minio) \ "s3" 3 / Backblaze B2 \ "b2" 4 / Dropbox \ "dropbox" - 5 / Google Cloud Storage (this is not Google Drive) + 5 / Encrypt/Decrypt a remote + \ "crypt" + 6 / Google Cloud Storage (this is not Google Drive) \ "google cloud storage" - 6 / Google Drive + 7 / Google Drive \ "drive" - 7 / Hubic + 8 / Hubic \ "hubic" - 8 / Local Disk + 9 / Local Disk \ "local" - 9 / Microsoft OneDrive +10 / Microsoft OneDrive \ "onedrive" -10 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH) +11 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH) \ "swift" -11 / Yandex Disk +12 / Yandex Disk \ "yandex" -Storage> 7 +Storage> 8 Hubic Client Id - leave blank normally. -client_id> +client_id> Hubic Client Secret - leave blank normally. -client_secret> +client_secret> Remote config Use auto config? * Say Y if not sure @@ -68,8 +70,8 @@ Waiting for code... Got code -------------------- [remote] -client_id = -client_secret = +client_id = +client_secret = token = {"access_token":"XXXXXX"} -------------------- y) Yes this is OK diff --git a/docs/content/onedrive.md b/docs/content/onedrive.md index 844aa31f7..846434590 100644 --- a/docs/content/onedrive.md +++ b/docs/content/onedrive.md @@ -1,17 +1,17 @@ --- -title: "Microsoft One Drive" -description: "Rclone docs for Microsoft One Drive" +title: "Microsoft OneDrive" +description: "Rclone docs for Microsoft OneDrive" date: "2015-10-14" --- - Microsoft One Drive + Microsoft OneDrive ----------------------------------------- Paths are specified as `remote:path` Paths may be as deep as required, eg `remote:directory/subdirectory`. -The initial setup for One Drive involves getting a token from +The initial setup for OneDrive involves getting a token from Microsoft which you need to do in your browser. `rclone config` walks you through it. @@ -31,31 +31,33 @@ Type of storage to configure. Choose a number from below, or type in your own value 1 / Amazon Drive \ "amazon cloud drive" - 2 / Amazon S3 (also Dreamhost, Ceph) + 2 / Amazon S3 (also Dreamhost, Ceph, Minio) \ "s3" 3 / Backblaze B2 \ "b2" 4 / Dropbox \ "dropbox" - 5 / Google Cloud Storage (this is not Google Drive) + 5 / Encrypt/Decrypt a remote + \ "crypt" + 6 / Google Cloud Storage (this is not Google Drive) \ "google cloud storage" - 6 / Google Drive + 7 / Google Drive \ "drive" - 7 / Hubic + 8 / Hubic \ "hubic" - 8 / Local Disk + 9 / Local Disk \ "local" - 9 / Microsoft OneDrive +10 / Microsoft OneDrive \ "onedrive" -10 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH) +11 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH) \ "swift" -11 / Yandex Disk +12 / Yandex Disk \ "yandex" -Storage> 9 +Storage> 10 Microsoft App Client Id - leave blank normally. -client_id> +client_id> Microsoft App Client Secret - leave blank normally. -client_secret> +client_secret> Remote config Use auto config? * Say Y if not sure @@ -69,8 +71,8 @@ Waiting for code... Got code -------------------- [remote] -client_id = -client_secret = +client_id = +client_secret = token = {"access_token":"XXXXXX"} -------------------- y) Yes this is OK @@ -90,21 +92,21 @@ you to unblock it temporarily if you are running a host firewall. Once configured you can then use `rclone` like this, -List directories in top level of your One Drive +List directories in top level of your OneDrive rclone lsd remote: -List all the files in your One Drive +List all the files in your OneDrive rclone ls remote: -To copy a local directory to an One Drive directory called backup +To copy a local directory to an OneDrive directory called backup rclone copy /home/source remote:backup ### Modified time and hashes ### -One Drive allows modification times to be set on objects accurate to 1 +OneDrive allows modification times to be set on objects accurate to 1 second. These will be used to detect whether objects need syncing or not. @@ -116,7 +118,7 @@ One drive supports SHA1 type hashes, so you can use `--checksum` flag. Any files you delete with rclone will end up in the trash. Microsoft doesn't provide an API to permanently delete files, nor to empty the trash, so you will have to do that with one of Microsoft's apps or via -the One Drive website. +the OneDrive website. ### Specific options ### @@ -135,14 +137,14 @@ is 10MB. ### Limitations ### -Note that One Drive is case insensitive so you can't have a +Note that OneDrive is case insensitive so you can't have a file called "Hello.doc" and one called "hello.doc". -Rclone only supports your default One Drive, and doesn't work with One +Rclone only supports your default OneDrive, and doesn't work with One Drive for business. Both these issues may be fixed at some point depending on user demand! -There are quite a few characters that can't be in One Drive file +There are quite a few characters that can't be in OneDrive file names. These can't occur on Windows platforms, but on non-Windows platforms they are common. Rclone will map these names to and from an identical looking unicode equivalent. For example if a file has a `?` diff --git a/docs/content/s3.md b/docs/content/s3.md index 57df4c190..a4d43a2e7 100644 --- a/docs/content/s3.md +++ b/docs/content/s3.md @@ -26,25 +26,27 @@ Type of storage to configure. Choose a number from below, or type in your own value 1 / Amazon Drive \ "amazon cloud drive" - 2 / Amazon S3 (also Dreamhost, Ceph) + 2 / Amazon S3 (also Dreamhost, Ceph, Minio) \ "s3" 3 / Backblaze B2 \ "b2" 4 / Dropbox \ "dropbox" - 5 / Google Cloud Storage (this is not Google Drive) + 5 / Encrypt/Decrypt a remote + \ "crypt" + 6 / Google Cloud Storage (this is not Google Drive) \ "google cloud storage" - 6 / Google Drive + 7 / Google Drive \ "drive" - 7 / Hubic + 8 / Hubic \ "hubic" - 8 / Local Disk + 9 / Local Disk \ "local" - 9 / Microsoft OneDrive +10 / Microsoft OneDrive \ "onedrive" -10 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH) +11 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH) \ "swift" -11 / Yandex Disk +12 / Yandex Disk \ "yandex" Storage> 2 Get AWS credentials from runtime (environment variables or EC2 meta data if no env vars). Only applies if access_key_id and secret_access_key is blank. @@ -85,21 +87,27 @@ Choose a number from below, or type in your own value / Asia Pacific (Tokyo) Region 8 | Needs location constraint ap-northeast-1. \ "ap-northeast-1" + / Asia Pacific (Seoul) + 9 | Needs location constraint ap-northeast-2. + \ "ap-northeast-2" + / Asia Pacific (Mumbai) +10 | Needs location constraint ap-south-1. + \ "ap-south-1" / South America (Sao Paulo) Region - 9 | Needs location constraint sa-east-1. +11 | Needs location constraint sa-east-1. \ "sa-east-1" / If using an S3 clone that only understands v2 signatures -10 | eg Ceph/Dreamhost +12 | eg Ceph/Dreamhost | set this and make sure you set the endpoint. \ "other-v2-signature" / If using an S3 clone that understands v4 signatures set this -11 | and make sure you set the endpoint. +13 | and make sure you set the endpoint. \ "other-v4-signature" region> 1 Endpoint for S3 API. Leave blank if using AWS to use the default endpoint for the region. Specify if using an S3 clone such as Ceph. -endpoint> +endpoint> Location constraint - must be set to match the Region. Used when creating buckets only. Choose a number from below, or type in your own value 1 / Empty for US Region, Northern Virginia or Pacific Northwest. @@ -118,7 +126,11 @@ Choose a number from below, or type in your own value \ "ap-southeast-2" 8 / Asia Pacific (Tokyo) Region. \ "ap-northeast-1" - 9 / South America (Sao Paulo) Region. + 9 / Asia Pacific (Seoul) + \ "ap-northeast-2" +10 / Asia Pacific (Mumbai) + \ "ap-south-1" +11 / South America (Sao Paulo) Region. \ "sa-east-1" location_constraint> 1 Canned ACL used when creating buckets and/or storing objects in S3. @@ -165,8 +177,11 @@ env_auth = false access_key_id = access_key secret_access_key = secret_key region = us-east-1 -endpoint = -location_constraint = +endpoint = +location_constraint = +acl = private +server_side_encryption = +storage_class = -------------------- y) Yes this is OK e) Edit this remote @@ -364,7 +379,7 @@ access_key_id> WLGDGYAQYIGI833EV05A secret_access_key> BYvgJM101sHngl2uzjXS/OBF/aMxAN06JrJ3qJlF region> us-east-1 endpoint> http://10.0.0.3:9000 -location_constraint> +location_constraint> server_side_encryption> ``` @@ -377,8 +392,8 @@ access_key_id = WLGDGYAQYIGI833EV05A secret_access_key = BYvgJM101sHngl2uzjXS/OBF/aMxAN06JrJ3qJlF region = us-east-1 endpoint = http://10.0.0.3:9000 -location_constraint = -server_side_encryption = +location_constraint = +server_side_encryption = ``` Minio doesn't support all the features of S3 yet. In particular it diff --git a/docs/content/swift.md b/docs/content/swift.md index 9bebdfe81..1081c3b1a 100644 --- a/docs/content/swift.md +++ b/docs/content/swift.md @@ -32,27 +32,29 @@ Type of storage to configure. Choose a number from below, or type in your own value 1 / Amazon Drive \ "amazon cloud drive" - 2 / Amazon S3 (also Dreamhost, Ceph) + 2 / Amazon S3 (also Dreamhost, Ceph, Minio) \ "s3" 3 / Backblaze B2 \ "b2" 4 / Dropbox \ "dropbox" - 5 / Google Cloud Storage (this is not Google Drive) + 5 / Encrypt/Decrypt a remote + \ "crypt" + 6 / Google Cloud Storage (this is not Google Drive) \ "google cloud storage" - 6 / Google Drive + 7 / Google Drive \ "drive" - 7 / Hubic + 8 / Hubic \ "hubic" - 8 / Local Disk + 9 / Local Disk \ "local" - 9 / Microsoft OneDrive +10 / Microsoft OneDrive \ "onedrive" -10 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH) +11 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH) \ "swift" -11 / Yandex Disk +12 / Yandex Disk \ "yandex" -Storage> 10 +Storage> 11 User name to log in. user> user_name API key or password. @@ -74,25 +76,28 @@ Choose a number from below, or type in your own value auth> 1 User domain - optional (v3 auth) domain> Default -Tenant name - optional -tenant> +Tenant name - optional for v1 auth, required otherwise +tenant> tenant_name Tenant domain - optional (v3 auth) tenant_domain> Region name - optional -region> +region> Storage URL - optional -storage_url> -Remote config +storage_url> AuthVersion - optional - set to (1,2,3) if your auth URL has no version -auth_version> +auth_version> +Remote config -------------------- [remote] user = user_name key = password_or_api_key auth = https://auth.api.rackspacecloud.com/v1.0 -tenant = -region = -storage_url = +domain = Default +tenant = +tenant_domain = +region = +storage_url = +auth_version = -------------------- y) Yes this is OK e) Edit this remote @@ -160,7 +165,7 @@ system. Above this size files will be chunked into a _segments container. The default for this is 5GB which is its maximum value. - + ### Modified time ### The modified time is stored as metadata on the object as diff --git a/docs/content/yandex.md b/docs/content/yandex.md index a719fd86d..b4c4548b3 100644 --- a/docs/content/yandex.md +++ b/docs/content/yandex.md @@ -27,31 +27,33 @@ Type of storage to configure. Choose a number from below, or type in your own value 1 / Amazon Drive \ "amazon cloud drive" - 2 / Amazon S3 (also Dreamhost, Ceph) + 2 / Amazon S3 (also Dreamhost, Ceph, Minio) \ "s3" 3 / Backblaze B2 \ "b2" 4 / Dropbox \ "dropbox" - 5 / Google Cloud Storage (this is not Google Drive) + 5 / Encrypt/Decrypt a remote + \ "crypt" + 6 / Google Cloud Storage (this is not Google Drive) \ "google cloud storage" - 6 / Google Drive + 7 / Google Drive \ "drive" - 7 / Hubic + 8 / Hubic \ "hubic" - 8 / Local Disk + 9 / Local Disk \ "local" - 9 / Microsoft OneDrive +10 / Microsoft OneDrive \ "onedrive" -10 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH) +11 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH) \ "swift" -11 / Yandex Disk +12 / Yandex Disk \ "yandex" -Storage> 11 +Storage> 12 Yandex Client Id - leave blank normally. -client_id> +client_id> Yandex Client Secret - leave blank normally. -client_secret> +client_secret> Remote config Use auto config? * Say Y if not sure @@ -65,8 +67,8 @@ Waiting for code... Got code -------------------- [remote] -client_id = -client_secret = +client_id = +client_secret = token = {"access_token":"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx","token_type":"bearer","expiry":"2016-12-29T12:27:11.362788025Z"} -------------------- y) Yes this is OK