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 6d9f8a491ffad045eb6fe5ce5623385343b032e1..8b0d62b5794eeecbd66dd0bd8148e42e33d79322 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -6,7 +6,7 @@ class debian-org {
        if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
                $mirror = getfromhash($site::nodeinfo, 'hoster', 'mirror-debian')
        } else {
-               $mirror = 'http://http.debian.net/debian/'
+               $mirror = 'http://ftp.debian.org/debian/'
        }
        if $::lsbmajdistrelease < 7 {
                $mirror_backports = 'http://backports.debian.org/debian-backports/'
@@ -14,6 +14,21 @@ 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'
+       } else {
+               $servicefiles = 'absent'
+       }
+
        $debianadmin = [
                'debian-archive-debian-samhain-reports@master.debian.org',
                'debian-admin@ftbfs.de',
@@ -123,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 {
@@ -192,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']
                }
        }
@@ -238,18 +253,32 @@ class debian-org {
        }
        file { '/etc/systemd':
                ensure  => directory,
+               mode => 0755,
        }
        file { '/etc/systemd/system':
                ensure  => directory,
+               mode => 0755,
+       }
+       file { '/etc/systemd/system/ud-replicated.service':
+               ensure => $servicefiles,
+               source => 'puppet:///modules/debian-org/ud-replicated.service',
+               notify => Exec['systemctl daemon-reload'],
+       }
+       if $systemd {
+               file { '/etc/systemd/system/multi-user.target.wants/ud-replicated.service':
+                       ensure => 'link',
+                       target => '../ud-replicated.service',
+                       notify => Exec['systemctl daemon-reload'],
+               }
        }
-        file { '/etc/systemd/system/puppet.service':
+       file { '/etc/systemd/system/puppet.service':
                ensure => 'link',
                target => '/dev/null',
                notify => Exec['systemctl daemon-reload'],
        }
 
        file { '/etc/cron.d/dsa-puppet-stuff':
-               source  => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron',
+               content => template('debian-org/dsa-puppet-stuff.cron.erb'),
                require => Package['debian.org'],
        }
        file { '/etc/ldap/ldap.conf':
@@ -266,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':