From: intrigeri <intrigeri@boum.org>
Date: Sun, 11 Nov 2012 22:12:41 +0000 (+0100)
Subject: Merge branch 'feature/torification-exception' into old-master
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e31f901dc4a40b87611871d0cd783bbcec1ba4ed;p=puppet-shorewall.git

Merge branch 'feature/torification-exception' into old-master
---

e31f901dc4a40b87611871d0cd783bbcec1ba4ed
diff --cc manifests/init.pp
index 3b4b3b2,e5456d0..dd28767
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@@ -33,7 -34,17 +33,11 @@@ class shorewall
        default => $dist_tor_user,
      }
    }
+   case $non_torified_users {
+     '': { $non_torified_users = [] }
+   }
+   $real_non_torified_users = uniq_flatten([ $tor_user, $non_torified_users ])
  
 -  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