Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Sync with latest code #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 30 commits into from
Closed

Sync with latest code #325

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
2db93f2
Add SSL support
Sep 10, 2013
e03b45b
Fix typo curly brace
Sep 10, 2013
eedbeba
Remove the *.* for sending to /var/log/syslog
Sep 12, 2013
87f87b8
Send local0 to drupal
Sep 20, 2013
4c8b5bf
Add drupal to server configuration
Sep 24, 2013
cb0b199
Prevent duplicate messages appearing
Sep 26, 2013
4edc98b
Try to return rsyslog logging to more normal places (syslog instead o…
Jan 24, 2014
3298534
Update client.conf.erb
Feb 7, 2014
32977bd
Update server-default.conf.erb
Feb 7, 2014
96e2146
Merge pull request #1 from puppetlabs-operations/new_syslog_rules
Feb 7, 2014
4e38e9c
Increase max TCP sessions
Mar 24, 2014
e3bd3d7
Remove cron messages from syslog
Apr 17, 2014
d81eeb3
Merge pull request #2 from puppetlabs-operations/remove_cron
Apr 17, 2014
5a78135
Remove logging to messages, log to syslog
Jul 1, 2014
14fe497
Merge pull request #3 from puppetlabs-operations/remove_messages
Ziaunys Jul 1, 2014
56f80f0
Update rsyslog::client to handle PE 3.7 null value
Dec 30, 2014
299eaee
Set gnutls install to same variable as other packages
Mar 3, 2015
5b56a09
Remove -c4 flag
Mar 3, 2015
8e7f6c5
Merge pull request #4 from puppetlabs-operations/latest_version
Ziaunys Mar 3, 2015
37da48b
Remove custom_config parameter
Sep 30, 2015
474ceed
Merge pull request #5 from puppetlabs-operations/remove_custom_config
Sep 30, 2015
a9fe0c1
(bug) Fix content snipper for rsyslog server
Nov 5, 2015
47a471c
Merge pull request #6 from puppetlabs-operations/fix_real_content
danieldreier Nov 5, 2015
359221f
Migrate default file to template.
ody Mar 2, 2016
4d64f04
Merge pull request #7 from puppetlabs-operations/erb
ody Mar 2, 2016
55e0975
(FORGE) Add capability to opt out of drupal.log inclusion
nkanderson Dec 3, 2020
c2ed97a
(MAINT) Add client params to docs in README
nkanderson Dec 4, 2020
8b4fdc3
Merge pull request #9 from nkanderson/pf_2269_condtional_drupal_log
mattkirby Dec 4, 2020
e0029f3
Adding protocol format field to rsyslog::client
mikkergimenez Nov 8, 2018
f0aeb6d
Merge pull request #10 from nkanderson/maint_merge_branch
mattkirby Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions templates/client.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,7 @@ auth,authpriv.* /var/log/secure
<% if scope.lookupvar('rsyslog::log_style') == 'debian' -%>
# First some standard log files. Log by facility.
#
*.=info;*.=notice;*.=warn;\
auth,authpriv.none;\
cron,daemon.none;\
mail,news.none -/var/log/syslog
*.*;auth,authpriv.none -/var/log/syslog
cron.* /var/log/cron.log
daemon.* -/var/log/daemon.log
kern.* -/var/log/kern.log
Expand Down
12 changes: 5 additions & 7 deletions templates/server-default.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,16 @@ $Template dynDrupal,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%sour
if $syslogfacility-text == 'local0' then ?dynDrupal
&~
auth,authpriv.* ?dynAuthLog
*.=info;*.=notice;*.=warn;\
auth,authpriv.none;\
cron,daemon.none;\
mail,news.none -?dynSyslog
*.*;auth,authpriv.none,mail.none,cron.none -?dynSyslog
cron.* ?dynCronLog
daemon.* -?dynDaemonLog
kern.* -?dynKernLog
mail.* -?dynMailLog
user.* -?dynUserLog
*.=debug;\
auth,authpriv.none;\
news.none;mail.none -?dynDebug
*.=info;*.=notice;*.=warn;\
auth.none,authpriv.none;\
cron.none,daemon.none;\
mail.none,news.none -?dynMessages
<% else -%>
# Template
$Template dynAllMessages,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/messages"
Expand Down