Adding class firewall::cups and package hplip

diff --git a/manifests/subsystems/firewall.pp b/manifests/subsystems/firewall.pp
index 75549ac09ae9cd36a9e134c142da080b318cc22b..223990793a7ec4ae9e33a0ab5d4d32d4bc50f254 100644 (file)
--- a/manifests/subsystems/firewall.pp
+++ b/manifests/subsystems/firewall.pp
@@ -281,3 +281,15 @@ class firewall::wifi {
     order     => '1',
   }
 }
+
+class firewall::cups {
+  shorewall::rule { "cups":
+    action          => 'ACCEPT',
+    source          => 'net',
+    destination     => '$FW',
+    proto           => 'tcp',
+    destinationport => "631",
+    ratelimit       => '-',
+    order           => "200",
+  }
+}

diff --git a/manifests/subsystems/utils.pp b/manifests/subsystems/utils.pp
index 93636a2302932c6189c34bd345b0d52da182519b..ae4b0f0ee5006f4c4591c42498cc69cd13851fb5 100644 (file)
--- a/manifests/subsystems/utils.pp
+++ b/manifests/subsystems/utils.pp
@@ -58,7 +58,7 @@ class utils::personal {
 
   case $operatingsystem {
     debian: { 
-      package { [ 'mozilla-firefox-adblock', 'iceweasel', 'sun-java6-jre', ]:
+      package { [ 'mozilla-firefox-adblock', 'iceweasel', 'sun-java6-jre', 'hplip', ]:
         ensure => installed,
       }
     }