diff options
| author | varac <varacanero@zeromail.org> | 2013-09-19 12:29:15 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-09-19 12:29:15 +0200 |
| commit | c68399c019d09a4c8ba44f47936b4b3842802177 (patch) | |
| tree | 01157d9d76de8e753e25da376224b7da58e47e91 /puppet/modules/site_openvpn/manifests/init.pp | |
| parent | 1ce6cb5a30c5ee73d6474ac9c1bbd4c7819d9a73 (diff) | |
tidy openvpn x509 definitions (#3831)
Diffstat (limited to 'puppet/modules/site_openvpn/manifests/init.pp')
| -rw-r--r-- | puppet/modules/site_openvpn/manifests/init.pp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/puppet/modules/site_openvpn/manifests/init.pp b/puppet/modules/site_openvpn/manifests/init.pp index 41f4c6d4..29b3f13f 100644 --- a/puppet/modules/site_openvpn/manifests/init.pp +++ b/puppet/modules/site_openvpn/manifests/init.pp @@ -27,7 +27,6 @@ class site_openvpn { Class['site_config::default'] -> Class['site_openvpn'] $openvpn_config = hiera('openvpn') - $x509_config = hiera('x509') $openvpn_ports = $openvpn_config['ports'] if $::ec2_instance_id { @@ -62,8 +61,8 @@ class site_openvpn { $openvpn_limited_udp_cidr = '21' } - # deploy ca + server keys - include site_openvpn::keys + # deploy dh keys + include site_openvpn::dh_key if $openvpn_allow_unlimited and $openvpn_allow_limited { $unlimited_gateway_address = $openvpn_gateway_address |