From 3a3d66c0450e13d5dd7138985c38369a67180bf5 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Thu, 19 Oct 2017 20:49:41 +0100 Subject: [PATCH] Add better descriptions to resources --- manifests/post-packages.pp | 4 ++-- modules/common/manifests/init.pp | 4 ++-- modules/config/manifests/fonts.pp | 4 ++-- modules/config/manifests/git.pp | 9 --------- modules/config/manifests/init.pp | 20 +++++++++++++++----- modules/config/manifests/private.pp | 8 +++++--- modules/config/manifests/vim.pp | 8 +++++--- modules/gnome/manifests/init.pp | 3 ++- modules/i3/manifests/autostart.pp | 2 +- modules/shell/manifests/init.pp | 3 ++- modules/yaourt/manifests/files.pp | 10 ++++++---- modules/yaourt/manifests/keys.pp | 13 ++++++++----- 12 files changed, 50 insertions(+), 38 deletions(-) delete mode 100644 modules/config/manifests/git.pp diff --git a/manifests/post-packages.pp b/manifests/post-packages.pp index cc1c7fb..f1a0cbf 100644 --- a/manifests/post-packages.pp +++ b/manifests/post-packages.pp @@ -3,7 +3,7 @@ node default { path => ['/usr/bin', '/usr/sbin', '/usr/local/bin', '/usr/local/sbin'] } - file {'autostart compton': + file {'Autostart Compton': ensure => link, path => '/home/jake/.config/autostart/compton.desktop', mode => '0644', @@ -11,7 +11,7 @@ node default { source => '/usr/share/applications/compton.desktop' } - exec {'set java': + exec {'Set Java version': command => 'archlinux-java set intellij-jdk', unless => 'archlinux-java get | grep intellij-jdk' } diff --git a/modules/common/manifests/init.pp b/modules/common/manifests/init.pp index b4c608b..1dc670f 100644 --- a/modules/common/manifests/init.pp +++ b/modules/common/manifests/init.pp @@ -1,5 +1,5 @@ class common { - user { 'make me': + user { 'Make me': name => 'jake', allowdupe => false, auth_membership => 'inclusive', @@ -7,7 +7,7 @@ class common { home => '/home/jake', uid => '1000', } - -> file { 'create home': + -> file { 'Create home directory': ensure => directory, path => '/home/jake', owner => 'jake' diff --git a/modules/config/manifests/fonts.pp b/modules/config/manifests/fonts.pp index 614cde4..d97b879 100644 --- a/modules/config/manifests/fonts.pp +++ b/modules/config/manifests/fonts.pp @@ -6,7 +6,7 @@ class config::fonts { ]; $fonts.each |String $font| { - file { "font config $font": + file { "Enable $font font": ensure => link, path => "/etc/fonts/conf.d/$font", mode => '0644', @@ -15,7 +15,7 @@ class config::fonts { } } - exec { 'update font cache': + exec { 'Update font cache': command => 'gdk-pixbuf-query-loaders --update-cache' } } diff --git a/modules/config/manifests/git.pp b/modules/config/manifests/git.pp deleted file mode 100644 index f96a102..0000000 --- a/modules/config/manifests/git.pp +++ /dev/null @@ -1,9 +0,0 @@ -class config::git { - $global_gitignore = '/home/jake/.config/.gitignore' - - file { $global_gitignore: - ensure => file, - mode => '0644', - source => 'puppet:///modules/config/gitignore_global' - } -} diff --git a/modules/config/manifests/init.pp b/modules/config/manifests/init.pp index 5fc93c6..ece6459 100644 --- a/modules/config/manifests/init.pp +++ b/modules/config/manifests/init.pp @@ -1,31 +1,41 @@ class config { include 'config::vim' - include 'config::git' include 'config::fonts' include 'config::private' - file { '/etc/libinput-gestures.conf': + file { 'Touchpad gestures config': ensure => file, mode => '0644', + path => '/etc/libinput-gestures.conf', source => 'puppet:///modules/config/libinput-gestures.conf' } - file { '/home/jake/.config/terminator/config': + file { 'Terminator config': ensure => file, mode => '0644', + path => '/home/jake/.config/terminator/config', source => 'puppet:///modules/config/terminator.conf' } - file { '/home/jake/.config/uniemoji/custom.json': + file { 'Uniemoji config': ensure => file, mode => '0644', + path => '/home/jake/.config/uniemoji/custom.json', source => 'puppet:///modules/config/uniemoji.json' } - file { '/home/jake/.ssh/assh.yml': + file { 'Install SSH config': ensure => file, mode => '0644', owner => 'jake', + path => '/home/jake/.ssh/assh.yml', source => 'puppet:///modules/config/assh.yml' } + + file { 'Install global gitignore': + path => '/home/jake/.config/.gitignore', + ensure => file, + mode => '0644', + source => 'puppet:///modules/config/gitignore_global' + } } diff --git a/modules/config/manifests/private.pp b/modules/config/manifests/private.pp index a10e937..2d2884e 100644 --- a/modules/config/manifests/private.pp +++ b/modules/config/manifests/private.pp @@ -1,11 +1,13 @@ class config::private () { - file { '/home/jake/.dotfiles': - ensure => directory + file { 'Check dotfiles': + ensure => directory, + path => '/home/jake/.dotfiles' } - file { '/home/jake/.upload': + file { 'TUpload config': ensure => link, target => '/home/jake/.dotfiles/.upload', + path => '/home/jake/.upload', mode => '0644' } } diff --git a/modules/config/manifests/vim.pp b/modules/config/manifests/vim.pp index 2d36f2d..c8a68ac 100644 --- a/modules/config/manifests/vim.pp +++ b/modules/config/manifests/vim.pp @@ -1,20 +1,22 @@ class config::vim { - file { '/home/jake/.vimrc': + file { 'vimrc': ensure => file, mode => '0644', owner => 'jake', group => 'users', + path => '/home/jake/.vimrc', source => 'puppet:///modules/config/vimrc' } - -> vcsrepo { '/home/jake/.vim_runtime': + -> vcsrepo { 'Vim runtime': ensure => latest, provider => git, user => 'jake', + path => '/home/jake/.vim_runtime', source => 'https://github.com/amix/vimrc.git', } - -> exec { 'install vim plugins': + -> exec { 'Install vim plugins': command => 'vim +PluginInstall +qall', user => 'jake', environment => 'HOME=/home/jake' diff --git a/modules/gnome/manifests/init.pp b/modules/gnome/manifests/init.pp index e95e75e..e97b72b 100644 --- a/modules/gnome/manifests/init.pp +++ b/modules/gnome/manifests/init.pp @@ -1,7 +1,8 @@ class gnome { - file { '/home/jake/Templates': + file { 'Nautilus Templates': ensure => directory, source => 'puppet:///modules/gnome/Templates', + path => '/home/jake/Templates', owner => 'jake', group => 'users', mode => '0755', diff --git a/modules/i3/manifests/autostart.pp b/modules/i3/manifests/autostart.pp index 37cd440..52012df 100644 --- a/modules/i3/manifests/autostart.pp +++ b/modules/i3/manifests/autostart.pp @@ -17,7 +17,7 @@ class i3::autostart { ]; $programs.each |String $program| { - file { "autostart $program": + file { "Autostart $program": ensure => link, path => "/home/jake/.config/autostart/$program.desktop", mode => '0644', diff --git a/modules/shell/manifests/init.pp b/modules/shell/manifests/init.pp index 8b009d3..5a263ca 100644 --- a/modules/shell/manifests/init.pp +++ b/modules/shell/manifests/init.pp @@ -32,9 +32,10 @@ class shell { source => '/usr/share/nvm/init-nvm.sh' } - file { '/home/jake/.bin': + file { 'Custom binaries': ensure => directory, source => 'puppet:///modules/shell/bin', + path => '/home/jake/.bin', owner => 'jake', group => 'users', mode => '0755', diff --git a/modules/yaourt/manifests/files.pp b/modules/yaourt/manifests/files.pp index 33e4da0..ccc62c4 100644 --- a/modules/yaourt/manifests/files.pp +++ b/modules/yaourt/manifests/files.pp @@ -1,14 +1,16 @@ class yaourt::files () { - file { '/etc/pacman.conf': + file { 'Pacman config': ensure => file, - source => 'puppet:///modules/yaourt/pacman.conf' + source => 'puppet:///modules/yaourt/pacman.conf', + path => '/etc/pacman.conf' } - file { '/home/jake/.yaourtrc': + file { 'Yaourt config': ensure => file, mode => '0644', owner => 'jake', group => 'users', - source => 'puppet:///modules/yaourt/.yaourtrc' + source => 'puppet:///modules/yaourt/.yaourtrc', + path => '/home/jake/.yaourtrc' } } diff --git a/modules/yaourt/manifests/keys.pp b/modules/yaourt/manifests/keys.pp index 76d611a..37a6f5c 100644 --- a/modules/yaourt/manifests/keys.pp +++ b/modules/yaourt/manifests/keys.pp @@ -6,19 +6,22 @@ class yaourt::keys () { ] $keys.each |$key| { - exec { "gpg --recv-keys $key": + exec {"Add $key key": + command => "gpg --recv-keys $key", user => 'jake', unless => "gpg --list-keys $key" } - exec { "add $key for root": # So root can install things + exec { "Add $key for root": # So root can install things command => "gpg --recv-keys $key", unless => "gpg --list-keys $key" } - exec { "pacman-key -r $key": + exec { "Add $key to pacman": + command => "pacman-key -r $key", unless => "pacman-key --list-keys $key" } - exec { "pacman-key --lsign-key $key": - unless => "pacman-key --list-keys $key | grep '\[ full \]'" + exec { "Locally sign $key with pacman": + command => "pacman-key --lsign-key $key", + unless => "pacman-key --list-keys $key | grep full" } } }