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` ...@@ -75,12 +75,15 @@ Install FreeRADIUS utils. Default: `false`
##### `ldap_support` ##### `ldap_support`
Install support for LDAP. Default: `false` Install support for LDAP. Default: `false`
##### `wpa_supplicant`. ##### `wpa_supplicant`
Install wpa_supplicant utility. Default: `false` 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`. 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 ```puppet
class { 'freeradius': class { 'freeradius':
control_socket => true, control_socket => true,
...@@ -91,6 +94,7 @@ class { 'freeradius': ...@@ -91,6 +94,7 @@ class { 'freeradius':
utils_support => true, utils_support => true,
wpa_supplicant => true, wpa_supplicant => true,
winbind_support => true, winbind_support => true,
syslog => true,
} }
``` ```
......
...@@ -9,6 +9,7 @@ class freeradius ( ...@@ -9,6 +9,7 @@ class freeradius (
$ldap_support = false, $ldap_support = false,
$wpa_supplicant = false, $wpa_supplicant = false,
$winbind_support = false, $winbind_support = false,
$syslog = false,
) inherits freeradius::params { ) inherits freeradius::params {
file { 'radiusd.conf': file { 'radiusd.conf':
...@@ -163,12 +164,13 @@ class freeradius ( ...@@ -163,12 +164,13 @@ class freeradius (
} }
# Syslog rules # Syslog rules
syslog::rule { 'radiusd-log': if $syslog == true {
command => "if \$programname == \'radiusd\' then ${freeradius::fr_logpath}/radius.log\n&~", syslog::rule { 'radiusd-log':
order => '12', command => "if \$programname == \'radiusd\' then ${fr_logpath}/radius.log\n&~",
order => '12',
}
} }
# Install a couple of virtual servers needed on all FR installations # Install a couple of virtual servers needed on all FR installations
if $control_socket == true { if $control_socket == true {
freeradius::site { 'control-socket': freeradius::site { 'control-socket':
......
Supports Markdown
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