Commit a314d787 authored by Nathan Ward's avatar Nathan Ward Committed by Nathan Ward
Browse files

Update calls to the firewall module with modern parameters

parent 93b3c83e

manifests/client.pp

+7 −6
Original line number Diff line number Diff line
@@ -63,15 +63,16 @@ define freeradius::client ( 
        firewall { "100 ${name} ${port_description} v4":

          proto    => 'udp',

          dport    => $port,

          action => 'accept',

          jump     => 'ACCEPT',

          protocol => 'IPv4',

          source   => $ip,

        }

      } elsif $ip6 {

        firewall { "100 ${name} ${port_description} v6":

          proto    => 'udp',

          dport    => $port,

          action   => 'accept',

          provider => 'ip6tables',

          jump     => 'ACCEPT',

          protocol => 'IPv6',

          source   => $ip6,

        }

      }

spec/defines/client_spec.rb

+7 −6
Original line number Diff line number Diff line
@@ -85,8 +85,9 @@ describe 'freeradius::client' do 
        is_expected.to contain_firewall('100 test 1234 v4')

          .with_proto('udp')

          .with_dport(1234)

          .with_action('accept')

          .with_jump('ACCEPT')

          .with_source('1.2.3.4')

          .with_protocol('IPv4')

      end



      context 'with ipv6' do
@@ -102,9 +103,9 @@ describe 'freeradius::client' do 
          is_expected.to contain_firewall('100 test 1234 v6')

            .with_proto('udp')

            .with_dport(1234)

            .with_action('accept')

            .with_jump('ACCEPT')

            .with_source('2001:db8::100')

            .with_provider('ip6tables')

            .with_protocol('IPv6')

        end

      end

    end
@@ -120,7 +121,7 @@ describe 'freeradius::client' do 
        is_expected.to contain_firewall('100 test 1234,4321 v4')

          .with_proto('udp')

          .with_dport([1234, 4321])

          .with_action('accept')

          .with_jump('ACCEPT')

          .with_source('1.2.3.4')

      end
@@ -137,9 +138,9 @@ describe 'freeradius::client' do 
          is_expected.to contain_firewall('100 test 1234,4321 v6')

            .with_proto('udp')

            .with_dport([1234, 4321])

            .with_action('accept')

            .with_jump('ACCEPT')

            .with_source('2001:db8::100')

            .with_provider('ip6tables')

            .with_protocol('IPv6')

        end

      end

    end