Skip to content

Replace deprecated IPForward with IPv{4,6}Forwarding #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hashworks wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −2
Open

Replace deprecated IPForward with IPv{4,6}Forwarding #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions manifests/provider/systemd.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
'interface' => $interface,
'addresses' => $addresses,
'routes' => $routes,
'systemd_version' => Integer($facts['systemd_version']),
}

systemd::network { "${interface}.network":
Expand Down
3 changes: 2 additions & 1 deletion spec/fixtures/test_files/peers.network
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion spec/fixtures/test_files/peers_routes.network
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions templates/network.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -11,7 +12,12 @@ Name=<%= $interface %>
[Network]
DHCP=no
IPv6AcceptRA=false
<%- if $systemd_version < 256 { -%>
IPForward=yes
<%- } else { -%>
IPv4Forwarding=yes
IPv6Forwarding=yes
<%- } -%>

# for networkd >= 244 KeepConfiguration stops networkd from
# removing routes on this interface when restarting
Expand Down