Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Projets publics
puppet-freeradius
Commits
c8847926
Commit
c8847926
authored
Jun 19, 2017
by
Jonathan
Committed by
GitHub
Jun 19, 2017
Browse files
Merge pull request #82 from djjudas21/pidfile
Manage pidfile
parents
5a7c229e
70ae10a3
Changes
7
Hide whitespace changes
Inline
Side-by-side
manifests/init.pp
View file @
c8847926
...
...
@@ -311,7 +311,7 @@ class freeradius (
create
=>
false
,
missingok
=>
true
,
compress
=>
true
,
postrotate =>
'
kill
-
HUP
`
cat
/
var
/
run
/
radiusd
/
radiusd
.
pid
`
'
,
postrotate
=>
"
kill -HUP `cat
${freeradius::fr_pidfile}
`"
,
sharedscripts
=>
true
,
}
...
...
@@ -322,7 +322,7 @@ class freeradius (
create
=>
true
,
missingok
=>
true
,
compress
=>
true
,
postrotate =>
'
kill
-
HUP
`
cat
/
var
/
run
/
radiusd
/
radiusd
.
pid
`
'
,
postrotate
=>
"
kill -HUP `cat
${freeradius::fr_pidfile}
`"
,
sharedscripts
=>
true
,
}
...
...
@@ -333,7 +333,7 @@ class freeradius (
create
=>
true
,
missingok
=>
true
,
compress
=>
true
,
postrotate =>
'
kill
-
HUP
`
cat
/
var
/
run
/
radiusd
/
radiusd
.
pid
`
'
,
postrotate
=>
"
kill -HUP `cat
${freeradius::fr_pidfile}
`"
,
sharedscripts
=>
true
,
}
...
...
manifests/params.pp
View file @
c8847926
...
...
@@ -73,6 +73,9 @@ class freeradius::params {
default => false,
}
#
Default
pid
file
location
$f
r_pidfile
=
"
/
var
/
run
/$
{fr_service}
/$
{fr_service}
.
pid
"
#
Default
base
path
for
FreeRADIUS
configs
$f
r_basepath
=
$::
osfamily
?
{
'RedHat' => '/etc/raddb',
...
...
manifests/sql.pp
View file @
c8847926
...
...
@@ -127,7 +127,7 @@ define freeradius::sql (
create
=>
true
,
compress
=>
true
,
missingok
=>
true
,
postrotate
=>
'
kill -HUP `cat
/var/run/radiusd/radiusd.pid`'
,
postrotate
=>
"
kill -HUP `cat
${freeradius::fr_pidfile}
`"
,
}
}
}
templates/home_server.erb
View file @
c8847926
home_server
<%=
@name
%>
{
type =
<%=
@type
%>
<%
if
@ipaddr
!=
''
-%>
<%
if
defined?
(
@ipaddr
)
-%>
ipaddr =
<%=
@ipaddr
%>
<%
end
-%>
<%
if
@ipv6addr
!=
''
-%>
<%
if
defined?
(
@ipv6addr
)
-%>
ipv6addr =
<%=
@ipv6addr
%>
<%
end
-%>
<%
if
@virtual_server
!=
''
-%>
<%
if
defined?
(
@virtual_server
)
-%>
virtual_server =
<%=
@virtual_server
%>
<%
end
-%>
port =
<%=
@port
%>
...
...
templates/home_server_pool.erb
View file @
c8847926
home_server_pool
<%=
@name
%>
{
type =
<%=
@type
%>
<%
if
@virtual_server
!=
''
-%>
<%
if
defined?
(
@virtual_server
)
-%>
virtual_server =
<%=
@virtual_server
%>
<%
end
-%>
<%
@home_server
.
each
do
|
server
|
-%>
home_server =
<%=
server
%>
<%
end
-%>
<%
if
@fallback
!=
''
-%>
<%
if
defined?
(
@fallback
)
-%>
fallback =
<%=
@fallback
%>
<%
end
-%>
}
...
...
templates/radiusd.logrotate.erb
deleted
100644 → 0
View file @
5a7c229e
# You can use this to rotate the
<%=
@fr_logpath
%>
/* files, simply copy
# it to /etc/logrotate.d/radiusd
# There are different detail-rotating strategies you can use. One is
# to write to a single detail file per IP and use the rotate config
# below. Another is to write to a daily detail file per IP with:
# detailfile = ${radacctdir}/%{Client-IP-Address}/%Y%m%d-detail
# (or similar) in radiusd.conf, without rotation. If you go with the
# second technique, you will need another cron job that removes old
# detail files. You do not need to comment out the below for method #2.
<%=
@fr_logpath
%>
/radacct/*/*.log {
daily
rotate 7
nocreate
missingok
compress
}
<%=
@fr_logpath
%>
/checkrad.log {
weekly
rotate 1
create
missingok
compress
}
<%=
@fr_logpath
%>
/radius*.log {
weekly
rotate 26
create
missingok
compress
}
<%=
@fr_logpath
%>
/radutmp {
weekly
rotate 1
create
compress
missingok
}
<%=
@fr_logpath
%>
/radwtmp {
weekly
rotate 1
create
compress
missingok
}
<%=
@fr_logpath
%>
/sqltrace.sql {
weekly
rotate 1
create
compress
missingok
}
lastrotate
if [ -e /var/run/radiusd/radiusd.pid ] then; kill -HUP `cat /var/run/radiusd/radiusd.pid`; fi;
endscript
templates/realm.erb
View file @
c8847926
realm
<%=
@name
%>
{
<%
if
@virtual_server
!=
''
-%>
<%
if
defined?
(
@virtual_server
)
-%>
virtual_server =
<%=
@virtual_server
%>
<%
end
-%>
<%
if
@auth_pool
!=
''
-%>
<%
if
defined?
(
@auth_pool
)
-%>
auth_pool =
<%=
@auth_pool
%>
<%
end
-%>
<%
if
@acct_pool
!=
''
-%>
<%
if
defined?
(
@acct_pool
)
-%>
acct_pool =
<%=
@acct_pool
%>
<%
end
-%>
<%
if
@pool
!=
''
-%>
<%
if
defined?
(
@pool
)
-%>
pool =
<%=
@pool
%>
<%
end
%>
<%
if
@nostrip
-%>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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