From: mh <mh@immerda.ch>
Date: Wed, 2 Jan 2013 18:34:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'varac/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=58103ed409fc61d8e653babb73fcaf510969f3db;p=puppet-shorewall.git

Merge remote-tracking branch 'varac/master'

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

58103ed409fc61d8e653babb73fcaf510969f3db
diff --cc manifests/init.pp
index 580dc8c,0bdc50d..63e6fd3
--- a/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 a02a494,d179247..a1f8726
--- a/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}"
++  }
  }
-