diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-24 22:47:11 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-24 22:47:11 -0200 |
| commit | d8a88745166b4569d6fad9468e0cd3e3750e05d3 (patch) | |
| tree | 634f04b9ee03347378d0d1997002e5dd330627ac | |
| parent | 611e45deeeef7afac139f1e4c71400df8c2154d2 (diff) | |
| download | puppet-nodo-d8a88745166b4569d6fad9468e0cd3e3750e05d3.tar.gz puppet-nodo-d8a88745166b4569d6fad9468e0cd3e3750e05d3.tar.bz2 | |
Getting rid of nodo_use_custom_packages variable
| -rw-r--r-- | manifests/subsystems/utils/network.pp | 11 | ||||
| -rw-r--r-- | manifests/subsystems/utils/security.pp | 5 |
2 files changed, 6 insertions, 10 deletions
diff --git a/manifests/subsystems/utils/network.pp b/manifests/subsystems/utils/network.pp index 976e3b5..136f1c7 100644 --- 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 c3e68a3..ba332f3 100644 --- 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, } } |