diff options
| author | Saz <me@saz.sh> | 2011-12-03 15:29:04 +0100 |
|---|---|---|
| committer | Saz <me@saz.sh> | 2011-12-03 15:29:04 +0100 |
| commit | 03bd764e24860aaaed00061c6d118be7310577f9 (patch) | |
| tree | 1953d160f1dca6cebd2016f92f87f6aa3369ee34 /templates | |
| parent | c893ec6d1a8c778e63c86c1733eb8ae1839fff4e (diff) | |
udp/tcp can be switched on or off, no newline after variables
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/server.conf.erb | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/templates/server.conf.erb b/templates/server.conf.erb index c33751c..402c0e6 100644 --- a/templates/server.conf.erb +++ b/templates/server.conf.erb @@ -1,29 +1,28 @@ # File is managed by puppet +<% if scope.lookupvar('rsyslog::server::enable_udp') -%> $ModLoad imudp $UDPServerRun 514 +<% end -%> +<% if scope.lookupvar('rsyslog::server::enable_tcp') -%> $ModLoad imtcp $TCPServerRun 514 +<% end -%> $ModLoad imrelp $InputRELPServerRun 2514 -$FileOwner root -$FileGroup adm -$FileCreateMode 0640 -$DirCreateMode 0750 - # Templates -$Template dynAuthLog,"<%= scope.lookupvar('rsyslog::params::server_dir') %>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/auth.log" -$Template dynSyslog,"<%= scope.lookupvar('rsyslog::params::server_dir') %>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/syslog" -$Template dynCronLog,"<%= scope.lookupvar('rsyslog::params::server_dir') %>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/cron.log" -$Template dynDaemonLog,"<%= scope.lookupvar('rsyslog::params::server_dir') %>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/daemon.log" -$Template dynKernLog,"<%= scope.lookupvar('rsyslog::params::server_dir') %>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/kern.log" -$Template dynUserLog,"<%= scope.lookupvar('rsyslog::params::server_dir') %>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/user.log" -$Template dynMailLog,"<%= scope.lookupvar('rsyslog::params::server_dir') %>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/mail.log" -$Template dynDebug,"<%= scope.lookupvar('rsyslog::params::server_dir') %>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/debug" -$Template dynMessages,"<%= scope.lookupvar('rsyslog::params::server_dir') %>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/messages" +$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 |