From f046395507fbdf46374c0752e8301a435c8f0fd7 Mon Sep 17 00:00:00 2001 From: Peter Beck Date: Tue, 28 Oct 2014 03:16:19 +0100 Subject: [PATCH 1/2] added status-version parameter status version defines the status file version number --- manifests/server.pp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/manifests/server.pp b/manifests/server.pp index f9dd08db..ae346933 100644 --- 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 = '', From 2fbe90ba9d8c3914cc2467231513b8a1b6ccc057 Mon Sep 17 00:00:00 2001 From: Peter Beck Date: Tue, 28 Oct 2014 03:18:30 +0100 Subject: [PATCH 2/2] added status-version --- templates/server.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/server.erb b/templates/server.erb index fb16087f..2bb534f8 100644 --- 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 %>