Merge pull request #2097 from Pistos/gentoo-ca-certs-location

Gentoo ca certs location
This commit is contained in:
Dennis Schubert 2011-10-03 14:22:07 -07:00
commit cd3f224904

View file

@ -21,6 +21,7 @@ defaults: &defaults
# Setting the root certificate bundle (this is operating system specific). Defaults:
# CentOS: '/etc/pki/tls/certs/ca-bundle.crt'
# Debian: '/etc/ssl/certs/ca-certificates.crt'
# Gentoo: '/etc/ssl/certs/ca-certificates.crt'
ca_file: '/etc/pki/tls/certs/ca-bundle.crt'
# Secure websocket confguration (wss://).
@ -54,7 +55,7 @@ defaults: &defaults
open_invitations: true
# Set this to true if you don't want your users to follow the diasporahq@joindiaspora.com
# account on account creation. The diasporahq account helps users start with some
# account on account creation. The diasporahq account helps users start with some
# activity in their stream and get news about Diaspora, but if you don't want your server
# to contact joindiaspora.com, set this to true:
no_follow_diasporahq: false
@ -133,7 +134,7 @@ defaults: &defaults
smtp_openssl_verify_mode:
# Domain of smtp server.
# This should match the common name of the certificate
# This should match the common name of the certificate
# the SMTP server sends. If he sends one
smtp_domain: 'example.com'
@ -167,7 +168,7 @@ defaults: &defaults
paypal_hosted_button_id: ""
# Mount resque-web into routes
# This allows an administrator to see info about the workers
# This allows an administrator to see info about the workers
mount_resque_web: true
#
@ -197,7 +198,7 @@ integration_1:
<<: *defaults
pod_url: "http://localhost:45789"
enable_splunk_logging: false
integration_2:
<<: *defaults
pod_url: "http://localhost:34658"