diff options
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/classes/openvpn.pp | 32 | ||||
-rw-r--r-- | manifests/client.pp (renamed from manifests/definitions/client.pp) | 0 | ||||
-rw-r--r-- | manifests/init.pp | 34 | ||||
-rw-r--r-- | manifests/option.pp (renamed from manifests/definitions/option.pp) | 0 | ||||
-rw-r--r-- | manifests/push.pp (renamed from manifests/definitions/push.pp) | 0 | ||||
-rw-r--r-- | manifests/route.pp (renamed from manifests/definitions/route.pp) | 0 | ||||
-rw-r--r-- | manifests/server.pp (renamed from manifests/definitions/server.pp) | 0 |
7 files changed, 31 insertions, 35 deletions
diff --git a/manifests/classes/openvpn.pp b/manifests/classes/openvpn.pp deleted file mode 100644 index 55dac85..0000000 --- a/manifests/classes/openvpn.pp +++ /dev/null @@ -1,32 +0,0 @@ -# openvpn.pp - -class openvpn { - package { - "openvpn": - ensure => installed; - } - service { - "openvpn": - ensure => running, - hasrestart => true, - hasstatus => true, - require => Exec["/etc/default/openvpn concatenation"]; - } - file { - "/etc/openvpn": - ensure => directory, - require => Package["openvpn"]; - } - file { - "/etc/openvpn/keys": - ensure => directory, - require => File["/etc/openvpn"]; - } - common::concatfilepart { - "00-etc-default-openvpn header": - ensure => present, - content => template("openvpn/etc-default-openvpn.erb"), - notify => Service["openvpn"], - file => "/etc/default/openvpn"; - } -} diff --git a/manifests/definitions/client.pp b/manifests/client.pp index 620d374..620d374 100644 --- a/manifests/definitions/client.pp +++ b/manifests/client.pp diff --git a/manifests/init.pp b/manifests/init.pp index bab81f2..55dac85 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,4 +1,32 @@ -# init.pp +# openvpn.pp -import "classes/*.pp" -import "definitions/*.pp" +class openvpn { + package { + "openvpn": + ensure => installed; + } + service { + "openvpn": + ensure => running, + hasrestart => true, + hasstatus => true, + require => Exec["/etc/default/openvpn concatenation"]; + } + file { + "/etc/openvpn": + ensure => directory, + require => Package["openvpn"]; + } + file { + "/etc/openvpn/keys": + ensure => directory, + require => File["/etc/openvpn"]; + } + common::concatfilepart { + "00-etc-default-openvpn header": + ensure => present, + content => template("openvpn/etc-default-openvpn.erb"), + notify => Service["openvpn"], + file => "/etc/default/openvpn"; + } +} diff --git a/manifests/definitions/option.pp b/manifests/option.pp index 8c2a7a2..8c2a7a2 100644 --- a/manifests/definitions/option.pp +++ b/manifests/option.pp diff --git a/manifests/definitions/push.pp b/manifests/push.pp index e799b04..e799b04 100644 --- a/manifests/definitions/push.pp +++ b/manifests/push.pp diff --git a/manifests/definitions/route.pp b/manifests/route.pp index 00d955a..00d955a 100644 --- a/manifests/definitions/route.pp +++ b/manifests/route.pp diff --git a/manifests/definitions/server.pp b/manifests/server.pp index 2bf2f64..2bf2f64 100644 --- a/manifests/definitions/server.pp +++ b/manifests/server.pp |