From e89082114be280c7fd3c7b62863e19ff5c89df26 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 4 Oct 2012 22:36:12 +0200
Subject: cosmetics

---
 puppet/modules/site_openvpn/manifests/init.pp | 59 +++++++++++++++------------
 1 file changed, 32 insertions(+), 27 deletions(-)

(limited to 'puppet')

diff --git a/puppet/modules/site_openvpn/manifests/init.pp b/puppet/modules/site_openvpn/manifests/init.pp
index c83b98c7..e95e67d5 100644
--- a/puppet/modules/site_openvpn/manifests/init.pp
+++ b/puppet/modules/site_openvpn/manifests/init.pp
@@ -1,43 +1,48 @@
 class site_openvpn {
   package {
-      "openvpn":
-          ensure => installed;
+    'openvpn':
+      ensure => installed;
   }
   service {
-      "openvpn":
-          ensure     => running,
-          hasrestart => true,
-          hasstatus  => true,
-          require    => Exec["concat_/etc/default/openvpn"];
+    'openvpn':
+      ensure     => running,
+      hasrestart => true,
+      hasstatus  => true,
+      require    => Exec['concat_/etc/default/openvpn'];
   }
+
   file {
-      "/etc/openvpn":
-          ensure  => directory,
-          require => Package["openvpn"];
+    '/etc/openvpn':
+      ensure  => directory,
+      require => Package['openvpn'];
   }
 
-  include concat::setup
+  file {
+    '/etc/openvpn/keys':
+      ensure  => directory,
+      require => Package['openvpn'];
+  }
 
   concat {
-      "/etc/default/openvpn":
-          owner  => root,
-          group  => root,
-          mode   => 644,
-          warn   => true,
-          notify => Service["openvpn"];
+    '/etc/default/openvpn':
+      owner  => root,
+      group  => root,
+      mode   => 644,
+      warn   => true,
+      notify => Service['openvpn'];
   }
 
   concat::fragment {
-      "openvpn.default.header":
-          content => template("openvpn/etc-default-openvpn.erb"),
-          target  => "/etc/default/openvpn",
-          order   => 01;
+    'openvpn.default.header':
+      content => template('openvpn/etc-default-openvpn.erb'),
+      target  => '/etc/default/openvpn',
+      order   => 01;
   }
 
-  concat::fragment {                               
-    "openvpn.default.autostart.${name}":           
-        content => "AUTOSTART=all",                
-        target  => "/etc/default/openvpn",         
-        order   => 10;                             
-  }                                                
+  concat::fragment {
+    "openvpn.default.autostart.${name}":
+      content => 'AUTOSTART=all',
+      target  => '/etc/default/openvpn',
+      order   => 10;
+  }
 }
-- 
cgit v1.2.3