Commit 262677fe authored by Jonathan Gazeley's avatar Jonathan Gazeley
Browse files

Merge branch 'separate-sylog-entry' of...

Merge branch 'separate-sylog-entry' of https://github.com/JonTheNiceGuy/puppet-freeradius into JonTheNiceGuy-separate-sylog-entry

Conflicts:
	README.md
	manifests/init.pp
parents 1498260c 247db735
......@@ -75,12 +75,15 @@ Install FreeRADIUS utils. Default: `false`
##### `ldap_support`
Install support for LDAP. Default: `false`
##### `wpa_supplicant`.
##### `wpa_supplicant`
Install wpa_supplicant utility. Default: `false`
##### `winbind_support`.
##### `winbind_support`
Add the radius user to the winbind privileged group. You must install winbind separately. Default: `false`.
##### `syslog`
Add a syslog rule (using the `jgazeley/syslog` module). Default: `false`.
```puppet
class { 'freeradius':
control_socket => true,
......@@ -91,6 +94,7 @@ class { 'freeradius':
utils_support => true,
wpa_supplicant => true,
winbind_support => true,
syslog => true,
}
```
......
......@@ -9,6 +9,7 @@ class freeradius (
$ldap_support = false,
$wpa_supplicant = false,
$winbind_support = false,
$syslog = false,
) inherits freeradius::params {
file { 'radiusd.conf':
......@@ -163,12 +164,13 @@ class freeradius (
}
# Syslog rules
syslog::rule { 'radiusd-log':
command => "if \$programname == \'radiusd\' then ${freeradius::fr_logpath}/radius.log\n&~",
order => '12',
if $syslog == true {
syslog::rule { 'radiusd-log':
command => "if \$programname == \'radiusd\' then ${fr_logpath}/radius.log\n&~",
order => '12',
}
}
# Install a couple of virtual servers needed on all FR installations
if $control_socket == true {
freeradius::site { 'control-socket':
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment