Start repro only after we are online

[mirror/dsa-puppet.git] / modules / roles / manifests / rtc.pp

diff --git a/modules/roles/manifests/rtc.pp b/modules/roles/manifests/rtc.pp
index f90b256..3e9799d 100644 (file)
--- a/modules/roles/manifests/rtc.pp
+++ b/modules/roles/manifests/rtc.pp
@@ -97,6 +97,12 @@ class roles::rtc {
        service { 'repro':
                ensure  => running,
        }
+       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,
+       }
 }