prohibit empty string for $compression

voxpupuli · Oct 21, 2018 · 53c7ae3 · 53c7ae3
1 parent bb06083
commit 53c7ae3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/manifests/client.pp b/manifests/client.pp
@@ -13,7 +13,7 @@
 # [*compression*]
 #   String.  Which compression algorithim to use
 #   Default: comp-lzo
-#   Options: comp-lzo or '' (disable compression)
+#   Options: comp-lzo or undef (disable compression)
 #
 # [*dev*]
 #   String.  Device method
@@ -195,7 +195,7 @@
 #
 define openvpn::client (
   String $server,
-  String $compression                         = 'comp-lzo',
+  Optional[String[1]] $compression            = 'comp-lzo',
   String $dev                                 = 'tun',
   Integer $mute                               = 20,
   Boolean $mute_replay_warnings               = true,

diff --git a/manifests/server.pp b/manifests/server.pp
@@ -40,7 +40,7 @@
 # [*compression*]
 #   String.  Which compression algorithim to use
 #   Default: comp-lzo
-#   Options: comp-lzo or '' (disable compression)
+#   Options: comp-lzo or undef (disable compression)
 #
 # [*dev*]
 #   String.  TUN/TAP virtual network device
@@ -448,7 +448,7 @@
   Optional[String] $email                                           = undef,
   Optional[Array] $remote                                           = undef,
   String $common_name                                               = 'server',
-  String $compression                                               = 'comp-lzo',
+  Optional[String[1]] $compression                                  = 'comp-lzo',
   String $dev                                                       = 'tun0',
   String $user                                                      = 'nobody',
   Optional[String] $group                                           = undef,

diff --git a/templates/client.erb b/templates/client.erb
@@ -5,7 +5,7 @@ proto <%= @proto %>
 <% @remote_host.each do |item| -%>
 remote <%= item %> <%= @port %>
 <% end -%>
-<% if @compression != '' -%>
+<% if @compression -%>
 <%= @compression %>
 <% end -%>
 resolv-retry <%= @resolv_retry %>

diff --git a/templates/server.erb b/templates/server.erb
@@ -65,7 +65,7 @@ tls-server
 <% if @tls_client -%>
 tls-client
 <% end -%>
-<% if @compression != '' -%>
+<% if @compression -%>
 <%= @compression %>
 <% end -%>
 group <%= @group_to_set %>