summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--puppet/manifests/site.pp2
-rw-r--r--puppet/modules/site_openvpn/manifests/keys.pp13
2 files changed, 10 insertions, 5 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 89c97888..d451bdf5 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -11,7 +11,7 @@ node 'default' {
notice("Services for $fqdn: $services")
# configure eip
- if 'eip' in $services {
+ if 'openvpn' in $services {
include site_config::eip
}
diff --git a/puppet/modules/site_openvpn/manifests/keys.pp b/puppet/modules/site_openvpn/manifests/keys.pp
index b31369c9..d029fbac 100644
--- a/puppet/modules/site_openvpn/manifests/keys.pp
+++ b/puppet/modules/site_openvpn/manifests/keys.pp
@@ -1,13 +1,18 @@
class site_openvpn::keys {
- $openvpn_keys = hiera_hash('openvpn_keys')
+ $openvpn_keys = hiera_hash('openvpn')
+
+ file { '/etc/openvpn/keys/ca.key':
+ content => $openvpn_keys['ca_key'],
+ mode => '0600',
+ }
file { '/etc/openvpn/keys/ca.crt':
- content => $openvpn_keys['ca'],
+ content => $openvpn_keys['ca_crt'],
mode => '0644',
}
file { '/etc/openvpn/keys/dh.pem':
- content => $openvpn_keys['dh'],
+ content => $openvpn_keys['dh_key'],
mode => '0644',
}
@@ -17,7 +22,7 @@ class site_openvpn::keys {
}
file { '/etc/openvpn/keys/server.crt':
- content => $openvpn_keys['server_cert'],
+ content => $openvpn_keys['server_crt'],
mode => '0644',
}
}