Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

restore standard syslog

  • Loading branch information...
commit ec05b74a6ae85202dd00addedaaf2a91ceeb4fe2 1 parent 2ba728f
@jsierles authored
Showing with 5 additions and 32 deletions.
  1. +5 −32 syslog-ng/templates/default/syslog-ng-client.conf.erb
View
37 syslog-ng/templates/default/syslog-ng-client.conf.erb
@@ -6,29 +6,12 @@ options {
};
source src {
- unix-stream("/dev/log" max-connections(256));
- internal();
- pipe("/proc/kmsg");
+ unix-stream("/dev/log" max-connections(256));
+ internal();
+ pipe("/proc/kmsg");
};
-<% if @node[:syslog] && @node[:syslog][:source_files] %>
-<% @node[:syslog][:source_files].each do |name, conf| -%>
-source <%= name %> {
- file("<%= conf[:path] %>" follow_freq(1) flags(no-parse));
-};
-
-destination d_loggly_<%= name %> { tcp("logs.loggly.com", port(<%= conf[:port] %>)); };
-log { source(<%= name %>); destination(d_loggly_<%= name %>); flags(final); };
-<% end -%>
-<% end -%>
-
-<% if @node[:loggly][:enabled] == true %>
-destination d_loggly_system { tcp("logs.loggly.com", port(<%= @node[:loggly][:system_log_port] %>)); };
-destination d_loggly_app { tcp("logs.loggly.com", port(<%= @node[:loggly][:app_log_port] %>)); };
-<% end %>
-
destination d_syslog_remote { tcp("<%= @node[:syslog_ng][:default_host] %>", port(5140)); };
-
destination d_null { file("/dev/null.syslog"); };
destination d_messages { file("/var/log/messages"); };
@@ -42,18 +25,8 @@ log { source(src); filter(f_bluepill_junk); destination(d_null); flags(final); }
<% if @node[:active_applications] %>
filter f_application { <%= @node[:active_applications].keys.map { |a| %W/program("#{a}")/ }.join(" or ") %>; };
-<% if @node[:loggly][:enabled] == true %>
-log { source(src); filter(f_application); destination(d_loggly_app); };
-log { source(src); filter(f_application); destination(d_loggly_app); };
log { source(src); filter(f_application); destination(d_syslog_remote); flags(final); };
-<% else %>
-log { source(src); filter(f_application); destination(d_messages); flags(final); };
-<% end %>
<% end %>
-<% if @node[:loggly][:enabled] == true %>
-log { source(src); destination(d_loggly_system); };
-log { source(src); destination(d_syslog_remote); flags(final); };
-<% else %>
-log { source(src); destination(d_messages); flags(final); };
-<% end %>
+log { source(src); destination(d_messages); };
+log { source(src); destination(d_syslog_remote); flags(final); };
Please sign in to comment.
Something went wrong with that request. Please try again.