aboutsummaryrefslogtreecommitdiff
path: root/manifests/utils/desktop
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-31 12:54:09 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-31 12:54:09 -0300
commit2b667cbc26b5f0f3b4a6be1555b605004b84fdbe (patch)
treee52a0586c93613f9b0a159cc191e73badfea4b5b /manifests/utils/desktop
parent3f0d8e30642dbe7d669300cceff8909ac5d0478c (diff)
downloadpuppet-nodo-2b667cbc26b5f0f3b4a6be1555b605004b84fdbe.tar.gz
puppet-nodo-2b667cbc26b5f0f3b4a6be1555b605004b84fdbe.tar.bz2
Simplify wicd/network-manager handling
Diffstat (limited to 'manifests/utils/desktop')
-rw-r--r--manifests/utils/desktop/gnome.pp17
1 files changed, 0 insertions, 17 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,
- }
- }
}