This commit is contained in:
doop 2011-04-14 13:37:35 +03:00 committed by Timo Mkinen
parent d846d7c299
commit 6f74d1bc54

View file

@ -9,10 +9,20 @@ class openvpn::client {
service { "openvpn": service { "openvpn":
ensure => running, ensure => running,
enable => true, enable => true,
require => Package["openvpn"], require => [Package["openvpn"],File["/etc/openvpn/openvpn.conf"],File["/etc/openvpn/ta.key"],File["/etc/openvpn/ca.crt"],],
require => File["/etc/openvpn/openvpn.conf"], }
require => File["/etc/openvpn/ta.key"],
require => File["/etc/openvpn/ca.crt"], if !$openvpn_server {
$openvpn_server = "127.0.0.1"
}
if !$openvpn_port {
$openvpn_port = "1194"
}
if !$openvpn_ca {
$openvpn_ca = "ca.crt"
}
if !$openvpn_ta {
$openvpn_ta = "ta.key"
} }
file { "/etc/openvpn/openvpn.conf": file { "/etc/openvpn/openvpn.conf":
@ -26,7 +36,7 @@ class openvpn::client {
} }
file { "/etc/openvpn/ta.key": file { "/etc/openvpn/ta.key":
ensure => present, ensure => present,
source => "puppet:///files/openvpn/ta.key", source => "puppet:///openvpn/ta.key",
mode => 0640, mode => 0640,
owner => root, owner => root,
group => root, group => root,
@ -34,22 +44,10 @@ class openvpn::client {
} }
file { "/etc/openvpn/ca.crt": file { "/etc/openvpn/ca.crt":
ensure => present, ensure => present,
source => "puppet:///files/openvpn/ca.crt", source => "puppet:///openvpn/ca.crt",
mode => 0640, mode => 0640,
owner => root, owner => root,
group => root, group => root,
require => Package["openvpn"], require => Package["openvpn"],
} }
if !$openvpn_server {
$openvpn_server = "127.0.0.1"
}
if !$openvpn_port {
$openvp_port = "1194"
}
if !$openvpn_ca {
$openvpn_ca = "ca.crt"
}
if !$openvpn_ta {
$openvp_ta = "ta.key"
}
} }