From 55ec473bc796e6adf988c2705217c1cb596aeb73 Mon Sep 17 00:00:00 2001
From: Jonathan Gazeley <jonathan.gazeley@bristol.ac.uk>
Date: Wed, 2 Dec 2015 11:54:52 +0000
Subject: [PATCH] Switch to use saz/rsyslog instead of jgazeley/syslog to
manage syslog rules
---
README.md | 2 +-
manifests/init.pp | 5 ++---
metadata.json | 4 ++--
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index b21d81c..25b7669 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ Install wpa_supplicant utility. 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`.
+Add a syslog rule (using the `saz/rsyslog` module). Default: `false`.
```puppet
class { 'freeradius':
diff --git a/manifests/init.pp b/manifests/init.pp
index f9df7dd..fddf66b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -211,9 +211,8 @@ class freeradius (
# Syslog rules
if $syslog == true {
- syslog::rule { 'radiusd-log':
- command => "if \$programname == \'radiusd\' then ${freeradius::fr_logpath}/radius.log\n&~",
- order => '12',
+ rsyslog::snippet { '12-radiusd-log':
+ content => "if \$programname == \'radiusd\' then ${freeradius::fr_logpath}/radius.log\n&~",
}
}
diff --git a/metadata.json b/metadata.json
index b12d837..6a4e1cf 100644
--- a/metadata.json
+++ b/metadata.json
@@ -36,8 +36,8 @@
"version_range": ">=1.0.0 <2.0.0"
},
{
- "name": "jgazeley/syslog",
- "version_range": ">=0.1.0"
+ "name": "saz/rsyslog",
+ "version_range": ">=3.0.0"
},
{
"name": "rodjek/logrotate",
--
GitLab