diff --git a/README.md b/README.md index 82b00fe554344b9fbecb4ccc056306118deb3217..c83029c2f606705a71f18733277714d23b7567e2 100644 --- a/README.md +++ b/README.md @@ -487,6 +487,11 @@ development effort if the features aren't useful to my employer. ## Release Notes +### 0.4.1 + + * Cease management of custom logging modules `logtofile` and `logtosyslog` since it does not make sense to manage these globally + * Purge instantiation of unused modules + ### 0.4.0 * Move control_socket into its own class and add parameters diff --git a/files/modules/logtofile b/files/modules/logtofile deleted file mode 100644 index d8032f5686adfa41270c4863b336666fa062c469..0000000000000000000000000000000000000000 --- a/files/modules/logtofile +++ /dev/null @@ -1,15 +0,0 @@ -linelog logtofile { - filename = ${logdir}/radiusd-%{%{Virtual-Server}:-DEFAULT}.log - auth = yes - - # Default log message - format = "" - - # Match packet type to blocks below - reference = "logtofile.%{%{reply:Packet-Type}:-format}" - - logtofile { - Access-Accept = "%t : Login OK: [%{User-Name}] (from client %C cli %{Calling-Station-Id} port %{Packet-Dst-Port})" - Access-Reject = "%t : Login incorrect: [%{User-Name}] (from client %C cli %{Calling-Station-Id} port %{Packet-Dst-Port})" - } -} diff --git a/files/modules/logtosyslog b/files/modules/logtosyslog deleted file mode 100644 index 906d18b9c16479d3512af35db8b7316348854a80..0000000000000000000000000000000000000000 --- a/files/modules/logtosyslog +++ /dev/null @@ -1,15 +0,0 @@ -linelog logtosyslog { - filename = syslog - syslog_facility = local5 - - # Default log message - format = "" - - # Match packet type to blocks below - reference = "logtosyslog.%{%{reply:Packet-Type}:-format}" - - logtosyslog { - Access-Accept = "%{Virtual-Server}: Login OK: [%{User-Name}] (from client %S cli %{Calling-Station-Id})" - Access-Reject = "%{Virtual-Server}: Login incorrect: [%{User-Name}] (from client %S cli %{Calling-Station-Id})" - } -} diff --git a/manifests/init.pp b/manifests/init.pp index 813fa73b3194f4abbb2143ab6dc95ce6eff30daf..d1a6b912a50a06b602c4e34b5fec4c7f4f0d2b2d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -176,13 +176,6 @@ class freeradius ( source => 'puppet:///modules/freeradius/modules/detail.log', } - ::freeradius::module { 'logtosyslog': - source => 'puppet:///modules/freeradius/modules/logtosyslog', - } - ::freeradius::module { 'logtofile': - source => 'puppet:///modules/freeradius/modules/logtofile', - } - # Syslog rules if $syslog == true { syslog::rule { 'radiusd-log': diff --git a/metadata.json b/metadata.json index 284f20a0064c9a6d714d3d36505c5add063657f0..7a82ed9646c46d67db314a91d3b36df3399c1800 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "jgazeley/freeradius", - "version": "0.4.0", + "version": "0.4.1", "author": "jgazeley", "summary": "Install and configure FreeRADIUS", "license": "Apache-2.0",