From cd214870c9e787cdd8e54645b430edd8f0a649cc Mon Sep 17 00:00:00 2001 From: Johan van den Dorpe Date: Mon, 11 Mar 2013 16:47:28 +0000 Subject: Rename server.conf.erb to server-default.conf.erb and create _default partial templates Split out server template into two parts: server/_default-{header,footer}.conf.erb which hold unchaning values server-default.conf.erb which contains commonly modified values, and imports _default.conf.erb --- templates/server-default.conf.erb | 42 +++++++++++++++++++ templates/server.conf.erb | 67 ------------------------------- templates/server/_default-footer.conf.erb | 13 ++++++ templates/server/_default-header.conf.erb | 20 +++++++++ 4 files changed, 75 insertions(+), 67 deletions(-) create mode 100644 templates/server-default.conf.erb delete mode 100644 templates/server.conf.erb create mode 100644 templates/server/_default-footer.conf.erb create mode 100644 templates/server/_default-header.conf.erb (limited to 'templates') diff --git a/templates/server-default.conf.erb b/templates/server-default.conf.erb new file mode 100644 index 0000000..fdf32d1 --- /dev/null +++ b/templates/server-default.conf.erb @@ -0,0 +1,42 @@ +# File is managed by puppet + +<% # Common header across all templates -%> +<%= scope.function_template(['rsyslog/server/_default-header.conf.erb']) %> + +# Log files are stored in directories matching the short hostname, excluding numbers +# i.e. web01 web02 and web03 will all log to a the web directory +<% 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" +$Template dynCronLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/cron.log" +$Template dynDaemonLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/daemon.log" +$Template dynKernLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/kern.log" +$Template dynUserLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/user.log" +$Template dynMailLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/mail.log" +$Template dynDebug,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/debug" +$Template dynMessages,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/messages" + +# Rules +auth,authpriv.* ?dynAuthLog +*.*;auth,authpriv.none,mail.none,cron.none -?dynSyslog +cron.* ?dynCronLog +daemon.* -?dynDaemonLog +kern.* -?dynKernLog +mail.* -?dynMailLog +user.* -?dynUserLog +*.=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" + +# Rules +*.* -?dynAllMessages +<% end -%> + +<% # Common footer across all templates -%> +<%= scope.function_template(['rsyslog/server/_default-footer.conf.erb']) %> diff --git a/templates/server.conf.erb b/templates/server.conf.erb deleted file mode 100644 index dbb1a5f..0000000 --- a/templates/server.conf.erb +++ /dev/null @@ -1,67 +0,0 @@ -# File is managed by puppet - -<% if scope.lookupvar('rsyslog::server::enable_udp') -%> -# Load UDP module -$ModLoad imudp -<% end -%> - -<% if scope.lookupvar('rsyslog::server::enable_tcp') -%> -# Load TCP module -$ModLoad imtcp -<% end -%> - -<% if scope.lookupvar('rsyslog::server::high_precision_timestamps') == false -%> -# -# Use traditional timestamp format. -# To enable high precision timestamps, comment out the following line. -# -$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat -<% end -%> - -# 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" -$Template dynCronLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/cron.log" -$Template dynDaemonLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/daemon.log" -$Template dynKernLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/kern.log" -$Template dynUserLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/user.log" -$Template dynMailLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/mail.log" -$Template dynDebug,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/debug" -$Template dynMessages,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/messages" - -# Rules -auth,authpriv.* ?dynAuthLog -*.*;auth,authpriv.none,mail.none,cron.none -?dynSyslog -cron.* ?dynCronLog -daemon.* -?dynDaemonLog -kern.* -?dynKernLog -mail.* -?dynMailLog -user.* -?dynUserLog -*.=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" - -# Rules -*.* -?dynAllMessages -<% end -%> - -# Switch back to default ruleset -$RuleSet RSYSLOG_DefaultRuleset - -<% if scope.lookupvar('rsyslog::server::enable_udp') -%> -$InputUDPServerBindRuleset remote -$UDPServerRun 514 -<% end -%> - -<% if scope.lookupvar('rsyslog::server::enable_tcp') -%> -$InputTCPServerBindRuleset remote -$InputTCPServerRun 514 -<% end -%> diff --git a/templates/server/_default-footer.conf.erb b/templates/server/_default-footer.conf.erb new file mode 100644 index 0000000..7ba4750 --- /dev/null +++ b/templates/server/_default-footer.conf.erb @@ -0,0 +1,13 @@ + +# Switch back to default ruleset +$RuleSet RSYSLOG_DefaultRuleset + +<% if scope.lookupvar('rsyslog::server::enable_udp') -%> +$InputUDPServerBindRuleset remote +$UDPServerRun 514 +<% end -%> + +<% if scope.lookupvar('rsyslog::server::enable_tcp') -%> +$InputTCPServerBindRuleset remote +$InputTCPServerRun 514 +<% end -%> diff --git a/templates/server/_default-header.conf.erb b/templates/server/_default-header.conf.erb new file mode 100644 index 0000000..19eb173 --- /dev/null +++ b/templates/server/_default-header.conf.erb @@ -0,0 +1,20 @@ +<% if scope.lookupvar('rsyslog::server::enable_udp') -%> +# Load UDP module +$ModLoad imudp +<% end -%> + +<% if scope.lookupvar('rsyslog::server::enable_tcp') -%> +# Load TCP module +$ModLoad imtcp +<% end -%> + +<% if scope.lookupvar('rsyslog::server::high_precision_timestamps') == false -%> +# +# Use traditional timestamp format. +# To enable high precision timestamps, comment out the following line. +# +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat +<% end -%> + +# Switch to remote ruleset +$RuleSet remote -- cgit v1.2.3 From bdee10e4e43a20f025ab6722db34542f47504114 Mon Sep 17 00:00:00 2001 From: Johan van den Dorpe Date: Mon, 11 Mar 2013 22:07:46 +0000 Subject: Add server-hostname template and tests --- templates/server-hostname.conf.erb | 41 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 templates/server-hostname.conf.erb (limited to 'templates') diff --git a/templates/server-hostname.conf.erb b/templates/server-hostname.conf.erb new file mode 100644 index 0000000..2c2e75a --- /dev/null +++ b/templates/server-hostname.conf.erb @@ -0,0 +1,41 @@ +# File is managed by puppet + +<% # Common header across all templates -%> +<%= scope.function_template(['rsyslog/server/_default-header.conf.erb']) %> + +# Log files are stored in directories matching the hostname +<% if scope.lookupvar('rsyslog::server::enable_onefile') == false -%> + +# Templates +$Template dynAuthLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%/auth.log" +$Template dynSyslog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%/syslog" +$Template dynCronLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%/cron.log" +$Template dynDaemonLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%/daemon.log" +$Template dynKernLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%/kern.log" +$Template dynUserLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%/user.log" +$Template dynMailLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%/mail.log" +$Template dynDebug,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%/debug" +$Template dynMessages,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%hostname%/messages" + +# Rules +auth,authpriv.* ?dynAuthLog +*.*;auth,authpriv.none,mail.none,cron.none -?dynSyslog +cron.* ?dynCronLog +daemon.* -?dynDaemonLog +kern.* -?dynKernLog +mail.* -?dynMailLog +user.* -?dynUserLog +*.=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') -%>%hostname%/messages" + +# Rules +*.* -?dynAllMessages +<% end -%> + +<% # Common footer across all templates -%> +<%= scope.function_template(['rsyslog/server/_default-footer.conf.erb']) %> -- cgit v1.2.3