Merge remote-tracking branch 'sarava/master'

Conflicts:
	manifests/base.pp
	manifests/init.pp

diff --cc manifests/base.pp
index 937b83ba56d088b19248cbfe2e757d393cc1c1e0,be3b1f693d4ef4aabae3cbe29ab1238c7df14608..97f94f5ee9a381868b99a34eaa5e56bc1d4b6ec9
--- 1/manifests/base.pp
--- 2/manifests/base.pp
+++ b/manifests/base.pp
@@@ -1,6 -1,10 +1,7 @@@
  class shorewall::base {
 -    case $shorewall_ensure_version {
 -      '': { $shorewall_ensure_version = 'present' }
 -    }
+ 
      package { 'shorewall':
--        ensure => $shorewall_ensure_version,
++        ensure => $shorewall::ensure_version,
      }
  
      # This file has to be managed in place, so shorewall can find it

diff --cc manifests/init.pp
index 3b4b3b26a17d7866106e68a58334796f9ccfb99a,57dbeac19becc670bf48236288a45681b972d421..580dc8cda13806c47dbf46a8b85c68ad19c7d060
--- 1/manifests/init.pp
--- 2/manifests/init.pp
+++ b/manifests/init.pp
@@@ -1,8 -1,9 +1,15 @@@
 -class shorewall { 
 -
 -  include common::moduledir
 -  module_dir { "shorewall": }
 +class shorewall(
-   $startup = '1'
++  $startup                    = '1',
++  $ensure_version             = 'present',
++  $tor_transparent_proxy_host = '127.0.0.1',
++  $tor_transparent_proxy_port = '9040',
++  $tor_user                   = $::operatingsystem ? {
++    'Debian' => 'debian-tor',
++    default  => 'tor'
++  }
 +) {
  
 -  case $operatingsystem {
 +  case $::operatingsystem {
      gentoo: { include shorewall::gentoo }
      debian: {
        include shorewall::debian
@@@ -21,19 -22,25 +28,6 @@@
      }
    }
  
--  case $tor_transparent_proxy_host {
--    '': { $tor_transparent_proxy_host = '127.0.0.1' }
--  }
--  case $tor_transparent_proxy_port {
--    '': { $tor_transparent_proxy_port = '9040' }
--  }
--  if $tor_user == '' {
--    $tor_user = $dist_tor_user ? {
--      ''      => 'tor',
--      default => $dist_tor_user,
--    }
 -  }
 -
 -  file {"/var/lib/puppet/modules/shorewall":
 -    ensure => directory,
 -    force => true,
 -    owner => root, group => 0, mode => 0755; 
--  }
--
    # See http://www.shorewall.net/3.0/Documentation.htm#Zones
    shorewall::managed_file{ zones: }
    # See http://www.shorewall.net/3.0/Documentation.htm#Interfaces
@@@ -64,6 -71,7 +58,9 @@@
    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: }
+   
  }