From f3704fc0ac81ca6ccb7e7d19ae931d9c391f3975 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Thu, 22 Nov 2012 11:43:23 -0800
Subject: clean up openvpn and x509 paths

---
 puppet/modules/site_openvpn/manifests/keys.pp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'puppet/modules/site_openvpn')

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',
   }
 
-- 
cgit v1.2.3