From 6515b3608b5b89fcb9070695fa5979d68200b0d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C4=99stutis=20Mizara?= Date: Wed, 17 Aug 2016 11:43:03 +0000 Subject: [PATCH 1/2] Changed load paths for relative paths in firewalld_direct_purge.rb --- lib/puppet/type/firewalld_direct_purge.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/puppet/type/firewalld_direct_purge.rb b/lib/puppet/type/firewalld_direct_purge.rb index 083c6f8a..da3bd31c 100644 --- a/lib/puppet/type/firewalld_direct_purge.rb +++ b/lib/puppet/type/firewalld_direct_purge.rb @@ -1,8 +1,8 @@ require 'puppet' require 'puppet/parameter/boolean' -require 'puppet/type/firewalld_direct_chain' -require 'puppet/type/firewalld_direct_rule' -require 'puppet/type/firewalld_direct_passthrough' +require File.dirname(__FILE__).concat('/firewalld_direct_chain.rb') +require File.dirname(__FILE__).concat('/firewalld_direct_rule.rb') +require File.dirname(__FILE__).concat('/firewalld_direct_passthrough.rb') Puppet::Type.newtype(:firewalld_direct_purge) do From dbbacd9a266973de9f64a7063a83be6ab04a4041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C4=99stutis=20Mizara?= Date: Wed, 17 Aug 2016 13:22:33 +0000 Subject: [PATCH 2/2] Changed concat into join for require paths --- lib/puppet/type/firewalld_direct_purge.rb | 6 +++--- lib/puppet/type/firewalld_zone.rb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/puppet/type/firewalld_direct_purge.rb b/lib/puppet/type/firewalld_direct_purge.rb index da3bd31c..130bc923 100644 --- a/lib/puppet/type/firewalld_direct_purge.rb +++ b/lib/puppet/type/firewalld_direct_purge.rb @@ -1,8 +1,8 @@ require 'puppet' require 'puppet/parameter/boolean' -require File.dirname(__FILE__).concat('/firewalld_direct_chain.rb') -require File.dirname(__FILE__).concat('/firewalld_direct_rule.rb') -require File.dirname(__FILE__).concat('/firewalld_direct_passthrough.rb') +require File.join(File.dirname(__FILE__),'firewalld_direct_chain.rb') +require File.join(File.dirname(__FILE__),'firewalld_direct_rule.rb') +require File.join(File.dirname(__FILE__),'firewalld_direct_passthrough.rb') Puppet::Type.newtype(:firewalld_direct_purge) do diff --git a/lib/puppet/type/firewalld_zone.rb b/lib/puppet/type/firewalld_zone.rb index ba798635..288b9864 100644 --- a/lib/puppet/type/firewalld_zone.rb +++ b/lib/puppet/type/firewalld_zone.rb @@ -1,8 +1,8 @@ require 'puppet' require 'puppet/parameter/boolean' -require File.dirname(__FILE__).concat('/firewalld_rich_rule.rb') -require File.dirname(__FILE__).concat('/firewalld_service.rb') -require File.dirname(__FILE__).concat('/firewalld_port.rb') +require File.join(File.dirname(__FILE__),'firewalld_rich_rule.rb') +require File.join(File.dirname(__FILE__),'firewalld_service.rb') +require File.join(File.dirname(__FILE__),'firewalld_port.rb') Puppet::Type.newtype(:firewalld_zone) do