clean up ruby-filesystem declaration

[dsa-puppet.git] / modules / debian-org / manifests / init.pp

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index ce88c13e606d908c060b0e2fa5b927e3878a5f03..9c5b7f1fbd59ba5660dcdc6b08fc325b51b2479a 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -61,13 +61,20 @@ class debian-org {
                source  => 'puppet:///modules/debian-org/basic-ssh_known_hosts'
        }
 
+       if ($::lsbmajdistrelease >= 8) {
+               $rubyfs_package = 'ruby-filesystem'
+       } elsif $::lsbmajdistrelease == 7  {
+               $rubyfs_package = 'libfilesystem-ruby1.9'
+       } else {
+               $rubyfs_package = 'libfilesystem-ruby1.8'
+       }
        package { [
                        'apt-utils',
                        'bash-completion',
                        'dnsutils',
                        'less',
                        'lsb-release',
-                       'libfilesystem-ruby1.8',
+                       $rubyfs_package,
                        'mtr-tiny',
                        'nload',
                        'pciutils',
@@ -75,16 +82,6 @@ class debian-org {
                ensure => installed,
        }
 
-       if $::lsbmajdistrelease == 7 {
-               package { 'libfilesystem-ruby1.9.1':
-                       ensure => installed,
-               }
-       } elsif $::lsbmajdistrelease >= 8 {
-               package { 'ruby-filesystem':
-                       ensure => installed,
-               }
-       }
-
        munin::check { [
                        'cpu',
                        'entropy',
@@ -159,16 +156,10 @@ class debian-org {
                components => ['main','contrib','non-free']
        }
 
-       if (($::lsbmajdistrelease) >= 8 and ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386'])) {
-               site::aptrepo { 'volatile':
-                       ensure => absent,
-               }
-       } else {
-               site::aptrepo { 'volatile':
-                       url        => $mirror,
-                       suite      => "${::lsbdistcodename}-updates",
-                       components => ['main','contrib','non-free']
-               }
+       site::aptrepo { 'volatile':
+               url        => $mirror,
+               suite      => "${::lsbdistcodename}-updates",
+               components => ['main','contrib','non-free']
        }
 
        #if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, pettersson]) or
@@ -289,7 +280,7 @@ class debian-org {
        }
        file { '/etc/ldap/ldap.conf':
                require => Package['debian.org'],
-               source  => 'puppet:///modules/debian-org/ldap.conf',
+               content  => template('debian-org/ldap.conf.erb'),
        }
        file { '/etc/pam.d/common-session':
                require => Package['debian.org'],