added additional parameters

2 files changed, 22 insertions, 0 deletions

diff --git a/manifests/server.pp b/manifests/server.pp
index 50eb8d1..9355327 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -9,6 +9,15 @@ define openvpn::server(
   $compression = 'comp-lzo',
   $port = '1194',
   $proto = 'tcp',
+  $group = 'nobody',
+  $user = 'nobody',
+  $logfile = "${name}/openvpn.log",
+  $status-log = "${name}/openvpn-status.log",
+  $dev = 'tun0',
+  $local = $::ipaddress_eth0,
+  $ipp = false,
+  $server = "${network_eth0} ${netmask_eth0}",
+  $push = []
 ) {
     include openvpn
 
diff --git a/templates/server.erb b/templates/server.erb
index 1e41aa1..7f3d74d 100644
--- a/templates/server.erb
+++ b/templates/server.erb
@@ -7,3 +7,16 @@ dh /etc/openvpn/<%= scope.lookupvar('name') %>/keys/dh1024.pem
 proto <%= scope.lookupvar('proto') %>
 port <%= scope.lookupvar('port') %>
 <%= scope.lookupvar('compression') %>
+group <%= scope.lookupvar('group') %>
+user <%= scope.lookupvar('user') %>
+log-append <%= scope.lookupvar('logfile') %>
+status <%= scope.lookupvar('status-log') %>
+dev <%= scope.lookupvar('dev') %>
+local <%= scope.lookupvar('local') %>
+<% if scope.lookupvar('ipp') %>
+ifconfig-pool-persist <%= scope.lookupvar('name') %>/vpn-ipp.txt
+<% end %>
+server <%= scope.lookupvar('server') %>
+<% scope.lookupvar('push').each do |item| %>
+push <%= item %>
+<% end %>