summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2012-11-22 11:43:23 -0800
committerelijah <elijah@riseup.net>2012-11-22 11:43:23 -0800
commitf3704fc0ac81ca6ccb7e7d19ae931d9c391f3975 (patch)
treed74d17c098583de180be140c06b8090be753d106 /puppet/modules
parent7b803d54a625e13f52a33e1c7a9264b344474df8 (diff)
clean up openvpn and x509 paths
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_openvpn/manifests/keys.pp9
1 files changed, 2 insertions, 7 deletions
diff --git a/puppet/modules/site_openvpn/manifests/keys.pp b/puppet/modules/site_openvpn/manifests/keys.pp
index e198cbf8..12c1bd8f 100644
--- a/puppet/modules/site_openvpn/manifests/keys.pp
+++ b/puppet/modules/site_openvpn/manifests/keys.pp
@@ -1,17 +1,12 @@
class site_openvpn::keys {
- file { '/etc/openvpn/keys/ca.key':
- content => $site_openvpn::openvpn_config['ca_key'],
- mode => '0600',
- }
-
file { '/etc/openvpn/keys/ca.crt':
- content => $site_openvpn::openvpn_config['ca_crt'],
+ content => $site_openvpn::x509_config['ca_cert'],
mode => '0644',
}
file { '/etc/openvpn/keys/dh.pem':
- content => $site_openvpn::openvpn_config['dh'],
+ content => $site_openvpn::x509_config['dh'],
mode => '0644',
}