projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
put apache on sallinen
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
rtc.pp
diff --git
a/modules/roles/manifests/rtc.pp
b/modules/roles/manifests/rtc.pp
index
12e834b
..
3dfa8b5
100644
(file)
--- a/
modules/roles/manifests/rtc.pp
+++ b/
modules/roles/manifests/rtc.pp
@@
-115,7
+115,7
@@
class roles::rtc {
target => '../sites-available/rtc.debian.org',
}
file { '/etc/freeradius/3.0/mods-available/passwd_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,
}
mode => '0440',
group => freerad,
}
@@
-124,9
+124,7
@@
class roles::rtc {
target => '../mods-available/passwd_rtc',
}
file { '/etc/repro/radius-servers':
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'],
mode => '0440',
group => repro,
notify => Service['repro'],