aboutsummaryrefslogtreecommitdiff
path: root/manifests/utils
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/utils')
-rw-r--r--manifests/utils/desktop/gnome.pp17
-rw-r--r--manifests/utils/laptop/debian.pp25
-rw-r--r--manifests/utils/network/wicd.pp5
3 files changed, 5 insertions, 42 deletions
diff --git a/manifests/utils/desktop/gnome.pp b/manifests/utils/desktop/gnome.pp
index a853530..3542f34 100644
--- a/manifests/utils/desktop/gnome.pp
+++ b/manifests/utils/desktop/gnome.pp
@@ -2,21 +2,4 @@ class nodo::utils::desktop::gnome {
package { [ 'gnome', 'gnome-backgrounds' ]:
ensure => installed,
}
-
- $network_manager = hiera('nodo::utils::laptop::debian::network_manager', 'installed')
-
- # Network manager is a gnome dependency and we should disable it if the machine
- # is using gnome but other networking tool to avoid conflicts.
- if ($network_manager == 'absent') {
- service { 'network-manager':
- ensure => stopped,
- enable => false,
- }
- }
- else {
- service { 'network-manager':
- ensure => running,
- enable => true,
- }
- }
}
diff --git a/manifests/utils/laptop/debian.pp b/manifests/utils/laptop/debian.pp
index 948a34c..e42b999 100644
--- a/manifests/utils/laptop/debian.pp
+++ b/manifests/utils/laptop/debian.pp
@@ -13,29 +13,4 @@ class nodo::utils::laptop::debian {
'tcpdump', 'tshark' ]:
ensure => installed,
}
-
- $wicd = hiera('nodo::utils::laptop::debian::wicd', 'installed')
- $network_manager = hiera('nodo::utils::laptop::debian::network_manager', 'absent')
-
- # Wicd
- package { [ 'wicd', 'wicd-curses', 'wicd-gtk' ]:
- ensure => $wicd,
- }
-
- # Network manager
- package { 'network-manager':
- ensure => $::lsbdistcodename ? {
- 'squeeze' => absent,
- default => $network_manager,
- }
- }
-
- # Squeeze specific packages
- package { [ 'kismet' ]:
- ensure => $::lsbdistcodename ? {
- 'squeeze' => installed,
- default => absent,
- }
- }
-
}
diff --git a/manifests/utils/network/wicd.pp b/manifests/utils/network/wicd.pp
new file mode 100644
index 0000000..cb19af3
--- /dev/null
+++ b/manifests/utils/network/wicd.pp
@@ -0,0 +1,5 @@
+class nodo::utils::network::wicd {
+ package { [ 'wicd', 'wicd-curses', 'wicd-gtk' ]:
+ ensure => installed,
+ }
+}