X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=templates%2Fsyslog-ng.conf.erb;h=c903ced4feaf3e922415d00c4f541fb38e409598;hb=a6287d345ebebf55900ace3a4fd7af613ef5915d;hp=637250b7b822e6be475b01ac049cf999d067f86e;hpb=a2755641cae03dc0ce58f3986df91e3deca61070;p=mirror%2Fdsa-puppet.git

diff --git a/templates/syslog-ng.conf.erb b/templates/syslog-ng.conf.erb
index 637250b7b..c903ced4f 100644
--- a/templates/syslog-ng.conf.erb
+++ b/templates/syslog-ng.conf.erb
@@ -1,3 +1,8 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
 #
 # Configuration file for syslog-ng under Debian
 #
@@ -83,7 +88,7 @@ options {
 source s_all {
         # message generated by Syslog-NG
         internal();
-<% if $kernel == 'Linux' %>
+<% if kernel == 'Linux' %>
         # standard Linux log source (this is the default place for the syslog()
         # function to send logs to)
         unix-stream("/dev/log");
@@ -98,7 +103,9 @@ source s_all {
 <%end%>
         # use the following line if you want to receive remote UDP logging messages
         # (this is equivalent to the "-r" syslogd flag)
-        # udp();
+<% if hostname == "paganini" -%>
+        udp();
+<%end%>
 };
 
 
@@ -138,10 +145,12 @@ destination df_news_dot_crit { file("/var/log/news/news.crit" owner("news")); };
 destination df_debug { file("/var/log/debug"); };
 destination df_messages { file("/var/log/messages"); };
 
+<% if kernel == 'Linux' %>
 # pipes
 # a console to view log messages under X
 destination dp_xconsole { pipe("/dev/xconsole"); };
 
+<% end %>
 # consoles
 # this will send messages to everyone logged in
 destination du_all { usertty("*"); };
@@ -190,6 +199,7 @@ filter f_messages {
 # messages with priority emerg
 filter f_emerg { level(emerg); };
 
+<% if kernel == 'Linux' %>
 # complex filter for messages usually sent to the xconsole
 filter f_xconsole {
     facility(daemon,mail)
@@ -198,7 +208,7 @@ filter f_xconsole {
                 and level(crit,err,notice));
 };
 
-
+<% end %>
 ######
 # logs
 # order matters if you use "flags(final);" to mark the end of processing in a
@@ -347,6 +357,7 @@ log {
 };
 
 
+<% if kernel == 'Linux' %>
 # daemon.*;mail.*;\
 #         news.crit;news.err;news.notice;\
 #         *.=debug;*.=info;\
@@ -356,4 +367,15 @@ log {
         filter(f_xconsole);
         destination(dp_xconsole);
 };
+<%end%>
 
+<% if hostname == "corelli" -%>
+destination loghost-paganini {
+	udp("192.168.2.10",port(514));
+};
+
+log {
+	source(s_all);
+	destination(loghost-paganini);
+};
+<%end%>