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

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 33ab60456..dc9d2722f 100644
--- 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',
@@ -236,18 +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,
-		recurse => true,
+		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':
@@ -264,7 +287,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':