diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/subsystem/network/manager.pp | 3 | ||||
| -rw-r--r-- | manifests/subsystem/network/manager/macchanger.pp | 2 | ||||
| -rw-r--r-- | manifests/utils/android.pp | 4 | ||||
| -rw-r--r-- | manifests/utils/physical.pp | 2 | ||||
| -rw-r--r-- | manifests/utils/virtual.pp | 3 |
5 files changed, 8 insertions, 6 deletions
diff --git a/manifests/subsystem/network/manager.pp b/manifests/subsystem/network/manager.pp index 3b7a7cf..92bb5c3 100644 --- a/manifests/subsystem/network/manager.pp +++ b/manifests/subsystem/network/manager.pp @@ -8,7 +8,8 @@ class nodo::subsystem::network::manager ( ensure => $ensure, } - service { 'network-manager': + service { 'NetworkManager': + enable => true, ensure => running, require => Package['network-manager'], } diff --git a/manifests/subsystem/network/manager/macchanger.pp b/manifests/subsystem/network/manager/macchanger.pp index 248ac7f..3e0878f 100644 --- a/manifests/subsystem/network/manager/macchanger.pp +++ b/manifests/subsystem/network/manager/macchanger.pp @@ -13,6 +13,6 @@ class nodo::subsystem::network::manager::macchanger inherits nodo::subsystem::ne mode => '0644', source => 'puppet:///modules/nodo/etc/NetworkManager/conf.d/00-macchanger.conf', require => Package['network-manager'], - notify => Service['network-manager'], + notify => Service['NetworkManager'], } } diff --git a/manifests/utils/android.pp b/manifests/utils/android.pp index fcd85ad..984fe58 100644 --- a/manifests/utils/android.pp +++ b/manifests/utils/android.pp @@ -2,8 +2,8 @@ class nodo::utils::android ( $ensure = 'installed', ) { package { [ - 'android-tools-adb', - 'android-tools-fastboot', + 'adb', + 'fastboot', ]: ensure => $ensure, } diff --git a/manifests/utils/physical.pp b/manifests/utils/physical.pp index e91e743..bccb28a 100644 --- a/manifests/utils/physical.pp +++ b/manifests/utils/physical.pp @@ -9,7 +9,7 @@ class nodo::utils::physical ( 'ethtool', 'parted', 'iftop', - 'iptraf', + 'iptraf-ng', 'htop', 'sdparm', 'iotop', diff --git a/manifests/utils/virtual.pp b/manifests/utils/virtual.pp index f207bfd..2944060 100644 --- a/manifests/utils/virtual.pp +++ b/manifests/utils/virtual.pp @@ -4,7 +4,8 @@ class nodo::utils::virtual ( package { [ # For running virtual machines 'qemu', - 'qemu-kvm', + #'qemu-kvm', + 'qemu-system-x86', 'libguestfs-tools', #'virtualbox-guest-additions-iso', |