Merge pull request #109 from JGodin-C2C/master

Adds "table" parameter to a wireguard interface stanza to be able to set it in the wg-quick/netdev configuration.

REFERENCE.md

@@ -196,6 +196,7 @@ The following parameters are available in the `wireguard::interface` defined typ
 * [`input_interface`](#-wireguard--interface--input_interface)
 * [`manage_firewall`](#-wireguard--interface--manage_firewall)
 * [`dport`](#-wireguard--interface--dport)
+* [`table`](#-wireguard--interface--table)
 * [`firewall_mark`](#-wireguard--interface--firewall_mark)
 * [`source_addresses`](#-wireguard--interface--source_addresses)
 * [`destination_addresses`](#-wireguard--interface--destination_addresses)
@@ -256,6 +257,14 @@ destination for firewall rules / where our wg instance will listen on. defaults
 
 Default value: `Integer(regsubst($title, '^\D+(\d+)$', '\1'))`
 
+##### <a name="-wireguard--interface--table"></a>`table`
+
+Data type: `Optional[String[1]]`
+
+Routing table to add routes to
+
+Default value: `undef`
+
 ##### <a name="-wireguard--interface--firewall_mark"></a>`firewall_mark`
 
 Data type: `Optional[Integer[0, 4294967295]]`

manifests/interface.pp

@@ -6,6 +6,7 @@
 # @param input_interface ethernet interface where the wireguard packages will enter the system, used for firewall rules
 # @param manage_firewall if true, a nftables rule will be created
 # @param dport destination for firewall rules / where our wg instance will listen on. defaults to the last digits from the title
+# @param table Routing table to add routes to
 # @param firewall_mark netfilter firewall mark to set on outgoing packages from this wireguard interface
 # @param source_addresses an array of ip addresses from where we receive wireguard connections
 # @param destination_addresses array of addresses where the remote peer connects to (our local ips), used for firewalling
@@ -101,6 +102,7 @@
   Array[Stdlib::IP::Address] $destination_addresses = delete_undef_values([$facts['networking']['ip'], $facts['networking']['ip6'],]),
   String[1] $interface = $title,
   Integer[1024, 65000] $dport = Integer(regsubst($title, '^\D+(\d+)$', '\1')),
+  Optional[String[1]] $table = undef,
   Optional[Integer[0, 4294967295]] $firewall_mark = undef,
   String[1] $input_interface = $facts['networking']['primary'],
   Boolean $manage_firewall = $facts['os']['family'] ? { 'Gentoo' => false, default => true },
@@ -334,6 +336,7 @@
         interface         => $interface,
         peers             => $peers + $peer,
         dport             => $dport,
+        table             => $table,
         firewall_mark     => $firewall_mark,
         addresses         => $addresses,
         preup_cmds        => $preup_cmds,

manifests/provider/systemd.pp

@@ -6,6 +6,7 @@
   Enum['present', 'absent'] $ensure = 'present',
   Wireguard::Peers $peers = [],
   Integer[1024, 65000] $dport = Integer(regsubst($title, '^\D+(\d+)$', '\1')),
+  Optional[String[1]] $table = undef,
   Optional[Integer[0,4294967295]] $firewall_mark = undef,
   Array[Hash[String,Variant[Stdlib::IP::Address::V4,Stdlib::IP::Address::V6]]] $addresses = [],
   Optional[String[1]] $description = undef,
@@ -25,6 +26,7 @@
     content         => epp("${module_name}/netdev.epp", {
         'interface'         => $interface,
         'dport'             => $dport,
+        'table'             => $table,
         'firewall_mark'     => $firewall_mark,
         'description'       => $description,
         'mtu'               => $mtu,

manifests/provider/wgquick.pp

@@ -6,6 +6,7 @@
   Enum['present', 'absent'] $ensure = 'present',
   Wireguard::Peers $peers = [],
   Integer[1024, 65000] $dport = Integer(regsubst($title, '^\D+(\d+)$', '\1')),
+  Optional[String[1]] $table = undef,
   Optional[Integer[0,4294967295]] $firewall_mark = undef,
   Array[Hash[String,Variant[Stdlib::IP::Address::V4,Stdlib::IP::Address::V6]]] $addresses = [],
   Array[String[1]] $preup_cmds = [],
@@ -19,6 +20,7 @@
   $params = {
     'interface'         => $interface,
     'dport'             => $dport,
+    'table'             => $table,
     'firewall_mark'     => $firewall_mark,
     'mtu'               => $mtu,
     'peers'             => $peers,

templates/netdev.epp

@@ -1,5 +1,6 @@
 <%- | String[1] $interface,
       Stdlib::Port $dport,
+      Optional[String[1]] $table,
       Optional[Integer] $firewall_mark,
       Wireguard::Peers $peers,
       Optional[String] $description,
@@ -21,6 +22,9 @@ MTUBytes=<%= $mtu %>
 [WireGuard]
 PrivateKeyFile=/etc/wireguard/<%= $interface %>
 ListenPort=<%= $dport %>
+<% if $table { -%>
+RouteTable=<%= $table %>
+<% } -%>
 <% if $firewall_mark { -%>
 FirewallMark=<%= $firewall_mark %>
 <% } -%>

templates/wireguard_conf.epp

@@ -1,6 +1,7 @@
 <%- |
     String[1] $interface,
     Stdlib::Port $dport,
+    Optional[String[1]] $table,
     Optional[Integer] $firewall_mark,
     Wireguard::Peers $peers,
     Array[Hash] $addresses,
@@ -20,6 +21,9 @@
 <% } -%>
 <% } -%>
 ListenPort=<%= $dport %>
+<% if $table { -%>
+Table=<%= $table %>
+<% } -%>
 <% if $firewall_mark { -%>
 FwMark=<%= $firewall_mark %>
 <% } -%>