switch to firewall module

manifests/init.pp

@@ -4,11 +4,10 @@
 #
 # install and manage imapproxy
 class imapproxy (
-  $merged_options   = lookup('imapproxy::options', Hash, 'hash', {}),
-  $manage_shorewall = false,
-  $manage_monit     = false,
+  $merged_options  = lookup('imapproxy::options', Hash, 'hash', {}),
+  $manage_firewall = false,
+  $manage_monit    = false,
 ) {
-
   $default_options = {
     'server_hostname'     => "imap.${::domain}",
     'listen_address'      => '127.0.0.1',
@@ -20,14 +19,14 @@ class imapproxy (
   $real_options = merge($default_options,$merged_options)
 
   case $facts['operatingsystem'] {
-    'Gentoo': { include ::imapproxy::gentoo }
-    default: { include ::imapproxy::base }
+    'Gentoo': { include imapproxy::gentoo }
+    default: { include imapproxy::base }
   }
 
-  if $manage_shorewall {
-    include ::shorewall::rules::out::imap
+  if $manage_firewall {
+    include firewall::rules::out::imap
   }
   if $manage_monit {
-    include ::imapproxy::monit
+    include imapproxy::monit
   }
 }