summaryrefslogtreecommitdiff
path: root/puppet/modules/site_openvpn/manifests/server_config.pp
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-01-31 15:01:48 +0100
committervarac <varacanero@zeromail.org>2013-01-31 15:01:48 +0100
commit2585f661c55c3615eb95f660c101af70e9fd04e9 (patch)
tree1ea40ca07c18e92263e13dbdc6f70bfe1c8b943e /puppet/modules/site_openvpn/manifests/server_config.pp
parent24829044b9726f5eb9a8a0ac09f94152b943f9e4 (diff)
parentefed0453a754ca1c1725192546c10ccc4fb3ebe1 (diff)
Merge branch 'develop' of ssh://code.leap.se/leap_platform into develop
Diffstat (limited to 'puppet/modules/site_openvpn/manifests/server_config.pp')
-rw-r--r--puppet/modules/site_openvpn/manifests/server_config.pp6
1 files changed, 1 insertions, 5 deletions
diff --git a/puppet/modules/site_openvpn/manifests/server_config.pp b/puppet/modules/site_openvpn/manifests/server_config.pp
index 68387a90..de273b46 100644
--- a/puppet/modules/site_openvpn/manifests/server_config.pp
+++ b/puppet/modules/site_openvpn/manifests/server_config.pp
@@ -69,11 +69,7 @@ define site_openvpn::server_config ($port, $proto, $local, $server, $push, $mana
openvpn::option {
"ca $openvpn_configname":
key => 'ca',
- value => '/usr/local/share/ca-certificates/leap_client_ca.crt',
- server => $openvpn_configname;
- "ca $openvpn_configname":
- key => 'ca',
- value => '/usr/local/share/ca-certificates/leap_openvpn.crt',
+ value => '/etc/openvpn/ca_bundle.pem',
server => $openvpn_configname;
"cert $openvpn_configname":
key => 'cert',