there is a volatile for freebsd after all

[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 db9e9d37b03da8a7f9bea6e2c3d7d07412579025..8b0d62b5794eeecbd66dd0bd8148e42e33d79322 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -14,6 +14,14 @@ class debian-org {
                $mirror_backports = $mirror
        }
 
+       if $::lsbmajdistrelease <= 7 {
+               $mungedcodename = $::lsbdistcodename
+       } elsif ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
+               $mungedcodename = "${::lsbdistcodename}-kfreebsd"
+       } else {
+               $mungedcodename = $::lsbdistcodename
+       }
+
        if $systemd {
                include systemd
                $servicefiles = 'present'
@@ -130,7 +138,7 @@ class debian-org {
 
        site::aptrepo { 'security':
                url        => 'http://security.debian.org/',
-               suite      => "${::lsbdistcodename}/updates",
+               suite      => "${mungedcodename}/updates",
                components => ['main','contrib','non-free']
        }
        if $::lsbmajdistrelease < 7 {
@@ -199,7 +207,7 @@ class debian-org {
        if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
                site::aptrepo { 'debian':
                        url        => getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'),
-                       suite      => $::lsbdistcodename,
+                       suite      => $mungedcodename,
                        components => ['main','contrib','non-free']
                }
        }
@@ -287,7 +295,7 @@ class debian-org {
        }
        file { '/etc/rc.local':
                mode   => '0755',
-               source => 'puppet:///modules/debian-org/rc.local',
+               content => template('debian-org/rc.local.erb'),
                notify => Exec['service rc.local start'],
        }
        file { '/etc/dsa':