X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Frtc.pp;h=2a6adcd03eb21adc27a561e6e681f57187db9497;hb=33ef9d8cf9b3c33aa8b0abc678a2b94d4aaefb55;hp=f90b25641140b1ed369aba8b31c8fcc24a525154;hpb=de1dd4d8772fa333b988dea81d390495acc11834;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/rtc.pp b/modules/roles/manifests/rtc.pp
index f90b25641..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,
@@ -106,7 +112,7 @@ class roles::rtc {
 	}
 	$radius_password = hkdf('/etc/puppet/secret', "rtc-${::hostname}-radius-password")
 	file { '/etc/freeradius/3.0/sites-available/rtc.debian.org':
-		content	=> template('modules/roles/rtc/freeradius-rtc.erb'),
+		content	=> template('roles/rtc/freeradius-rtc.erb'),
 		mode	=> '0440',
 		group	=> freerad,
 	}
@@ -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,11 +130,15 @@ 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'],
 	}
+	file { '/etc/freeradius/3.0/sites-enabled/default':
+		ensure	=> absent,
+	}
+	file { '/etc/freeradius/3.0/sites-enabled/inner-tunnel':
+		ensure	=> absent,
+	}
 }