Prefer HTTPS links where possible

Fix a few stale links as well.
This commit is contained in:
Andrew Gaul 2019-01-18 11:00:38 -08:00
parent 25b49e1a2e
commit aa9bd1fa3c
5 changed files with 13 additions and 12 deletions

View File

@ -2,7 +2,7 @@ s3fs
==== ====
s3fs allows Linux and macOS to mount an S3 bucket via FUSE. s3fs allows Linux and macOS to mount an S3 bucket via FUSE.
s3fs preserves the native object format for files, allowing use of other tools like [s3cmd](http://s3tools.org/s3cmd). s3fs preserves the native object format for files, allowing use of other tools like [s3cmd](https://s3tools.org/s3cmd).
[![Build Status](https://travis-ci.org/s3fs-fuse/s3fs-fuse.svg?branch=master)](https://travis-ci.org/s3fs-fuse/s3fs-fuse) [![Build Status](https://travis-ci.org/s3fs-fuse/s3fs-fuse.svg?branch=master)](https://travis-ci.org/s3fs-fuse/s3fs-fuse)
Features Features
@ -47,7 +47,7 @@ Some systems provide pre-built packages:
sudo yum install s3fs-fuse sudo yum install s3fs-fuse
``` ```
* On macOS, install via [Homebrew](http://brew.sh/): * On macOS, install via [Homebrew](https://brew.sh/):
```ShellSession ```ShellSession
$ brew cask install osxfuse $ brew cask install osxfuse
@ -131,12 +131,12 @@ mybucket /path/to/mountpoint fuse.s3fs _netdev,allow_other 0 0
If you use s3fs with a non-Amazon S3 implementation, specify the URL and path-style requests: If you use s3fs with a non-Amazon S3 implementation, specify the URL and path-style requests:
``` ```
s3fs mybucket /path/to/mountpoint -o passwd_file=${HOME}/.passwd-s3fs -o url=http://url.to.s3/ -o use_path_request_style s3fs mybucket /path/to/mountpoint -o passwd_file=${HOME}/.passwd-s3fs -o url=https://url.to.s3/ -o use_path_request_style
``` ```
or(fstab) or(fstab)
``` ```
s3fs#mybucket /path/to/mountpoint fuse _netdev,allow_other,use_path_request_style,url=http://url.to.s3/ 0 0 s3fs#mybucket /path/to/mountpoint fuse _netdev,allow_other,use_path_request_style,url=https://url.to.s3/ 0 0
``` ```
To use IBM IAM Authentication, use the `-o ibm_iam_auth` option, and specify the Service Instance ID and API Key in your credentials file: To use IBM IAM Authentication, use the `-o ibm_iam_auth` option, and specify the Service Instance ID and API Key in your credentials file:
@ -162,7 +162,7 @@ Generally S3 cannot offer the same performance or semantics as a local file syst
* random writes or appends to files require rewriting the entire file * random writes or appends to files require rewriting the entire file
* metadata operations such as listing directories have poor performance due to network latency * metadata operations such as listing directories have poor performance due to network latency
* [eventual consistency](https://en.wikipedia.org/wiki/Eventual_consistency) can temporarily yield stale data([Amazon S3 Data Consistency Model](http://docs.aws.amazon.com/AmazonS3/latest/dev/Introduction.html#ConsistencyModel)) * [eventual consistency](https://en.wikipedia.org/wiki/Eventual_consistency) can temporarily yield stale data([Amazon S3 Data Consistency Model](https://docs.aws.amazon.com/AmazonS3/latest/dev/Introduction.html#ConsistencyModel))
* no atomic renames of files or directories * no atomic renames of files or directories
* no coordination between multiple clients mounting the same bucket * no coordination between multiple clients mounting the same bucket
* no hard links * no hard links

View File

@ -62,7 +62,7 @@ if it is not specified bucket name(and path) in command line, must specify this
\fB\-o\fR default_acl (default="private") \fB\-o\fR default_acl (default="private")
the default canned acl to apply to all written s3 objects, e.g., "private", "public-read". the default canned acl to apply to all written s3 objects, e.g., "private", "public-read".
empty string means do not send header. empty string means do not send header.
see http://aws.amazon.com/documentation/s3/ for the full list of canned acls. see https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl for the full list of canned acls.
.TP .TP
\fB\-o\fR retries (default="5") \fB\-o\fR retries (default="5")
number of times to retry a failed S3 transaction. number of times to retry a failed S3 transaction.

View File

@ -3647,9 +3647,9 @@ bool S3fsCurl::UploadMultipartPostComplete()
// check etag(md5); // check etag(md5);
// //
// The ETAG when using SSE_C and SSE_KMS does not reflect the MD5 we sent // The ETAG when using SSE_C and SSE_KMS does not reflect the MD5 we sent
// SSE_C: http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPUT.html // SSE_C: https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPUT.html
// SSE_KMS is ignored in the above, but in the following it states the same in the highlights: // SSE_KMS is ignored in the above, but in the following it states the same in the highlights:
// http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html // https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html
// //
if(S3fsCurl::is_content_md5 && SSE_C != S3fsCurl::GetSseType() && SSE_KMS != S3fsCurl::GetSseType()){ if(S3fsCurl::is_content_md5 && SSE_C != S3fsCurl::GetSseType() && SSE_KMS != S3fsCurl::GetSseType()){
if(!etag_equals(it->second, partdata.etag)){ if(!etag_equals(it->second, partdata.etag)){

View File

@ -5149,7 +5149,7 @@ int main(int argc, char* argv[])
// Check to see if the bucket name contains periods and https (SSL) is // Check to see if the bucket name contains periods and https (SSL) is
// being used. This is a known limitation: // being used. This is a known limitation:
// http://docs.amazonwebservices.com/AmazonS3/latest/dev/ // https://docs.amazonwebservices.com/AmazonS3/latest/dev/
// The Developers Guide suggests that either use HTTP of for us to write // The Developers Guide suggests that either use HTTP of for us to write
// our own certificate verification logic. // our own certificate verification logic.
// For now, this will be unsupported unless we get a request for it to // For now, this will be unsupported unless we get a request for it to

View File

@ -1019,8 +1019,9 @@ void show_help (void)
" default_acl (default=\"private\")\n" " default_acl (default=\"private\")\n"
" - the default canned acl to apply to all written s3 objects,\n" " - the default canned acl to apply to all written s3 objects,\n"
" e.g., private, public-read. empty string means do not send\n" " e.g., private, public-read. empty string means do not send\n"
" header. see http://aws.amazon.com/documentation/s3/ for the\n" " header. see\n"
" full list of canned acls\n" " https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl\n"
" for the full list of canned acls\n"
"\n" "\n"
" retries (default=\"5\")\n" " retries (default=\"5\")\n"
" - number of times to retry a failed s3 transaction\n" " - number of times to retry a failed s3 transaction\n"
@ -1353,7 +1354,7 @@ void show_version(void)
printf( printf(
"Amazon Simple Storage Service File System V%s(commit:%s) with %s\n" "Amazon Simple Storage Service File System V%s(commit:%s) with %s\n"
"Copyright (C) 2010 Randy Rizun <rrizun@gmail.com>\n" "Copyright (C) 2010 Randy Rizun <rrizun@gmail.com>\n"
"License GPL2: GNU GPL version 2 <http://gnu.org/licenses/gpl.html>\n" "License GPL2: GNU GPL version 2 <https://gnu.org/licenses/gpl.html>\n"
"This is free software: you are free to change and redistribute it.\n" "This is free software: you are free to change and redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n", "There is NO WARRANTY, to the extent permitted by law.\n",
VERSION, COMMIT_HASH_VAL, s3fs_crypt_lib_name()); VERSION, COMMIT_HASH_VAL, s3fs_crypt_lib_name());