diff options
| author | Ralf Heiringhoff <ralf.heiringhoff@1und1.de> | 2012-08-28 12:45:12 +0200 |
|---|---|---|
| committer | Ralf Heiringhoff <ralf.heiringhoff@1und1.de> | 2012-08-28 12:45:12 +0200 |
| commit | bddb3ca1a2c7d7033d28571824cf77c151e73f8c (patch) | |
| tree | cd13676815611c34af63d100923b4a214ec38dc2 /templates | |
| parent | 9e29f678d8a7c3f0433b7c71e143aa7532bf95d2 (diff) | |
| parent | edefd51cfb68192f0a75024c6763b946fefc60f9 (diff) | |
Merge branch 'Add_One_File_Per_Host'
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/server.conf.erb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/templates/server.conf.erb b/templates/server.conf.erb index b317ec1..dbb1a5f 100644 --- a/templates/server.conf.erb +++ b/templates/server.conf.erb @@ -21,6 +21,7 @@ $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat # Switch to remote ruleset $RuleSet remote +<% if scope.lookupvar('rsyslog::server::enable_onefile') == false -%> # Templates $Template dynAuthLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/auth.log" $Template dynSyslog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/syslog" @@ -44,6 +45,13 @@ user.* -?dynUserLog 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" + +# Rules +*.* -?dynAllMessages +<% end -%> # Switch back to default ruleset $RuleSet RSYSLOG_DefaultRuleset |