Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Projets publics
puppet-freeradius
Commits
5542b194
Commit
5542b194
authored
Oct 30, 2014
by
Jonathan Gazeley
Browse files
Make rpmnew cleanup only take effect on RedHat systems
Fix path to 'find'
parent
50ae46fe
Changes
1
Hide whitespace changes
Inline
Side-by-side
manifests/init.pp
View file @
5542b194
...
...
@@ -216,12 +216,19 @@ class freeradius (
# Delete *.rpmnew and *.rpmsave files from the radius config dir because
# radiusd stupidly reads these files in, and they break the config
exec
{
'delete-radius-rpmnew'
:
command
=>
"/bin/find
${fr_basepath}
-name *.rpmnew -delete"
,
onlyif
=>
"/bin/find
${fr_basepath}
-name *.rpmnew | /bin/grep rpmnew"
,
}
exec
{
'delete-radius-rpmsave'
:
command
=>
"/bin/find
${fr_basepath}
-name *.rpmsave -delete"
,
onlyif
=>
"/bin/find
${fr_basepath}
-name *.rpmsave | /bin/grep rpmsave"
,
# This should be fixed in FreeRADIUS 2.2.0
# http://lists.freeradius.org/pipermail/freeradius-users/2012-October/063232.html
# Only affects RPM-based systems
if
$::osfamily
==
'RedHat'
{
exec
{
'delete-radius-rpmnew'
:
command
=>
"find
${fr_basepath}
-name *.rpmnew -delete"
,
onlyif
=>
"find
${fr_basepath}
-name *.rpmnew | grep rpmnew"
,
path
=>
[
'/bin/'
,
'/sbin/'
,
'/usr/bin/'
,
'/usr/sbin/'
],
}
exec
{
'delete-radius-rpmsave'
:
command
=>
"find
${fr_basepath}
-name *.rpmsave -delete"
,
onlyif
=>
"find
${fr_basepath}
-name *.rpmsave | grep rpmsave"
,
path
=>
[
'/bin/'
,
'/sbin/'
,
'/usr/bin/'
,
'/usr/sbin/'
],
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment