projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
give wuiet and quantz access to the main cluster on bmdb1
[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
23f5393
..
546bf1c
100644
(file)
--- a/
modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/
modules/syslog-ng/templates/syslog-ng.conf.erb
@@
-91,6
+91,9
@@
options {
bad_hostname("^gconfd$");
keep_hostname(no);
bad_hostname("^gconfd$");
keep_hostname(no);
+
+ # We believe our own clock more than we believe the client clock.
+ keep_timestamp(no);
};
};
@@
-112,16
+115,11
@@
source s_local {
# function to send logs to)
unix-dgram("/var/run/log");
# messages from the kernel
# function to send logs to)
unix-dgram("/var/run/log");
# messages from the kernel
- file("/dev/klog" program_override("kernel: "));
-<%- end -%>
-<%- if hostname == "paganini" -%>
- # use the following line if you want to receive remote UDP logging messages
- # (this is equivalent to the "-r" syslogd flag)
- udp();
+ file("/dev/klog" program_override("kernel: ") follow-freq(1));
<%- end -%>
};
<%- end -%>
};
-<%- if (hostname == "
heininen") || (hostname == "lotti
") -%>
+<%- if (hostname == "
lotti") || (hostname == "lully
") -%>
source s_network {
tcp6(port(5140) max-connections(200)
tls( key_file("/etc/exim4/ssl/thishost.key")
source s_network {
tcp6(port(5140) max-connections(200)
tls( key_file("/etc/exim4/ssl/thishost.key")
@@
-144,7
+142,7
@@
destination df_daemon { file("/var/log/daemon.log"); };
destination df_kern { file("/var/log/kern.log"); };
destination df_lpr { file("/var/log/lpr.log"); };
destination df_mail { file("/var/log/mail.log" group(maillog)); };
destination df_kern { file("/var/log/kern.log"); };
destination df_lpr { file("/var/log/lpr.log"); };
destination df_mail { file("/var/log/mail.log" group(maillog)); };
-destination df_mail_info { file("/var/log/mail.info" group(maillog)); };
+
#
destination df_mail_info { file("/var/log/mail.info" group(maillog)); };
destination df_mail_warn { file("/var/log/mail.warn" group(maillog)); };
destination df_mail_err { file("/var/log/mail.err" group(maillog)); };
destination df_user { file("/var/log/user.log" perm(0644)); };
destination df_mail_warn { file("/var/log/mail.warn" group(maillog)); };
destination df_mail_err { file("/var/log/mail.err" group(maillog)); };
destination df_user { file("/var/log/user.log" perm(0644)); };
@@
-310,12
+308,12
@@
log {
};
# mail.info -/var/log/mail.info
};
# mail.info -/var/log/mail.info
-log {
- source(s_local);
- filter(f_mail);
- filter(f_at_least_info);
- destination(df_mail_info);
-};
+
#
log {
+
#
source(s_local);
+
#
filter(f_mail);
+
#
filter(f_at_least_info);
+
#
destination(df_mail_info);
+
#
};
# mail.warn -/var/log/mail.warn
log {
# mail.warn -/var/log/mail.warn
log {
@@
-399,10
+397,9
@@
log {
<%- end -%>
<%- end -%>
-<%- if has_variable?("syslogversion") and syslogversion.to_s == "3.1" -%>
- <%- if hostname != "heininen" -%>
-destination loghost-heininen {
- tcp("heininen.debian.org" port (5140)
+ <%- if hostname != "lotti" -%>
+destination loghost-lotti {
+ tcp("lotti.debian.org" port (5140)
tls( key_file("/etc/ssl/debian/keys/thishost.key")
cert_file("/etc/ssl/debian/certs/thishost.crt")
ca_dir("/etc/ssl/debian/certs/")
tls( key_file("/etc/ssl/debian/keys/thishost.key")
cert_file("/etc/ssl/debian/certs/thishost.crt")
ca_dir("/etc/ssl/debian/certs/")
@@
-410,9
+407,9
@@
destination loghost-heininen {
);
};
<%- end -%>
);
};
<%- end -%>
-
<%- if hostname != "lotti
" -%>
-destination loghost-l
otti
{
- tcp("l
otti
.debian.org" port (5140)
+
<%- if hostname != "lully
" -%>
+destination loghost-l
ully
{
+ tcp("l
ully
.debian.org" port (5140)
tls( key_file("/etc/ssl/debian/keys/thishost.key")
cert_file("/etc/ssl/debian/certs/thishost.crt")
ca_dir("/etc/ssl/debian/certs/")
tls( key_file("/etc/ssl/debian/keys/thishost.key")
cert_file("/etc/ssl/debian/certs/thishost.crt")
ca_dir("/etc/ssl/debian/certs/")
@@
-423,18
+420,17
@@
destination loghost-lotti {
log {
source(s_local);
log {
source(s_local);
- <%- if hostname != "heininen" -%>
- destination(loghost-heininen);
- <%- end -%>
<%- if hostname != "lotti" -%>
destination(loghost-lotti);
<%- end -%>
<%- if hostname != "lotti" -%>
destination(loghost-lotti);
<%- end -%>
+ <%- if hostname != "lully" -%>
+ destination(loghost-lully);
+ <%- end -%>
};
};
-<%- end -%>
-<%- if (hostname == "
heininen") || (hostname == "lotti
") -%>
+<%- if (hostname == "
lotti") || (hostname == "lully
") -%>
###############################################################################
########## ON LOG HOST ########################################################
###############################################################################
###############################################################################
########## ON LOG HOST ########################################################
###############################################################################