diff --git a/.fixtures.yml b/.fixtures.yml index cad7cab..856421d 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,11 +1,7 @@ fixtures: repositories: - firewall: - repo: 'https://github.com/puppetlabs/puppetlabs-firewall.git' - ref: 'v6.0.0' + firewall: 'https://github.com/puppetlabs/puppetlabs-firewall.git' stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib.git' svcprop: 'https://github.com/bolthole/puppet-svcprop.git' selinux: 'https://github.com/voxpupuli/puppet-selinux.git' - systemd: - repo: 'https://github.com/camptocamp/puppet-systemd.git' - ref: '2.12.0' + systemd: 'https://github.com/camptocamp/puppet-systemd.git' diff --git a/manifests/init.pp b/manifests/init.pp index 6883aa4..f5bc09c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -101,16 +101,16 @@ if $facts['kernel'] == 'Linux' and $manage_firewall { firewall { "100_tcp_${tcp_port}_for_memcached": - dport => $tcp_port, - proto => 'tcp', - action => 'accept', + dport => $tcp_port, + proto => 'tcp', + jump => 'accept', } if $udp_port != 0 { firewall { "100_udp_${udp_port}_for_memcached": - dport => $udp_port, - proto => 'udp', - action => 'accept', + dport => $udp_port, + proto => 'udp', + jump => 'accept', } } } diff --git a/manifests/instance.pp b/manifests/instance.pp index c973d5c..4315f5e 100644 --- a/manifests/instance.pp +++ b/manifests/instance.pp @@ -26,9 +26,9 @@ $service_name = "memcached@${port}.service" if $manage_firewall { firewall { "100_tcp_${port}_for_memcached": - dport => $port, - proto => 'tcp', - action => 'accept', + dport => $port, + proto => 'tcp', + jump => 'accept', } }