aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-09-24 10:33:36 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-09-24 10:33:36 -0300
commitf5c61d72cd4ffebb494e816f8abe9579fde8e9fe (patch)
treeb3d45ed63c8e8ec5b14f9102fa90fe76ef0e0b28 /manifests
parent6a8316b476a97925fbeb39299e93bab19d5836b4 (diff)
downloadpuppet-nodo-f5c61d72cd4ffebb494e816f8abe9579fde8e9fe.tar.gz
puppet-nodo-f5c61d72cd4ffebb494e816f8abe9579fde8e9fe.tar.bz2
Updates utils
Diffstat (limited to 'manifests')
-rw-r--r--manifests/utils/development/puppet.pp2
-rw-r--r--manifests/utils/multimedia.pp2
-rw-r--r--manifests/utils/multimedia/minimal.pp11
-rw-r--r--manifests/utils/personal.pp4
4 files changed, 5 insertions, 14 deletions
diff --git a/manifests/utils/development/puppet.pp b/manifests/utils/development/puppet.pp
index 7bda1c5..e5aac1b 100644
--- a/manifests/utils/development/puppet.pp
+++ b/manifests/utils/development/puppet.pp
@@ -1,7 +1,7 @@
class nodo::utils::development::puppet {
package { [
'puppet-lint',
- 'ruby-hiera-puppet',
+ 'hiera-eyaml',
]:
ensure => installed,
}
diff --git a/manifests/utils/multimedia.pp b/manifests/utils/multimedia.pp
index e4b23b5..23a8a66 100644
--- a/manifests/utils/multimedia.pp
+++ b/manifests/utils/multimedia.pp
@@ -8,6 +8,7 @@ class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal {
'cbrpager',
'pavucontrol',
'jhead',
+ 'xine-ui',
#'alsa-tools-gui',
#'v4l-utils',
#'gstreamer-tools',
@@ -19,7 +20,6 @@ class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal {
#'darksnow',
#'ffmpeg2theora',
#'netpbm',
- #'xine-ui',
#'audacious',
#'qjackctl',
#'easytag',
diff --git a/manifests/utils/multimedia/minimal.pp b/manifests/utils/multimedia/minimal.pp
index d779524..3459daa 100644
--- a/manifests/utils/multimedia/minimal.pp
+++ b/manifests/utils/multimedia/minimal.pp
@@ -3,17 +3,8 @@ class nodo::utils::multimedia::minimal {
'alsa-utils',
'mpg123',
'mediainfo',
+ 'mplayer2',
]:
ensure => installed,
}
-
- package { [
- 'mplayer',
- ]:
- ensure => present,
- name => $::lsbdistcodename ? {
- 'wheezy' => 'mplayer',
- default => 'mplayer2',
- },
- }
}
diff --git a/manifests/utils/personal.pp b/manifests/utils/personal.pp
index 5202216..83fa7bc 100644
--- a/manifests/utils/personal.pp
+++ b/manifests/utils/personal.pp
@@ -1,8 +1,8 @@
-# Common utilities for personal
+# Common utilities for personal computers
class nodo::utils::personal {
case $::operatingsystem {
debian: {
- include nodo::utils::personal::debian
+ include nodo::utils::bundle::debian
}
default: { }
}