diff options
author | Jesse Luehrs <doy@tozt.net> | 2018-10-09 01:31:51 -0400 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2018-10-09 01:31:51 -0400 |
commit | 4f83c1174738781ffdfcc79ce9f020071a3e976a (patch) | |
tree | d06534c2a4c053f876e252a41070cb614138e82e /modules | |
parent | ebfcb6ab37555a022aba2edb7704668c22b6b150 (diff) | |
download | puppet-tozt-4f83c1174738781ffdfcc79ce9f020071a3e976a.tar.gz puppet-tozt-4f83c1174738781ffdfcc79ce9f020071a3e976a.zip |
rename for consistency
Diffstat (limited to 'modules')
-rw-r--r-- | modules/conf/manifests/deps.pp | 15 | ||||
-rw-r--r-- | modules/conf/manifests/init.pp | 62 | ||||
-rw-r--r-- | modules/conf/manifests/user.pp | 53 | ||||
-rw-r--r-- | modules/tozt/manifests/user.pp | 3 |
4 files changed, 66 insertions, 67 deletions
diff --git a/modules/conf/manifests/deps.pp b/modules/conf/manifests/deps.pp deleted file mode 100644 index 96857b8..0000000 --- a/modules/conf/manifests/deps.pp +++ /dev/null @@ -1,15 +0,0 @@ -class conf::deps { - include c_toolchain - include cron - include git - - package { - [ - "cmake", - "fortune-mod", - "less", - "vim", - ]: - ensure => installed, - } -} diff --git a/modules/conf/manifests/init.pp b/modules/conf/manifests/init.pp index 5a52b5d..36e5f22 100644 --- a/modules/conf/manifests/init.pp +++ b/modules/conf/manifests/init.pp @@ -1,53 +1,15 @@ -define conf($user=$name, $home=undef) { - $_home = $home ? { - undef => $user ? { - 'root' => '/root', - default => "/home/$user", - }, - default => $home, - } - - include conf::deps - - package::cargo { "fancy-prompt for $user": - package => 'fancy-prompt', - user => $user, +class conf { + include c_toolchain + include cron + include git + + package { + [ + "cmake", + "fortune-mod", + "less", + "vim", + ]: ensure => installed, - require => Package["cmake"], - } - - exec { "git clone doy/conf for $user": - command => "/usr/bin/git clone git://github.com/doy/conf", - user => $user, - cwd => $_home, - creates => "$_home/conf", - require => [ - User[$user], - File[$_home], - Class['git'], - ]; - } - - exec { "conf make install for $user": - command => "/usr/bin/make install", - user => $user, - cwd => "$_home/conf", - environment => [ - "HOME=$_home", - "PWD=$_home/conf", - ], - creates => "$_home/.vimrc", - require => [ - Class['cron'], - Class['c_toolchain'], - User[$user], - Exec["git clone doy/conf for $user"], - Package["vim"], - Package["fortune-mod"], - Package["less"], - Package::Cargo["fancy-prompt for $user"], - ]; } - - # XXX use the right branch } diff --git a/modules/conf/manifests/user.pp b/modules/conf/manifests/user.pp new file mode 100644 index 0000000..b5af5b2 --- /dev/null +++ b/modules/conf/manifests/user.pp @@ -0,0 +1,53 @@ +define conf::user($user=$name, $home=undef) { + $_home = $home ? { + undef => $user ? { + 'root' => '/root', + default => "/home/$user", + }, + default => $home, + } + + include conf + + package::cargo { "fancy-prompt for $user": + package => 'fancy-prompt', + user => $user, + ensure => installed, + require => Package["cmake"], + } + + exec { "git clone doy/conf for $user": + command => "/usr/bin/git clone git://github.com/doy/conf", + user => $user, + cwd => $_home, + creates => "$_home/conf", + require => [ + User[$user], + File[$_home], + Class['git'], + ]; + } + + exec { "conf make install for $user": + command => "/usr/bin/make install", + user => $user, + cwd => "$_home/conf", + environment => [ + "HOME=$_home", + "PWD=$_home/conf", + ], + creates => "$_home/.vimrc", + require => [ + Class['cron'], + Class['c_toolchain'], + User[$user], + Exec["git clone doy/conf for $user"], + Package["vim"], + Package["fortune-mod"], + Package["less"], + Package::Cargo["fancy-prompt for $user"], + ]; + } + + # XXX use the right branch +} diff --git a/modules/tozt/manifests/user.pp b/modules/tozt/manifests/user.pp index 0f095fd..f5c88d7 100644 --- a/modules/tozt/manifests/user.pp +++ b/modules/tozt/manifests/user.pp @@ -44,8 +44,7 @@ define tozt::user( } pass::user { $user: } - - conf { $user: + conf::user { $user: } if $user != 'root' { |