Merge pull request #80 from vilkasx/change_to_relative_paths

Changed load paths for relative paths in firewalld_direct_purge.rb
voxpupuli · Aug 17, 2016 · 50772f7 · 50772f7
2 parents e44115e + dbbacd9
commit 50772f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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.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
@@ -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