Commit f1aeecc0 authored by Jonne Haß's avatar Jonne Haß

force typhoeus (and thus curl) to use diaspora.yml's CA bundle

parent 60aa1ffe
# 0.0.3.0
## Bug Fixes
* Force Typhoeus/cURL to use the CA bundle we query via the config. Also add a setting for extra verbose output.
# 0.0.2.0
## Refactor
......
......@@ -469,6 +469,7 @@ DEPENDENCIES
rack-cors (= 0.2.7)
rack-google-analytics (= 0.11.0)
rack-piwik (= 0.1.3)
rack-protection (= 1.2)
rack-rewrite (= 1.3.1)
rack-ssl (= 1.3.2)
rails (= 3.2.8)
......
......@@ -51,6 +51,7 @@ defaults:
community_spotlight:
enable: false
suggest_email:
typhoeus_verbose: false
services:
facebook:
enable: false
......
......@@ -189,6 +189,11 @@ configuration: ## Section
## E-Mail address users can make suggestions about who should be
## in the spotlight to.
#suggest_email: 'admin@example.org'
## CURL debug
## Turn on extra verbose output when sending stuff. No you
## don't need to touch this unless explicitly told to.
#typhoeus_verbose: true
## Setup E-Mail
mail: ## Section
......
......@@ -8,6 +8,8 @@ require 'active_support/base64'
class HydraWrapper
OPTS = {:max_redirects => 3, :timeout => 25000, :method => :post,
:verbose => AppConfig.settings.typhoeus_verbose?,
:ssl_cacert => AppConfig.environment.certificate_authorities.get,
:headers => {'Expect' => '',
'Transfer-Encoding' => ''}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment