Lenny compatibility

diff --git a/manifests/packages.pp b/manifests/packages.pp
index 027d187af12244de8cd87e1b5690860ef146a102..4a3b26e27718a4a02f8dada9d97086ff21959344 100644 (file)
--- 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 29a5b5798c8fef846f8682d2e7175fd86b4d969a..ed320877bc5a24ab7b53afec682bf64b812e2428 100644 (file)
--- 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,
   }