diff options
| author | John Kinsella <jlkinsel@gmail.com> | 2012-02-22 10:55:07 -0800 |
|---|---|---|
| committer | John Kinsella <jlkinsel@gmail.com> | 2012-02-22 10:55:07 -0800 |
| commit | 86d875990cb4969ea5559671c518036247d46730 (patch) | |
| tree | 8610c1e720580c38d72bb5f075f56c770f52d919 | |
| parent | be5f31a3afb6084f803633b5f2d31681db11cc65 (diff) | |
Made changes to get server part to run on CentOS:
* Added logic to define path to easyrsa files based on OS type
* Added exec resource to ensure copied easyrsa files are executable
| -rw-r--r-- | manifests/server.pp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/manifests/server.pp b/manifests/server.pp index aa0c32d..771ca1c 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -3,6 +3,11 @@ 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', + default => '/usr/share/doc/openvpn/examples/easy-rsa/2.0' + } + file { "/etc/openvpn/${name}": ensure => directory, @@ -19,10 +24,16 @@ define openvpn::server($country, $province, $city, $organization, $email) { exec { "copy easy-rsa to openvpn config folder ${name}": - command => "/bin/cp -r /usr/share/doc/openvpn/examples/easy-rsa/2.0 /etc/openvpn/${name}/easy-rsa", + command => "/bin/cp -r ${easyrsa_source} /etc/openvpn/${name}/easy-rsa", creates => "/etc/openvpn/${name}/easy-rsa", + notify => Exec["fix_easyrsa_file_permissions"], require => File["/etc/openvpn/${name}"]; } + exec { + "fix_easyrsa_file_permissions": + refreshonly => "true", + command => "/bin/chmod 755 /etc/openvpn/${name}/easy-rsa/*"; + } file { "/etc/openvpn/${name}/easy-rsa/vars": ensure => present, |