X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=33ab60456636965f8c88d5eff3c2392a40fafa9c;hb=5d6d2f43b495114f97fb2640124c38d66cc85b60;hp=f441ac51f6f00faf2e234bba5872afa107288252;hpb=2d2d25eb5b5c376c5f73551fa11f5acaf866a60d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index f441ac51f..33ab60456 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -8,7 +8,7 @@ class debian-org {
 	} else {
 		$mirror = 'http://http.debian.net/debian/'
 	}
-	if $::lsbmajdistrelease != "testing" and $::lsbmajdistrelease < 7 {
+	if $::lsbmajdistrelease < 7 {
 		$mirror_backports = 'http://backports.debian.org/debian-backports/'
 	} else {
 		$mirror_backports = $mirror
@@ -60,10 +60,14 @@ class debian-org {
 		ensure => installed,
 	}
 
-	if $::lsbmajdistrelease == "testing" or $::lsbmajdistrelease >= 7 {
+	if $::lsbmajdistrelease == 7 {
 		package { 'libfilesystem-ruby1.9.1':
 			ensure => installed,
 		}
+	} elsif $::lsbmajdistrelease >= 8 {
+		package { 'ruby-filesystem':
+			ensure => installed,
+		}
 	}
 
 	munin::check { [
@@ -122,7 +126,7 @@ class debian-org {
 		suite      => "${::lsbdistcodename}/updates",
 		components => ['main','contrib','non-free']
 	}
-	if $::lsbmajdistrelease != "testing" and $::lsbmajdistrelease < 7 {
+	if $::lsbmajdistrelease < 7 {
 		site::aptrepo { 'debian-lts':
 			url        => $mirror,
 			suite      => "${::lsbdistcodename}-lts",
@@ -232,6 +236,16 @@ class debian-org {
 	file { '/etc/default/puppet':
 		source => 'puppet:///modules/debian-org/puppet.default',
 	}
+	file { '/etc/systemd/system':
+		ensure  => directory,
+		recurse => true,
+	}
+        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',
 		require => Package['debian.org'],
@@ -251,7 +265,7 @@ class debian-org {
 	file { '/etc/rc.local':
 		mode   => '0755',
 		source => 'puppet:///modules/debian-org/rc.local',
-		notify => Exec['rc.local start'],
+		notify => Exec['service rc.local start'],
 	}
 	file { '/etc/dsa':
 		ensure => directory,
@@ -305,18 +319,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,