Browse files

Merge branch 'master' of github.com:MostAwesomeDude/puppet

  • Loading branch information...
2 parents 5704876 + a7a9bb4 commit acbeac362554b375d7b20b45ae0c20ce95e23a0e @mythmon mythmon committed Apr 4, 2012
Showing with 29 additions and 13 deletions.
  1. +1 −0 manifests/nodes/ivy.pp
  2. +9 −0 modules/midi/manifests/init.pp
  3. +6 −0 modules/midi/manifests/params.pp
  4. +13 −13 modules/users/manifests/simpson.pp
View
1 manifests/nodes/ivy.pp
@@ -6,6 +6,7 @@
# CLI Apps
include bash
+ include midi
# GUI Apps
include awesome
View
9 modules/midi/manifests/init.pp
@@ -0,0 +1,9 @@
+class midi {
+ include midi::params
+ package { "fluidsynth":
+ ensure => present,
+ }
+ package { "${midi::params::timidity_package}":
+ ensure => present,
+ }
+}
View
6 modules/midi/manifests/params.pp
@@ -0,0 +1,6 @@
+class midi::params {
+ $timidity_package = $::operatingsystem ? {
+ /Fedora/ => "timidity++",
+ default => "timidity",
+ }
+}
View
26 modules/users/manifests/simpson.pp
@@ -1,21 +1,21 @@
class users::simpson {
- $username = "simpson"
+ $username = "simpson"
user { "${username}":
- ensure => present,
- home => "/home/${username}",
- gid => "users",
- groups => ['users', 'wheel'],
- managehome => true,
- shell => '/bin/bash',
+ ensure => present,
+ home => "/home/${username}",
+ gid => "users",
+ groups => ['users', 'wheel'],
+ managehome => true,
+ shell => '/bin/bash',
}
- include fonts::inconsolata
+ include fonts::inconsolata
- vim::user_config { "${username}":
- template => "users/simpson/vimrc.erb",
- }
+ vim::user_config { "${username}":
+ template => "users/simpson/vimrc.erb",
+ }
- ruby::dev::user_config { "${username}": }
- puppet::dev::user_config { "${username}": }
+ ruby::dev::user_config { "${username}": }
+ puppet::dev::user_config { "${username}": }
}

0 comments on commit acbeac3

Please sign in to comment.