Getting rid of nodo_use_custom_packages variable

diff --git a/manifests/subsystems/utils/network.pp b/manifests/subsystems/utils/network.pp
index 976e3b5f7a872dda5aae12e9a81667767c440220..136f1c7847d3be4b7753cb551c032e1fd2da7dc0 100644 (file)
--- a/manifests/subsystems/utils/network.pp
+++ b/manifests/subsystems/utils/network.pp
@@ -41,13 +41,6 @@ class utils::network inherits utils::network::minimal {
     ensure => installed,
   }
 
-  # Custom: might not be available in the official repositories
-  if $nodo_use_custom_packages == true {
-    package { [ 'torchat' ]:
-      ensure => installed,
-    }
-  }
-
   # Squeeze (or newer) packages
   if $lsbdistcodename != 'lenny' {
     package { [ 'xul-ext-monkeysphere', 'chromium-browser', 'libical-parser-perl',
@@ -74,6 +67,10 @@ class utils::network inherits utils::network::minimal {
                 'xul-ext-requestpolicy' ]:
       ensure => installed,
     }
+
+    package { [ 'torchat' ]:
+      ensure => installed,
+    }
   }
 
   # Lenny only

diff --git a/manifests/subsystems/utils/security.pp b/manifests/subsystems/utils/security.pp
index c3e68a30e8b902595aca96dfe79eaf22dec396e3..ba332f319b27c9e79b4aee6f8293896e3e579183 100644 (file)
--- a/manifests/subsystems/utils/security.pp
+++ b/manifests/subsystems/utils/security.pp
@@ -5,9 +5,8 @@ class utils::security {
     ensure => installed,
   }
 
-  # Custom: might not be available in the official repositories
-  if $nodo_use_custom_packages == true {
-    package { [ 'kedpm' ]:
+  if $lsbdistcodename != 'squeeze' {
+    package { [ 'kedpm', 'kedpm-gtk' ]:
       ensure => installed,
     }
   }