Merge remote-tracking branch 'varac/master'

Conflicts:
	files/boilerplate/providers.footer
	files/boilerplate/providers.header
	manifests/base.pp
	manifests/providers.pp

diff --cc manifests/init.pp
index 580dc8cda13806c47dbf46a8b85c68ad19c7d060,0bdc50dcfdebe631931b17a75f6404f1831801a3..63e6fd380ad85c47c5ecaf93cbd2c79fc514fc6a
--- 1/manifests/init.pp
--- 2/manifests/init.pp
+++ b/manifests/init.pp
@@@ -58,9 -71,8 +58,12 @@@ class shorewall
    shorewall::managed_file { tcrules: }
    # See http://www.shorewall.net/3.0/traffic_shaping.htm
    shorewall::managed_file { tcclasses: }
 +  # http://www.shorewall.net/manpages/shorewall-providers.html
 +  shorewall::managed_file { providers: }
 +  # See http://www.shorewall.net/manpages/shorewall-tunnels.html
 +  shorewall::managed_file { tunnel: }
    
+   shorewall::managed_file { rtrules: }
+   shorewall::managed_file { providers: }
+   
  }

diff --cc manifests/providers.pp
index a02a49468ba0bdf7c4e42cce80538703935c496f,d17924789f0b08fec7e8ab9e190c246d4209efc9..a1f8726a25e3ac543e4283c50c30df87657548d8
--- 1/manifests/providers.pp
--- 2/manifests/providers.pp
+++ b/manifests/providers.pp
@@@ -1,16 -1,13 +1,16 @@@
++# manage providers
  define shorewall::providers(
-     $provider,
-     $number = '',
-     $mark = '',
-     $duplicate = 'main',
-     $interface = '',
-     $gateway = '',
-     $options = '',
 -    $number,
 -    $mark,
 -    $duplicate = '-',
 -    $interface,
 -    $gateway,
 -    $options = '-',
--    $copy = '',
-     $order='100'
++  $provider   = $name,
++  $number     = '',
++  $mark       = '',
++  $duplicate  = 'main',
++  $interface  = '',
++  $gateway    = '',
++  $options    = '',
++  $copy       = '',
++  $order      = '100'
  ){
-     shorewall::entry{"providers-${order}-${name}":
-         line => "# ${name}\n${provider} ${number} ${mark} ${duplicate} ${interface} ${gateway} ${options} ${copy}"
 -    shorewall::entry { "providers.d/${mark}-${title}":
 -        line => "${name} ${number} ${mark} ${duplicate} ${interface} ${gateway} ${options} ${copy}",
--    }
++  shorewall::entry{"providers-${order}-${name}":
++    line => "# ${name}\n${provider} ${number} ${mark} ${duplicate} ${interface} ${gateway} ${options} ${copy}"
++  }
  }
-