Make rc.local a template, make swap on zani

[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 c911bd052506de45df93a341261b31fa90a274b5..dc9d2722f1e802cc3c68e74bc3e95a52dea19b66 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,13 @@ class debian-org {
                $mirror_backports = $mirror
        }
 
+       if $systemd {
+               include systemd
+               $servicefiles = 'present'
+       } else {
+               $servicefiles = 'absent'
+       }
+
        $debianadmin = [
                'debian-archive-debian-samhain-reports@master.debian.org',
                'debian-admin@ftbfs.de',
@@ -27,6 +34,8 @@ class debian-org {
                        'klogd',
                        'sysklogd',
                        'rsyslog',
+                       'os-prober',
+                       'apt-listchanges',
                ]:
                ensure => purged,
        }
@@ -37,6 +46,12 @@ class debian-org {
                ensure => installed,
                tag    => extra_repo,
        }
+       file { '/etc/ssh/ssh_known_hosts':
+               ensure  => present,
+               replace => false,
+               mode    => '0644',
+               source  => 'puppet:///modules/debian-org/basic-ssh_known_hosts'
+       }
 
        package { [
                        'apt-utils',
@@ -52,10 +67,14 @@ class debian-org {
                ensure => installed,
        }
 
-       if $::lsbmajdistrelease >= 7 {
+       if $::lsbmajdistrelease == 7 {
                package { 'libfilesystem-ruby1.9.1':
                        ensure => installed,
                }
+       } elsif $::lsbmajdistrelease >= 8 {
+               package { 'ruby-filesystem':
+                       ensure => installed,
+               }
        }
 
        munin::check { [
@@ -138,17 +157,18 @@ class debian-org {
                components => ['main','contrib','non-free']
        }
 
-       if $::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem, pettersson] {
-               site::aptrepo { 'proposed-updates':
-                       url        => $mirror,
-                       suite      => "${::lsbdistcodename}-proposed-updates",
-                       components => ['main','contrib','non-free']
-               }
-       } else {
+       #if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, pettersson]) or
+       #   ($::hoster and ($::hoster in [bytemark, man-da, brown])) {
+       #       site::aptrepo { 'proposed-updates':
+       #               url        => $mirror,
+       #               suite      => "${::lsbdistcodename}-proposed-updates",
+       #               components => ['main','contrib','non-free']
+       #       }
+       #} else {
                site::aptrepo { 'proposed-updates':
                        ensure => absent,
                }
-       }
+       #}
 
        site::aptrepo { 'debian.org':
                ensure => absent,
@@ -156,10 +176,15 @@ class debian-org {
 
        site::aptrepo { 'db.debian.org':
                url        => 'http://db.debian.org/debian-admin',
-               suite      => 'lenny',
+               suite      => 'debian-all',
                components => 'main',
                key        => 'puppet:///modules/debian-org/db.debian.org.gpg',
        }
+       site::aptrepo { 'db.debian.org-suite':
+               url        => 'http://db.debian.org/debian-admin',
+               suite      => $::lsbdistcodename,
+               components => 'main',
+       }
 
        augeas { 'inittab_replicate':
                context => '/files/etc/inittab',
@@ -218,8 +243,34 @@ class debian-org {
        file { '/etc/default/puppet':
                source => 'puppet:///modules/debian-org/puppet.default',
        }
+       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':
+               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':
@@ -236,8 +287,8 @@ class debian-org {
        }
        file { '/etc/rc.local':
                mode   => '0755',
-               source => 'puppet:///modules/debian-org/rc.local',
-               notify => Exec['rc.local start'],
+               content => template('debian-org/rc.local.erb'),
+               notify => Exec['service rc.local start'],
        }
        file { '/etc/dsa':
                ensure => directory,
@@ -291,18 +342,21 @@ class debian-org {
                path        => '/usr/bin:/usr/sbin:/bin:/sbin',
                refreshonly => true
        }
-       exec { 'puppetmaster restart':
-               path        => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+       exec { 'service puppetmaster restart':
                refreshonly => true
        }
-       exec { 'rc.local start':
-               path        => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+       exec { 'service rc.local start':
                refreshonly => true
        }
        exec { 'init q':
                refreshonly => true
        }
 
+       exec { 'systemctl daemon-reload':
+               refreshonly => true,
+               onlyif  => "test -x /bin/systemctl"
+       }
+
        tidy { '/var/lib/puppet/clientbucket/':
                age      => '2w',
                recurse  => 9,