Merge pull request #235 from invidian/add-openvpn-ifconfig-ipv6-support

client_specific_config: add support for ifconfig-ipv6-push
voxpupuli · Jul 3, 2019 · 63fc931 · 63fc931
2 parents f70882a + ae8e6c6
commit 63fc931
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/manifests/client_specific_config.pp b/manifests/client_specific_config.pp
@@ -8,6 +8,7 @@
 # @param iroute_ipv6 Array of IPv6 iroute combinations.
 # @param route  Array of route combinations pushed to client.
 # @param ifconfig IP configuration to push to the client.
+# @param ifconfig_ipv6 IPv6 configuration to push to the client.
 # @param dhcp_options DHCP options to push to the client.
 # @param redirect_gateway Redirect all traffic to gateway
 # @param ensure Sets the client specific configuration file status (present or absent)
@@ -27,6 +28,7 @@
   Array[String] $iroute_ipv6         = [],
   Array[String] $route               = [],
   Variant[Boolean, String] $ifconfig = false,
+  Optional[String[1]] $ifconfig_ipv6 = undef,
   Array[String]  $dhcp_options       = [],
   Boolean $redirect_gateway          = false,
 ) {

diff --git a/spec/defines/openvpn_client_specific_config_spec.rb b/spec/defines/openvpn_client_specific_config_spec.rb
@@ -42,6 +42,7 @@
             iroute: ['10.0.1.0 255.255.255.0'],
             iroute_ipv6: ['2001:db8:1234::/64'],
             ifconfig: '10.10.10.2 255.255.255.0',
+            ifconfig_ipv6: '2001:db8:0:123::2/64 2001:db8:0:123::1',
             route: ['10.200.100.0 255.255.255.0 10.10.10.1'],
             dhcp_options: ['DNS 8.8.8.8'],
             redirect_gateway: true
@@ -51,6 +52,7 @@
         it { is_expected.to contain_file('/etc/openvpn/test_server/client-configs/test_client').with_content(%r{^iroute 10.0.1.0 255.255.255.0$}) }
         it { is_expected.to contain_file('/etc/openvpn/test_server/client-configs/test_client').with_content(%r{^iroute-ipv6 2001:db8:1234::/64$}) }
         it { is_expected.to contain_file('/etc/openvpn/test_server/client-configs/test_client').with_content(%r{^ifconfig-push 10.10.10.2 255.255.255.0$}) }
+        it { is_expected.to contain_file('/etc/openvpn/test_server/client-configs/test_client').with_content(%r{^ifconfig-ipv6-push 2001:db8:0:123::2/64 2001:db8:0:123::1$}) }
         it { is_expected.to contain_file('/etc/openvpn/test_server/client-configs/test_client').with_content(%r{^push "dhcp-option DNS 8.8.8.8"$}) }
         it { is_expected.to contain_file('/etc/openvpn/test_server/client-configs/test_client').with_content(%r{^push "redirect-gateway def1"$}) }
         it { is_expected.to contain_file('/etc/openvpn/test_server/client-configs/test_client').with_content(%r{^push "route 10.200.100.0 255.255.255.0 10.10.10.1"$}) }

diff --git a/templates/client_specific_config.erb b/templates/client_specific_config.erb
@@ -7,6 +7,9 @@ iroute-ipv6 <%= iroute_ipv6 %>
 <% if ifconfig = @ifconfig -%>
 ifconfig-push <%= ifconfig %>
 <% end -%>
+<% if @ifconfig_ipv6 -%>
+ifconfig-ipv6-push <%= @ifconfig_ipv6 %>
+<% end -%>
 <% @dhcp_options.each do |option| -%>
 push "dhcp-option <%= option %>"
 <% end -%>