Replace deprecated IPForward with IPv{4,6}Forwarding

voxpupuli · Jul 12, 2024 · 62c052a · 62c052a
1 parent e69f10b
commit 62c052a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/manifests/provider/systemd.pp b/manifests/provider/systemd.pp
@@ -44,6 +44,7 @@
     'interface'       => $interface,
     'addresses'       => $addresses,
     'routes'          => $routes,
+    'systemd_version' => Integer($facts['systemd_version']),
   }
 
   systemd::network { "${interface}.network":

diff --git a/spec/fixtures/test_files/peers.network b/spec/fixtures/test_files/peers.network
@@ -6,7 +6,8 @@ Name=as1234
 [Network]
 DHCP=no
 IPv6AcceptRA=false
-IPForward=yes
+IPv4Forwarding=yes
+IPv6Forwarding=yes
 
 # for networkd >= 244 KeepConfiguration stops networkd from
 # removing routes on this interface when restarting

diff --git a/spec/fixtures/test_files/peers_routes.network b/spec/fixtures/test_files/peers_routes.network
@@ -6,7 +6,8 @@ Name=as1234
 [Network]
 DHCP=no
 IPv6AcceptRA=false
-IPForward=yes
+IPv4Forwarding=yes
+IPv6Forwarding=yes
 
 # for networkd >= 244 KeepConfiguration stops networkd from
 # removing routes on this interface when restarting

diff --git a/templates/network.epp b/templates/network.epp
@@ -2,6 +2,7 @@
     Array[Hash] $addresses,
     String[1] $interface,
     Array[Hash[String[1], Variant[String[1], Boolean]]] $routes,
+    Integer $systemd_version,
 | -%>
 # THIS FILE IS MANAGED BY PUPPET
 # based on https://dn42.dev/howto/wireguard
@@ -11,7 +12,12 @@ Name=<%= $interface %>
 [Network]
 DHCP=no
 IPv6AcceptRA=false
+<%- if $systemd_version < 256 -%>
 IPForward=yes
+<%- else -%>
+IPv4Forwarding=yes
+IPv6Forwarding=yes
+<%- end -%>
 
 # for networkd >= 244 KeepConfiguration stops networkd from
 # removing routes on this interface when restarting