Minor merge fixes

diff --git a/manifests/init.pp b/manifests/init.pp
index abe731d2ffcbcab2801ddf1105ea285687294ebf..7491dee1edde57ea5bafcf99c924ba1dcd275a33 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -6,8 +6,8 @@ class firewall(
   $in_bandwidth    = hiera('firewall::in_bandwidth',   '100mbit'),
   $out_bandwidth   = hiera('firewall::out_bandwidth',  '100mbit'),
   $device_options  = hiera('firewall::device_options', 'tcpflags,blacklist,routefilter,nosmurfs,logmartians'),
-  $vm_address      = hiera('firewall::vm_address', '192.168.0.0/24'),
-  $vm_device       = hiera('firewall::vm_device', false)
+  $vm_address      = hiera('firewall::vm_address',     '192.168.0.0/24'),
+  $vm_device       = hiera('firewall::vm_device',      false)
 ) {
   class { 'shorewall': }
 
@@ -86,7 +86,7 @@ class firewall(
   # Hosts
   #
   $real_subnet_device = $vm_device ? {
-    false => $device,
+    false   => $device,
     default => $vm_device,
   }
 
@@ -107,7 +107,7 @@ class firewall(
   }
 
   $real_masq_interface = $vm_device ? {
-    false => "${device}!${vm_address}",
+    false   => "${device}:!${vm_address}",
     default => "${device}",
   }