add parameter to specify connections to client

zachfi · Feb 7, 2021 · 14de165 · 14de165
1 parent 6946ef6
commit 14de165
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 15 deletions.
diff --git a/manifests/client.pp b/manifests/client.pp
@@ -13,21 +13,22 @@
 #   Example: ['2001:db8::/32']
 #
 define openvpn::client (
-  String           $server,
-  String           $auth           = 'SHA1',
-  String           $port           = '1194',
-  String           $proto          = 'udp',
-  String           $dev            = 'tun',
-  String           $ca             = 'ca.crt',
-  String           $cert           = $name,
-  String           $ns_cert_type   = 'server',
-  Integer          $verb           = 3,
-  String           $cipher         = 'AES-192-CBC',
-  String           $compression    = 'lzo',
-  Optional[String] $tls_auth_key   = undef,
-  Array            $custom_options = [],
-  Array            $route_ipv4     = [],
-  Array            $route_ipv6     = [],
+  String                $server,
+  String                $auth           = 'SHA1',
+  String                $port           = '1194',
+  String                $proto          = 'udp',
+  String                $dev            = 'tun',
+  String                $ca             = 'ca.crt',
+  String                $cert           = $name,
+  String                $ns_cert_type   = 'server',
+  Integer               $verb           = 3,
+  String                $cipher         = 'AES-192-CBC',
+  String                $compression    = 'lzo',
+  Optional[String]      $tls_auth_key   = undef,
+  Optional[Array[Hash]] $connections    = undef,
+  Array                 $custom_options = [],
+  Array                 $route_ipv4     = [],
+  Array                 $route_ipv6     = [],
 ) {
 
   include openvpn

diff --git a/templates/client.conf.erb b/templates/client.conf.erb
@@ -1,7 +1,17 @@
 client
 dev <%= @dev %>
 proto <%= @proto %>
+<% if @connections -%>
+  <%- @connections.each do | connection | -%>
+    <%- %><connection>
+    <%- connection.each do | key, val | -%>
+       <%= key %> <%= val %>
+    <%- end -%>
+    <%- %></connection>
+  <%- end -%>
+<% else -%>
 remote <%= @server %> <%= @port %>
+<% end -%>
 resolv-retry infinite
 nobind
 persist-key