diff options
| author | Micah Anderson <micah@leap.se> | 2013-08-28 10:07:45 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2013-08-28 10:07:45 -0400 |
| commit | b093daf38d1bf33170382349ae8326e800ed70cd (patch) | |
| tree | 9dbce5e79765f1bac4f26d0015fe4114daff533e /puppet/modules/soledad | |
| parent | 6e0c0e5617d2c55457be25fae5ad2e3898936a51 (diff) | |
| parent | 92ad38f756f277866e6a3953dbc3e7f31b99898f (diff) | |
Merge branch 'feature/3579' into develop
Diffstat (limited to 'puppet/modules/soledad')
| -rw-r--r-- | puppet/modules/soledad/manifests/common.pp | 10 | ||||
| -rw-r--r-- | puppet/modules/soledad/manifests/init.pp | 4 | ||||
| -rw-r--r-- | puppet/modules/soledad/manifests/server.pp | 3 |
3 files changed, 12 insertions, 5 deletions
diff --git a/puppet/modules/soledad/manifests/common.pp b/puppet/modules/soledad/manifests/common.pp new file mode 100644 index 00000000..8a1d664a --- /dev/null +++ b/puppet/modules/soledad/manifests/common.pp @@ -0,0 +1,10 @@ +class soledad::common { + + include soledad + + package { 'soledad-common': + ensure => latest, + require => User['soledad'] + } + +} diff --git a/puppet/modules/soledad/manifests/init.pp b/puppet/modules/soledad/manifests/init.pp index 08ba88a7..7d44c8b4 100644 --- a/puppet/modules/soledad/manifests/init.pp +++ b/puppet/modules/soledad/manifests/init.pp @@ -27,8 +27,4 @@ class soledad { require => User['soledad']; } - package { 'soledad-common': - ensure => installed, - require => User['soledad']; - } } diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp index 00d87a4d..fcf9d461 100644 --- a/puppet/modules/soledad/manifests/server.pp +++ b/puppet/modules/soledad/manifests/server.pp @@ -46,7 +46,8 @@ class soledad::server { } package { 'soledad-server': - ensure => installed + ensure => latest, + require => Class['site_apt::preferences::twisted'] } file { '/etc/default/soledad': |