diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-05-09 10:42:15 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-05-09 10:42:15 -0300 |
| commit | c185e61df3b601274b96878f8f75d2e9fc66555e (patch) | |
| tree | 3445f3b650c49319143f4b78b606889471c270af | |
| parent | 47951217efeedd66ce922ecbaebc7d7bf40cdc89 (diff) | |
| download | puppet-mail-c185e61df3b601274b96878f8f75d2e9fc66555e.tar.gz puppet-mail-c185e61df3b601274b96878f8f75d2e9fc66555e.tar.bz2 | |
Lenny compatibility
| -rw-r--r-- | manifests/packages.pp | 10 | ||||
| -rw-r--r-- | manifests/web.pp | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/manifests/packages.pp b/manifests/packages.pp index 027d187..4a3b26e 100644 --- a/manifests/packages.pp +++ b/manifests/packages.pp @@ -18,11 +18,17 @@ class mail::packages::virtual { ensure => installed, } - package { [ 'squirrelmail', 'squirrelmail-locales', 'imp4', - 'roundcube', 'roundcube-sqlite' ]: + package { [ 'squirrelmail', 'squirrelmail-locales', 'imp4' ]: ensure => installed, } + # Squeeze (or newer) packages + if $lsbdistcodename != 'lenny' { + package { [ 'roundcube', 'roundcube-sqlite' ]: + ensure => installed, + } + } + # We'll force SSL through the proxy package { 'squirrelmail-secure-login': ensure => absent, diff --git a/manifests/web.pp b/manifests/web.pp index 29a5b57..ed32087 100644 --- a/manifests/web.pp +++ b/manifests/web.pp @@ -8,8 +8,10 @@ class mail::web::virtual inherits websites::setup { } apache::site { "mail": - #docroot => "/usr/share/squirrelmail", - docroot => "/var/lib/roundcube", + docroot => $lsbdistcodename ? { + 'lenny' => "/usr/share/squirrelmail", + default => "/var/lib/roundcube", + } source => true, mpm => false, } |