Merge pull request #108 from peterbeck/master

added status-version parameter to server
voxpupuli · Oct 28, 2014 · 669501c · 669501c
2 parents ec516f8 + 2fbe90b
commit 669501c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/manifests/server.pp b/manifests/server.pp
@@ -83,6 +83,10 @@
 #   String.  Logfile for periodic dumps of the vpn service status
 #   Default: "${name}/openvpn-status.log"
 #
+# [*status_version*]
+#   Integer. Choose the status file format version number. Can be 1, 2 or 3 and defaults to 1
+#   Default: None (=1)
+#
 # [*server*]
 #   String.  Network to assign client addresses out of
 #   Default: None.  Required in tun mode, not in tap mode
@@ -322,6 +326,7 @@
   $port = '1194',
   $proto = 'tcp',
   $status_log = "${name}/openvpn-status.log",
+  $status_version = '',
   $server = '',
   $server_ipv6 = '',
   $server_bridge = '',

diff --git a/templates/server.erb b/templates/server.erb
@@ -37,6 +37,9 @@ user <%= @user %>
 log-append <%= @logfile %>
 <% end -%>
 status <%= @status_log %>
+<% if @status_version != '' -%>
+status-version <%= @status_version %>
+<% end -%>
 dev <%= @dev %>
 <% if @local != '' -%>
 local <%= @local %>