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

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index e626d7eb2..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/'
@@ -15,6 +15,7 @@ class debian-org {
 	}
 
 	if $systemd {
+		include systemd
 		$servicefiles = 'present'
 	} else {
 		$servicefiles = 'absent'
@@ -255,6 +256,13 @@ class debian-org {
 		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',
@@ -279,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':