projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sibelius nfs on public net, 2
[mirror/dsa-puppet.git]
/
modules
/
syslog_ng
/
templates
/
syslog-ng.conf.erb
diff --git
a/modules/syslog_ng/templates/syslog-ng.conf.erb
b/modules/syslog_ng/templates/syslog-ng.conf.erb
index
d68fe0c
..
031e606
100644
(file)
--- a/
modules/syslog_ng/templates/syslog-ng.conf.erb
+++ b/
modules/syslog_ng/templates/syslog-ng.conf.erb
@@
-3,6
+3,9
@@
<%- elsif has_variable?("syslogversion") and @syslogversion.to_s == "3.5" -%>
@version: 3.5
@include "scl.conf"
<%- elsif has_variable?("syslogversion") and @syslogversion.to_s == "3.5" -%>
@version: 3.5
@include "scl.conf"
+<%- elsif has_variable?("syslogversion") and @syslogversion.to_s == "3.8" -%>
+@version: 3.8
+@include "scl.conf"
<%- else -%>
@version: 3.3
@include "scl.conf"
<%- else -%>
@version: 3.3
@include "scl.conf"
@@
-116,6
+119,9
@@
source s_local {
<%- else -%>
system();
<%- end -%>
<%- else -%>
system();
<%- end -%>
+<%- if has_variable?("haproxy") && @haproxy -%>
+ unix-stream("/var/lib/haproxy/dev/log");
+<%- end -%>
};
<%- if (@hostname == "lotti") || (@hostname == "lully") || (@hostname == "loghost-grnet-01") -%>
};
<%- if (@hostname == "lotti") || (@hostname == "lully") || (@hostname == "loghost-grnet-01") -%>
@@
-129,6
+135,16
@@
source s_network {
};
<%- end -%>
};
<%- end -%>
+<%- if (@hostname == "lully") -%>
+source s_network_fastly {
+ tcp6(port(5141) max-connections(100)
+ tls( key_file("/etc/exim4/ssl/thishost.key")
+ cert_file("/etc/exim4/ssl/thishost.crt")
+ peer-verify(optional-untrusted))
+ );
+};
+<%- end -%>
+
######
# destinations
######
# destinations
@@
-554,3
+570,11
@@
log { source(s_local);
source(s_network);
filter(f_syslog); destination(df_ALL_syslog); };
<%- end -%>
source(s_network);
filter(f_syslog); destination(df_ALL_syslog); };
<%- end -%>
+
+<%- if (@hostname == "lully") -%>
+destination fastly { file("/var/log/fastly.log"); };
+
+log { source(s_network_fastly);
+ destination(fastly); };
+
+<%- end -%>