diff options
Diffstat (limited to 'manifests/utils')
-rw-r--r-- | manifests/utils/development/virtual.pp | 2 | ||||
-rw-r--r-- | manifests/utils/laptop.pp | 2 | ||||
-rw-r--r-- | manifests/utils/laptop/debian.pp | 4 | ||||
-rw-r--r-- | manifests/utils/network/wicd.pp | 11 | ||||
-rw-r--r-- | manifests/utils/personal.pp | 2 |
5 files changed, 5 insertions, 16 deletions
diff --git a/manifests/utils/development/virtual.pp b/manifests/utils/development/virtual.pp index dae3525..59f3984 100644 --- a/manifests/utils/development/virtual.pp +++ b/manifests/utils/development/virtual.pp @@ -1,7 +1,6 @@ class nodo::utils::development::virtual inherits nodo::utils::virtual { package { [ # For development with virtual machines and containers - 'vagrant', #'vagrant-libvirt', #'docker.io', #'packer', @@ -22,6 +21,7 @@ class nodo::utils::development::virtual inherits nodo::utils::virtual { # Discontinued # https://lists.debian.org/msgid-search/aeb59515ee63c658e40927a401fd1b200747a168.camel@liw.fi package { [ + 'vagrant', 'vmdebootstrap', ]: ensure => absent, diff --git a/manifests/utils/laptop.pp b/manifests/utils/laptop.pp index 9a27368..3969d89 100644 --- a/manifests/utils/laptop.pp +++ b/manifests/utils/laptop.pp @@ -1,7 +1,7 @@ # Common utilities for laptop class nodo::utils::laptop { case $::operatingsystem { - debian: { + debian: { include nodo::utils::laptop::debian } default: { } diff --git a/manifests/utils/laptop/debian.pp b/manifests/utils/laptop/debian.pp index 6688542..bf180c3 100644 --- a/manifests/utils/laptop/debian.pp +++ b/manifests/utils/laptop/debian.pp @@ -39,12 +39,12 @@ class nodo::utils::laptop::debian { # Misc #package { [ - # 'module-assistant', + # 'module-assistant', # 'ekiga', # 'mumble', # 'usb-modeswitch', # 'gnokii', - # 'sharutils', + # 'sharutils', #]: # ensure => installed, #} diff --git a/manifests/utils/network/wicd.pp b/manifests/utils/network/wicd.pp deleted file mode 100644 index 86af12a..0000000 --- a/manifests/utils/network/wicd.pp +++ /dev/null @@ -1,11 +0,0 @@ -class nodo::utils::network::wicd ( - $ensure = 'installed', -) { - package { [ - 'wicd', - 'wicd-curses', - #'wicd-gtk', - ]: - ensure => $ensure, - } -} diff --git a/manifests/utils/personal.pp b/manifests/utils/personal.pp index 83fa7bc..a7de82c 100644 --- a/manifests/utils/personal.pp +++ b/manifests/utils/personal.pp @@ -1,7 +1,7 @@ # Common utilities for personal computers class nodo::utils::personal { case $::operatingsystem { - debian: { + debian: { include nodo::utils::bundle::debian } default: { } |