diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-11-22 13:16:58 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-11-22 13:16:58 -0200 |
| commit | 2c28fa24ba4abad25abb3c664f9227045dd66582 (patch) | |
| tree | 5971be5d12c57c581b7da5c0ee06618412f7cc24 | |
| parent | 87eadc7bf482c611447695fe124a124541e0d761 (diff) | |
| download | puppet-nodo-2c28fa24ba4abad25abb3c664f9227045dd66582.tar.gz puppet-nodo-2c28fa24ba4abad25abb3c664f9227045dd66582.tar.bz2 | |
Merge taskwarrior package definition
| -rw-r--r-- | manifests/utils/development/ide.pp | 2 | ||||
| -rw-r--r-- | manifests/utils/office.pp | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/manifests/utils/development/ide.pp b/manifests/utils/development/ide.pp index ba040b5..9d60383 100644 --- a/manifests/utils/development/ide.pp +++ b/manifests/utils/development/ide.pp @@ -17,7 +17,7 @@ class nodo::utils::development::ide { } # Jessie onwards - package { [ 'ttyrec', 'taskwarrior', 'bugs-everywhere', 'silversearcher-ag', 'vit' ]: + package { [ 'ttyrec', 'bugs-everywhere', 'silversearcher-ag', 'vit' ]: ensure => $::lsbdistcodename ? { 'wheezy' => absent, default => present, diff --git a/manifests/utils/office.pp b/manifests/utils/office.pp index 1ef8712..47e92a9 100644 --- a/manifests/utils/office.pp +++ b/manifests/utils/office.pp @@ -6,11 +6,19 @@ class nodo::utils::office { 'gnucash', 'worklog', 'pdftk', 'calibre', 'fbreader', 'gobby-0.5', 'mat', 'evince', 'jekyll', - 'task', 'aewan', 'autocutsel', + 'aewan', 'autocutsel', 'parcellite' ]: ensure => installed, } + package { 'taskwarrior': + ensure => present, + name => $::lsbdistcodename ? { + 'wheezy' => 'task', + default => 'taskwarrior', + }, + } + # Finance package { [ 'ledger', 'clipf', 'misery' ]: ensure => present, |