X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Frtc.pp;h=2a6adcd03eb21adc27a561e6e681f57187db9497;hb=236efe8e28f32419ddc5b4445780bd17775adaf3;hp=12e834bdeb2167064c83ff7a553db5e4f54f12f1;hpb=03790f1caf07cceea0ae503a261106a5811ccc20;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/rtc.pp b/modules/roles/manifests/rtc.pp
index 12e834bde..2a6adcd03 100644
--- a/modules/roles/manifests/rtc.pp
+++ b/modules/roles/manifests/rtc.pp
@@ -97,6 +97,12 @@ class roles::rtc {
 	service { 'repro':
 		ensure  => running,
 	}
+	dsa_systemd::override { 'repro':
+		content  => @("EOF"),
+			[Unit]
+			After=network-online.target
+			| EOF
+	}
 
 	package { 'freeradius':
 		ensure	=> installed,
@@ -115,7 +121,7 @@ class roles::rtc {
 		target	=> '../sites-available/rtc.debian.org',
 	}
 	file { '/etc/freeradius/3.0/mods-available/passwd_rtc':
-		source	=> 'puppet:///modules/roles/rtc/freeradius-mod-passwd',
+		source	=> 'puppet:///modules/roles/rtc/freeradius-mod-passwd-rtc',
 		mode	=> '0440',
 		group	=> freerad,
 	}
@@ -124,9 +130,7 @@ class roles::rtc {
 		target	=> '../mods-available/passwd_rtc',
 	}
 	file { '/etc/repro/radius-servers':
-		content	=> @(EOF),
-			localhost/localhost ${radius_password}
-			| EOF
+		content	=> inline_template('localhost/localhost <%= @radius_password %>'),
 		mode	=> '0440',
 		group	=> repro,
 		notify  => Service['repro'],