diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-08-25 19:15:37 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-08-25 19:15:37 -0300 |
| commit | eab48bc8d50da549cd4be07d7ede5b25cd876c42 (patch) | |
| tree | b4b9a7416e03d9a2660cb4ab7f13eaa126e2aa4f /manifests/utils/network | |
| parent | 8565e440c848b2987f7784cf153fb7a4620b1fab (diff) | |
| parent | a3c60b8a5d1caeb6e8f8a6828bdb2ea7b0ff2759 (diff) | |
| download | puppet-nodo-eab48bc8d50da549cd4be07d7ede5b25cd876c42.tar.gz puppet-nodo-eab48bc8d50da549cd4be07d7ede5b25cd876c42.tar.bz2 | |
Merge branch 'master' into develop
Diffstat (limited to 'manifests/utils/network')
| -rw-r--r-- | manifests/utils/network/analyzer.pp | 2 | ||||
| -rw-r--r-- | manifests/utils/network/irssi.pp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/manifests/utils/network/analyzer.pp b/manifests/utils/network/analyzer.pp index 8ceffcc..4d19c43 100644 --- a/manifests/utils/network/analyzer.pp +++ b/manifests/utils/network/analyzer.pp @@ -1,5 +1,5 @@ class nodo::utils::network::analyzer { - package { [ 'tshark', 'arping', 'fping', 'oping', 'tcptraceroute', 'tcpstat' ]: + package { [ 'tshark', 'arping', 'fping', 'oping', 'tcptraceroute', 'tcpstat', 'iperf' ]: ensure => installed, } diff --git a/manifests/utils/network/irssi.pp b/manifests/utils/network/irssi.pp index 08df04a..e0a94b5 100644 --- a/manifests/utils/network/irssi.pp +++ b/manifests/utils/network/irssi.pp @@ -20,7 +20,8 @@ class nodo::utils::network::irssi { package { 'irssi-plugin-silc': ensure => $::lsbdistcodename ? { 'wheezy' => absent, - default => present, + 'jessie' => absent, + default => absent, } } } |