diff --git a/README.md b/README.md index 60b067fe..90593008 100644 --- a/README.md +++ b/README.md @@ -170,7 +170,7 @@ The shared secret for the status server. Required. The port to listen for status requests on. Default: `18121` ##### `listen` -The address to listen on. Defaults to listen on all addresses but you could set this to `$::ipaddress` or `127.0.0.1`. Default: `*` +The address to listen on. Defaults to listen on all addresses but you could set this to `$facts['networking]['ip']` or `127.0.0.1`. Default: `*` ```puppet # Enable status server diff --git a/manifests/init.pp b/manifests/init.pp index 6ce600be..9eedc121 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -566,7 +566,7 @@ # 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' { + if $facts['os']['family'] == 'RedHat' { exec { 'delete-radius-rpmnew': command => "find ${freeradius::fr_basepath} -name *.rpmnew -delete", onlyif => "find ${freeradius::fr_basepath} -name *.rpmnew | grep rpmnew", diff --git a/manifests/module/ldap.pp b/manifests/module/ldap.pp index 279e3771..dc547bbb 100644 --- a/manifests/module/ldap.pp +++ b/manifests/module/ldap.pp @@ -74,7 +74,7 @@ # FR3.1 format server = 'ldap1.example.com' # server = 'ldap2.example.com' # server = 'ldap3.example.com' - $serverconcatarray = $::freeradius_version ? { + $serverconcatarray = $facts['freeradius_version'] ? { /^3\.0\./ => any2array(join($server, ',')), default => $server, } diff --git a/manifests/params.pp b/manifests/params.pp index c584c77f..87e3fd17 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,9 +1,9 @@ # Default parameters for freeradius class freeradius::params { # Make an educated guess which version of FR we are running, based on the OS - case $::operatingsystem { + case $facts['os']['name'] { /RedHat|CentOS|Rocky|AlmaLinux/: { - $fr_guessversion = $::operatingsystemmajrelease ? { + $fr_guessversion = $facts['os']['release']['major'] ? { 5 => '2', 6 => '2', 7 => '3', @@ -13,7 +13,7 @@ } } 'Debian': { - $fr_guessversion = $::operatingsystemmajrelease ? { + $fr_guessversion = $facts['os']['release']['major'] ? { 6 => '2', 7 => '2', 8 => '2', @@ -22,7 +22,7 @@ } } 'Fedora': { - $fr_guessversion = $::operatingsystemmajrelease ? { + $fr_guessversion = $facts['os']['release']['major'] ? { 21 => '3', 22 => '3', 23 => '3', @@ -30,7 +30,7 @@ } } 'Ubuntu': { - $fr_guessversion = $::operatingsystemmajrelease ? { + $fr_guessversion = $facts['os']['release']['major'] ? { '14.04' => '2', '14.10' => '2', '15.04' => '2', @@ -42,7 +42,7 @@ } } default: { - fail("OS ${::operatingsystem} is not supported") + fail("OS ${facts['os']['name']} is not supported") } } @@ -54,28 +54,28 @@ } # Name of FreeRADIUS package - $fr_package = $::osfamily ? { + $fr_package = $facts['os']['family'] ? { 'RedHat' => 'freeradius', 'Debian' => 'freeradius', default => 'freeradius', } # Name of wpa_supplicant package - $fr_wpa_supplicant = $::osfamily ? { + $fr_wpa_supplicant = $facts['os']['family'] ? { 'RedHat' => 'wpa_supplicant', 'Debian' => 'wpasupplicant', default => 'wpa_supplicant', } # Name of FreeRADIUS service - $fr_service = $::osfamily ? { + $fr_service = $facts['os']['family'] ? { 'RedHat' => 'radiusd', 'Debian' => 'freeradius', default => 'radiusd', } # Whether the FreeRADIUS init.d startup script has a status setting or not - $fr_service_has_status = $::osfamily ? { + $fr_service_has_status = $facts['os']['family'] ? { 'RedHat' => true, 'Debian' => true, default => false, @@ -85,13 +85,13 @@ $fr_pidfile = "/var/run/${fr_service}/${fr_service}.pid" # Default base path for FreeRADIUS configs - case $::osfamily { + case $facts['os']['family'] { 'RedHat': { $fr_basepath = '/etc/raddb' $fr_raddbdir = "\${sysconfdir}/raddb" } 'Debian': { - $fr_basepath = $::operatingsystemmajrelease ? { + $fr_basepath = facts['os']['release']['major'] ? { '9' => '/etc/freeradius/3.0', '10' => '/etc/freeradius/3.0', '11' => '/etc/freeradius/3.0', @@ -101,7 +101,7 @@ '22.04' => '/etc/freeradius/3.0', default => '/etc/freeradius', } - $fr_raddbdir = $::operatingsystemmajrelease ? { + $fr_raddbdir = facts['os']['release']['major'] ? { '9' => "\${sysconfdir}/freeradius/3.0", '10' => "\${sysconfdir}/freeradius/3.0", '11' => "\${sysconfdir}/freeradius/3.0", @@ -139,40 +139,40 @@ $fr_moduleconfigpath = "${fr_basepath}/${fr_modconfigdir}" # Path for FreeRADIUS logs - $fr_logpath = $::osfamily ? { + $fr_logpath = $facts['os']['family'] ? { 'RedHat' => '/var/log/radius', 'Debian' => '/var/log/freeradius', default => '/var/log/radius', } # FreeRADIUS user - $fr_user = $::osfamily ? { + $fr_user = $facts['os']['family'] ? { 'RedHat' => 'radiusd', 'Debian' => 'freerad', default => 'radiusd', } # FreeRADIUS group - $fr_group = $::osfamily ? { + $fr_group = $facts['os']['family'] ? { 'RedHat' => 'radiusd', 'Debian' => 'freerad', default => 'radiusd', } # Privileged winbind user - $fr_wbpriv_user = $::osfamily ? { + $fr_wbpriv_user = $facts['os']['family'] ? { 'RedHat' => 'wbpriv', 'Debian' => 'winbindd_priv', default => 'wbpriv', } - $fr_libdir = $::osfamily ? { + $fr_libdir = $facts['os']['family'] ? { 'RedHat' => '/usr/lib64/freeradius', 'Debian' => '/usr/lib/freeradius', default => '/usr/lib64/freeradius', } - $fr_db_dir = $::osfamily ? { + $fr_db_dir = $facts['os']['family'] ? { 'Debian' => "\${raddbdir}", default => "\${localstatedir}/lib/radiusd", } @@ -180,7 +180,7 @@ $radacctdir = "\${logdir}/radacct" # Default radsniff environment file location - $fr_radsniff_envfile = $::osfamily ? { + $fr_radsniff_envfile = $facts['os']['family'] ? { 'RedHat' => '/etc/sysconfig/radsniff', 'Debian' => '/etc/defaults/radsniff', default => undef, diff --git a/metadata.json b/metadata.json index 85a76b53..c0a7b510 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "jgazeley-freeradius", - "version": "4.0.0", + "version": "4.0.1", "author": "jgazeley", "summary": "Install and configure FreeRADIUS", "license": "Apache-2.0",