diff options
| author | Justin Lambert <jlambert@eml.cc> | 2012-12-28 19:01:34 -0700 |
|---|---|---|
| committer | Justin Lambert <jlambert@eml.cc> | 2012-12-28 19:01:34 -0700 |
| commit | be29a25a726d339f69a99ccf4ff2592b681cd622 (patch) | |
| tree | f2f0361f45e7bb773f738b3a0ae86a692a1bbeff | |
| parent | 75611f5920aa275ca6ae3b0c3c51a3915fcf224d (diff) | |
version bump to 2.2.2, minor redhat change, specify params that are in client.pp
| -rw-r--r-- | manifests/server.pp | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/manifests/server.pp b/manifests/server.pp index 8a516eb..79ca4da 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -3,14 +3,14 @@ define openvpn::server($country, $province, $city, $organization, $email) { include openvpn - $easyrsa_source = $::operatingsystem ? { - 'centos' => '/usr/share/doc/openvpn-2.2.0/easy-rsa/2.0', + $easyrsa_source = $operatingsystem ? { + 'centos' => '/usr/share/doc/openvpn-2.2.2/easy-rsa/2.0', default => '/usr/share/doc/openvpn/examples/easy-rsa/2.0' } - $link_openssl_cnf = $::lsbdistcodename ? { - 'precise' => true, - default => false + $link_openssl_cnf = $::osfamily ? { + /(Ubuntu|RedHat)/ => true, + default => false } file { @@ -120,6 +120,17 @@ define openvpn::server($country, $province, $city, $organization, $email) { value => "/etc/openvpn/${name}/keys/dh1024.pem", require => Exec["generate dh param ${name}"], server => $name; + + "proto ${name}": + key => 'proto', + value => 'tcp', + require => Exec["generate dh param ${name}"], + server => $name; + + "comp-lzo ${name}": + key => 'comp-lzo', + require => Exec["generate dh param ${name}"], + server => $name; } concat::fragment { |