Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-25 10:09:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'client_certs'

Browse source 
# Conflicts:
#	rainloop/v/0.0.0/app/libraries/RainLoop/Model/Account.php
This commit is contained in:
Michael Barnathan 2017-08-17 18:27:08 -04:00
commit 120e0a4401
6 changed files with 45 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
View file

@ -219,6 +219,7 @@ class Application extends \RainLoop\Config\AbstractConfig
'allow_self_signed' => array(true, 'Allow self-signed certificates. Requires verify_certificate.'),
'cafile' => array('', 'Location of Certificate Authority file on local filesystem (/etc/ssl/certs/ca-certificates.crt)'),
'capath' => array('', 'capath must be a correctly hashed certificate directory. (/etc/ssl/certs/)'),
'client_cert' => array('', 'Location of client certificate file (pem format with private key) on local filesystem'),
),
'capa' => array(