lib/fluent/plugin/out_s3.rb in fluent-plugin-s3-1.7.0 vs lib/fluent/plugin/out_s3.rb in fluent-plugin-s3-1.7.1

- old
+ new

@@ -95,10 +95,14 @@ config_param :enable_transfer_acceleration, :bool, default: false desc "If true, use Amazon S3 Dual-Stack Endpoints. Will make it possible to use either IPv4 or IPv6 when connecting to S3." config_param :enable_dual_stack, :bool, default: false desc "If false, the certificate of endpoint will not be verified" config_param :ssl_verify_peer, :bool, :default => true + desc "Full path to the SSL certificate authority bundle file that should be used when verifying peer certificates. If unspecified, defaults to the system CA if available." + config_param :ssl_ca_bundle, :string, :default => nil + desc "Full path of the directory that contains the unbundled SSL certificate authority files for verifying peer certificates. If you do not pass ssl_ca_bundle or ssl_ca_directory the the system default will be used if available." + config_param :ssl_ca_directory, :string, :default => nil desc "The format of S3 object keys" config_param :s3_object_key_format, :string, default: "%{path}%{time_slice}_%{index}.%{file_extension}" desc "If true, the bucket name is always left in the request URI and never moved to the host as a sub-domain" config_param :force_path_style, :bool, default: false, deprecated: "S3 will drop path style API in 2020: See https://aws.amazon.com/blogs/aws/amazon-s3-path-deprecation-plan-the-rest-of-the-story/" desc "Archive format on S3" @@ -247,9 +251,11 @@ options[:http_proxy] = @proxy_uri if @proxy_uri options[:force_path_style] = @force_path_style options[:compute_checksums] = @compute_checksums unless @compute_checksums.nil? options[:signature_version] = @signature_version unless @signature_version.nil? options[:ssl_verify_peer] = @ssl_verify_peer + options[:ssl_ca_bundle] = @ssl_ca_bundle if @ssl_ca_bundle + options[:ssl_ca_directory] = @ssl_ca_directory if @ssl_ca_directory log.on_trace do options[:http_wire_trace] = true options[:logger] = log end