From cd214870c9e787cdd8e54645b430edd8f0a649cc Mon Sep 17 00:00:00 2001
From: Johan van den Dorpe <johan.vandendorpe@gmail.com>
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.conf.erb | 67 -----------------------------------------------
 1 file changed, 67 deletions(-)
 delete mode 100644 templates/server.conf.erb

(limited to 'templates/server.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 -%>
-- 
cgit v1.2.3