diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2012-09-27 19:13:47 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2012-09-27 19:13:47 -0300 |
| commit | 0efe2afba377d4144d8b227dfa0e81f8fb5ed99b (patch) | |
| tree | 85b9d0a21234f491535d915c0cb76ab60e17cdeb | |
| parent | 3955fd59cb418cd1947e9488643a0a851b9e09d4 (diff) | |
| download | puppet-nodo-0efe2afba377d4144d8b227dfa0e81f8fb5ed99b.tar.gz puppet-nodo-0efe2afba377d4144d8b227dfa0e81f8fb5ed99b.tar.bz2 | |
Avoiding duplicate definition of git-annex
| -rw-r--r-- | manifests/subsystems/utils/development.pp | 6 | ||||
| -rw-r--r-- | manifests/subsystems/utils/storage.pp | 6 | ||||
| -rw-r--r-- | manifests/subsystems/utils/web.pp | 4 |
3 files changed, 13 insertions, 3 deletions
diff --git a/manifests/subsystems/utils/development.pp b/manifests/subsystems/utils/development.pp index 7154e36..ce900ed 100644 --- a/manifests/subsystems/utils/development.pp +++ b/manifests/subsystems/utils/development.pp @@ -6,8 +6,10 @@ class utils::development { 'devscripts', 'pbuilder', 'build-essential', 'pnopaste-cli', 'agave', 'cdbs', 'dh-buildinfo', 'quilt', 'dpatch', 'dput', 'bzr', 'debian-goodies', 'debirf', 'xorriso', 'dh-autoreconf', - 'git-annex', 'git-buildpackage', 'gem2deb', 'python-setuptools', 'python-virtualenv', - 'ditz', 'unetbootin' ]: + 'unetbootin', 'git-buildpackage', 'gem2deb', 'python-setuptools', 'python-virtualenv', + 'ditz' ]: ensure => installed, } + + include utils::storage::archive } diff --git a/manifests/subsystems/utils/storage.pp b/manifests/subsystems/utils/storage.pp index e83873b..6a52e16 100644 --- a/manifests/subsystems/utils/storage.pp +++ b/manifests/subsystems/utils/storage.pp @@ -4,3 +4,9 @@ class utils::storage { ensure => installed, } } + +class utils::storage::archive { + package { 'git-annex': + ensure => installed, + } +} diff --git a/manifests/subsystems/utils/web.pp b/manifests/subsystems/utils/web.pp index 9169ef0..8b0eba9 100644 --- a/manifests/subsystems/utils/web.pp +++ b/manifests/subsystems/utils/web.pp @@ -2,7 +2,9 @@ class utils::web { package { [ 'ffmpeg', 'flvtool2', 'curl', 'rake', 'libxml2', 'libxml2-dev', 'libxslt1-dev', 'libmysqlclient-dev', - 'g++', 'libcurl4-openssl-dev', 'apache2-prefork-dev', 'git-annex' ]: + 'g++', 'libcurl4-openssl-dev', 'apache2-prefork-dev' ]: ensure => installed, } + + include utils::storage::archive } |