removed /etc/defalut/openvpn from all but Debian based machines, defaults cleanup on openvpn::server

3 files changed, 28 insertions, 19 deletions

diff --git a/manifests/config.pp b/manifests/config.pp
index 9e7753d..a316cc9 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -16,18 +16,20 @@
 class openvpn::config {
   include concat::setup
 
-  concat {
-    '/etc/default/openvpn':
-      owner  => root,
-      group  => root,
-      mode   => 644,
-      warn   => true;
-  }
+  if $::osfamily == 'Debian' {
+    concat {
+      '/etc/default/openvpn':
+        owner  => root,
+        group  => root,
+        mode   => 644,
+        warn   => true;
+    }
 
-  concat::fragment {
-    'openvpn.default.header':
-      content => template('openvpn/etc-default-openvpn.erb'),
-      target  => '/etc/default/openvpn',
-      order   => 01;
+    concat::fragment {
+      'openvpn.default.header':
+        content => template('openvpn/etc-default-openvpn.erb'),
+        target  => '/etc/default/openvpn',
+        order   => 01;
+    }
   }
 }
\ No newline at end of file
diff --git a/manifests/server.pp b/manifests/server.pp
index 20dceed..53085f5 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -46,7 +46,8 @@
 #
 # [*logfile*]
 #   String.  Logfile for this openvpn server
-#   Default: "${name}/openvpn.log"
+#   Default: ''
+#   Options:  '' (syslog) or log file name
 #
 # [*port*]
 #   Integer.  The port the openvpn server service is running on
@@ -67,7 +68,7 @@
 #
 # [*server*]
 #   String.  Network to assign client addresses out of
-#   Default: $::network_eth0 $::netmask_eth0
+#   Default: None.  Required in tun mode, not in tap mode
 #
 # [*push*]
 #   Array.  Options to push out to the client.  This can include routes, DNS
@@ -109,7 +110,7 @@ define openvpn::server(
   $proto = 'tcp',
   $status_log = "${name}/openvpn-status.log",
   $user = 'nobody',
-  $server = "${::network_eth0} ${::netmask_eth0}",
+  $server = '',
   $push = []
 ) {
   
@@ -195,11 +196,13 @@ define openvpn::server(
             require => Exec["copy easy-rsa to openvpn config folder ${name}"];
     }
 
-    concat::fragment {
+    if $::osfamily == 'Debian' {
+      concat::fragment {
         "openvpn.default.autostart.${name}":
-            content => "AUTOSTART=\"\$AUTOSTART ${name}\"\n",
-            target  => '/etc/default/openvpn',
-            order   => 10;
+          content => "AUTOSTART=\"\$AUTOSTART ${name}\"\n",
+          target  => '/etc/default/openvpn',
+          order   => 10;
+      }
     }
     
     file {
diff --git a/templates/server.erb b/templates/server.erb
index b010cbd..1ff9ba1 100644
--- a/templates/server.erb
+++ b/templates/server.erb
@@ -11,7 +11,9 @@ port <%= scope.lookupvar('port') %>
 <% end -%>
 group <%= scope.lookupvar('group') %>
 user <%= scope.lookupvar('user') %>
+<% if logfile != '' -%>
 log-append <%= scope.lookupvar('logfile') %>
+<% end -%>
 status <%= scope.lookupvar('status_log') %>
 dev <%= scope.lookupvar('dev') %>
 <% if scope.lookupvar('local') != '' -%>
@@ -20,7 +22,9 @@ local <%= scope.lookupvar('local') %>
 <% if scope.lookupvar('ipp') -%>
 ifconfig-pool-persist <%= scope.lookupvar('name') %>/vpn-ipp.txt
 <% end -%>
+<% if scope.lookupvar('server') != '' -%>
 server <%= scope.lookupvar('server') %>
+<% end -%>
 <% scope.lookupvar('push').each do |item| -%>
 push <%= item %>
 <% end -%>