1 |
ultrabug 12/06/01 12:54:18 |
2 |
|
3 |
Added: rsyslog.initd rsyslog-gentoo.conf rsyslog.confd |
4 |
rsyslog.logrotate rsyslog6-zeromq.patch |
5 |
Log: |
6 |
New stable v6 branch bump, fix #398269. |
7 |
|
8 |
(Portage version: 2.1.10.63/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 app-admin/rsyslog/files/6-stable/rsyslog.initd |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/6-stable/rsyslog.initd?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/6-stable/rsyslog.initd?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: rsyslog.initd |
17 |
=================================================================== |
18 |
#!/sbin/runscript |
19 |
# Copyright 1999-2012 Gentoo Foundation |
20 |
# Distributed under the terms of the GNU General Public License v2 |
21 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/6-stable/rsyslog.initd,v 1.1 2012/06/01 12:54:17 ultrabug Exp $ |
22 |
|
23 |
extra_started_commands="reload" |
24 |
|
25 |
depend() { |
26 |
provide logger |
27 |
} |
28 |
|
29 |
start() { |
30 |
ebegin "Starting rsyslogd" |
31 |
start-stop-daemon \ |
32 |
--start --quiet --exec /usr/sbin/rsyslogd \ |
33 |
-- ${RSYSLOG_OPTS} -i "${PIDFILE}" -f "${CONFIGFILE}" |
34 |
eend $? |
35 |
} |
36 |
|
37 |
stop() { |
38 |
ebegin "Stopping rsyslogd" |
39 |
start-stop-daemon \ |
40 |
--stop --quiet \ |
41 |
--pidfile "${PIDFILE}" |
42 |
eend $? |
43 |
} |
44 |
|
45 |
reload() { |
46 |
if [ ! -f "${PIDFILE}" ]; then |
47 |
eerror "rsyslogd not running" |
48 |
return 1 |
49 |
fi |
50 |
|
51 |
# Baselayout-1 users still use --stop and --oknodo |
52 |
local USEROPT="--name rsyslogd" |
53 |
if [ ! -f /etc/init.d/sysfs ]; then |
54 |
USEROPT="--stop --oknodo" |
55 |
fi |
56 |
|
57 |
ebegin "Re-opening rsyslogd log files" |
58 |
start-stop-daemon --signal HUP --pidfile "${PIDFILE}" ${USEROPT} |
59 |
eend $? |
60 |
} |
61 |
|
62 |
|
63 |
|
64 |
1.1 app-admin/rsyslog/files/6-stable/rsyslog-gentoo.conf |
65 |
|
66 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/6-stable/rsyslog-gentoo.conf?rev=1.1&view=markup |
67 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/6-stable/rsyslog-gentoo.conf?rev=1.1&content-type=text/plain |
68 |
|
69 |
Index: rsyslog-gentoo.conf |
70 |
=================================================================== |
71 |
# rsyslog v5: load input modules |
72 |
# If you do not load inputs, nothing happens! |
73 |
# You may need to set the module load path if modules are not found. |
74 |
|
75 |
$ModLoad immark.so # provides --MARK-- message capability |
76 |
$ModLoad imuxsock.so # provides support for local system logging (e.g. via logger command) |
77 |
$ModLoad imklog.so # kernel logging (formerly provided by rklogd) |
78 |
|
79 |
# Include configuration files from directory |
80 |
$IncludeConfig /etc/rsyslog.d/* |
81 |
|
82 |
# Check config syntax on startup and abort if unclean (default off) |
83 |
#$AbortOnUncleanConfig on |
84 |
|
85 |
# Reduce repeating messages (default off) |
86 |
#$RepeatedMsgReduction on |
87 |
|
88 |
# Log all kernel messages to the console. |
89 |
# Logging much else clutters up the screen. |
90 |
#kern.* /dev/console |
91 |
|
92 |
# Log anything (except mail) of level info or higher. |
93 |
# Don't log private authentication messages! |
94 |
*.info;mail.none;authpriv.none;cron.none -/var/log/messages |
95 |
|
96 |
# The authpriv file has restricted access. |
97 |
authpriv.* /var/log/secure |
98 |
|
99 |
# Log all the mail messages in one place. |
100 |
mail.* -/var/log/maillog |
101 |
|
102 |
# Log cron stuff |
103 |
cron.* -/var/log/cron |
104 |
|
105 |
# Everybody gets emergency messages |
106 |
*.emerg :omusrmsg:* |
107 |
|
108 |
# Save news errors of level crit and higher in a special file. |
109 |
uucp,news.crit -/var/log/spooler |
110 |
|
111 |
# Save boot messages also to boot.log |
112 |
local7.* /var/log/boot.log |
113 |
|
114 |
# More configuration examples: |
115 |
# |
116 |
# Remote Logging (we use TCP for reliable delivery) |
117 |
# An on-disk queue is created for this action. If the remote host is |
118 |
# down, messages are spooled to disk and sent when it is up again. |
119 |
#$WorkDirectory /var/spool/rsyslog # where to place spool files |
120 |
#$ActionQueueFileName uniqName # unique name prefix for spool files |
121 |
#$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible) |
122 |
#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown |
123 |
#$ActionQueueType LinkedList # run asynchronously |
124 |
#$ActionResumeRetryCount -1 # infinety retries if host is down |
125 |
#$ActionResumeInterval 30 # retry interval |
126 |
# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional |
127 |
#*.* @@remote-host |
128 |
|
129 |
# Remote Logging with TCP + SSL/TLS |
130 |
#$DefaultNetstreamDriver gtls |
131 |
#$DefaultNetstreamDriverCAFile /etc/ssl/rsyslog/rsyslog_ca.cert.pem |
132 |
#$DefaultNetstreamDriverCertFile /etc/ssl/rsyslog/rsyslog_CLIENT.cert.pem |
133 |
#$DefaultNetstreamDriverKeyFile /etc/ssl/rsyslog/rsyslog_CLIENT.key.pem |
134 |
#$ActionSendStreamDriverAuthMode x509/name # enable peer authentication |
135 |
#$ActionSendStreamDriverPermittedPeer foo # authorize to send encrypted data to server foo |
136 |
#$ActionSendStreamDriverMode 1 # run driver in TLS-only mode |
137 |
|
138 |
# ######### Receiving Messages from Remote Hosts ########## |
139 |
# TCP Syslog Server: |
140 |
#$ModLoad imtcp # provides TCP syslog reception |
141 |
#$TCPServerRun 10514 # start a TCP syslog server at port 10514 |
142 |
|
143 |
# TCP + SSL/TLS Syslog Server: |
144 |
#$ModLoad imtcp # provides TCP syslog reception |
145 |
#$DefaultNetstreamDriver gtls # use gnuTLS for data encryption |
146 |
#$DefaultNetstreamDriverCAFile /etc/ssl/rsyslog/rsyslog_ca.cert.pem |
147 |
#$DefaultNetstreamDriverCertFile /etc/ssl/rsyslog/rsyslog_SERVER.cert.pem |
148 |
#$DefaultNetstreamDriverKeyFile /etc/ssl/rsyslog/rsyslog_SERVER.key.pem |
149 |
#$InputTCPServerStreamDriverMode 1 # run driver in TLS-only mode |
150 |
#$InputTCPServerStreamDriverAuthMode x509/name # enable peer authentication |
151 |
#$InputTCPServerStreamDriverPermittedPeer bar # authorize client named bar (one line per client) |
152 |
#$TCPServerRun 10514 # start a TCP syslog server at port 10514 |
153 |
|
154 |
# UDP Syslog Server: |
155 |
#$ModLoad imudp.so # provides UDP syslog reception |
156 |
#$UDPServerRun 514 # start a UDP syslog server at standard port 514 |
157 |
|
158 |
# RELP Syslog Server: |
159 |
#$ModLoad imrelp # provides RELP syslog reception |
160 |
#$InputRELPServerRun 10515 # start a RELP syslog server at port 10515 |
161 |
|
162 |
|
163 |
|
164 |
1.1 app-admin/rsyslog/files/6-stable/rsyslog.confd |
165 |
|
166 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/6-stable/rsyslog.confd?rev=1.1&view=markup |
167 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/6-stable/rsyslog.confd?rev=1.1&content-type=text/plain |
168 |
|
169 |
Index: rsyslog.confd |
170 |
=================================================================== |
171 |
# Copyright 1999-2012 Gentoo Foundation |
172 |
# Distributed under the terms of the GNU General Public License v2 |
173 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/6-stable/rsyslog.confd,v 1.1 2012/06/01 12:54:17 ultrabug Exp $ |
174 |
|
175 |
# Configuration file |
176 |
CONFIGFILE="/etc/rsyslog.conf" |
177 |
|
178 |
# PID file |
179 |
PIDFILE="/var/run/rsyslogd.pid" |
180 |
|
181 |
# Options to rsyslogd |
182 |
# See rsyslogd(8) for more details |
183 |
# Notes: |
184 |
# * Do not specify another PIDFILE but use the variable above to change the location |
185 |
# * Do not specify another CONFIGFILE but use the variable above to change the location |
186 |
# * "-c5" tells rsyslog to _not_ run in sysklogd compatibility mode |
187 |
RSYSLOG_OPTS="-c5" |
188 |
|
189 |
|
190 |
|
191 |
1.1 app-admin/rsyslog/files/6-stable/rsyslog.logrotate |
192 |
|
193 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/6-stable/rsyslog.logrotate?rev=1.1&view=markup |
194 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/6-stable/rsyslog.logrotate?rev=1.1&content-type=text/plain |
195 |
|
196 |
Index: rsyslog.logrotate |
197 |
=================================================================== |
198 |
# Copyright 1999-2012 Gentoo Foundation |
199 |
# Distributed under the terms of the GNU General Public License v2 |
200 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/6-stable/rsyslog.logrotate,v 1.1 2012/06/01 12:54:17 ultrabug Exp $ |
201 |
/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log { |
202 |
sharedscripts |
203 |
postrotate |
204 |
/etc/init.d/rsyslog reload &>/dev/null || true |
205 |
endscript |
206 |
} |
207 |
|
208 |
|
209 |
|
210 |
1.1 app-admin/rsyslog/files/6-stable/rsyslog6-zeromq.patch |
211 |
|
212 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/6-stable/rsyslog6-zeromq.patch?rev=1.1&view=markup |
213 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/6-stable/rsyslog6-zeromq.patch?rev=1.1&content-type=text/plain |
214 |
|
215 |
Index: rsyslog6-zeromq.patch |
216 |
=================================================================== |
217 |
--- a/Makefile.am 2012-06-01 12:54:30.118114106 +0200 |
218 |
+++ b/Makefile.am 2012-06-01 12:56:30.949078827 +0200 |
219 |
@@ -198,6 +198,14 @@ |
220 |
SUBDIRS += plugins/omprog |
221 |
endif |
222 |
|
223 |
+if ENABLE_IMZEROMQ |
224 |
+SUBDIRS += plugins/imzeromq |
225 |
+endif |
226 |
+ |
227 |
+if ENABLE_OMZEROMQ |
228 |
+SUBDIRS += plugins/omzeromq |
229 |
+endif |
230 |
+ |
231 |
if ENABLE_RFC3195 |
232 |
SUBDIRS += plugins/im3195 |
233 |
endif |
234 |
@@ -242,6 +250,8 @@ |
235 |
--enable-pmlastmsg \ |
236 |
--enable-omruleset \ |
237 |
--enable-omprog \ |
238 |
+ --enable-imzeromq \ |
239 |
+ --enable-omzeromq \ |
240 |
--enable-imdiag \ |
241 |
--enable-imptcp \ |
242 |
--enable-imttcp \ |
243 |
--- a/configure.ac 2012-06-01 12:54:30.118114106 +0200 |
244 |
+++ b/configure.ac 2012-06-01 12:59:14.250380620 +0200 |
245 |
@@ -884,6 +884,17 @@ |
246 |
) |
247 |
AM_CONDITIONAL(ENABLE_IMFILE, test x$enable_imfile = xyes) |
248 |
|
249 |
+# settings for the ZeroMQ input module |
250 |
+AC_ARG_ENABLE(imzeromq, |
251 |
+ [AS_HELP_STRING([--enable-imzeromq],[file input module enabled @<:@default=no@:>@])], |
252 |
+ [case "${enableval}" in |
253 |
+ yes) enable_imzeromq="yes" ;; |
254 |
+ no) enable_imzeromq="no" ;; |
255 |
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-imzeromq) ;; |
256 |
+ esac], |
257 |
+ [enable_imzeromq=no] |
258 |
+) |
259 |
+AM_CONDITIONAL(ENABLE_IMZEROMQ, test x$enable_imzeromq = xyes) |
260 |
|
261 |
# settings for the door input module (under solaris, thus default off) |
262 |
AC_ARG_ENABLE(imsolaris, |
263 |
@@ -948,6 +959,17 @@ |
264 |
) |
265 |
AM_CONDITIONAL(ENABLE_OMPROG, test x$enable_omprog = xyes) |
266 |
|
267 |
+# settings for the omzeromq output module |
268 |
+AC_ARG_ENABLE(omzeromq, |
269 |
+ [AS_HELP_STRING([--enable-omzeromq],[Compiles omzeromq module @<:@default=no@:>@])], |
270 |
+ [case "${enableval}" in |
271 |
+ yes) enable_omzeromq="yes" ;; |
272 |
+ no) enable_omzeromq="no" ;; |
273 |
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-omzeromq) ;; |
274 |
+ esac], |
275 |
+ [enable_omzeromq=no] |
276 |
+) |
277 |
+AM_CONDITIONAL(ENABLE_OMZEROMQ, test x$enable_omzeromq = xyes) |
278 |
|
279 |
# settings for omudpspoof |
280 |
AC_ARG_ENABLE(omudpspoof, |
281 |
@@ -1251,6 +1273,7 @@ |
282 |
plugins/omtemplate/Makefile \ |
283 |
plugins/omhdfs/Makefile \ |
284 |
plugins/omprog/Makefile \ |
285 |
+ plugins/omzeromq/Makefile \ |
286 |
plugins/omstdout/Makefile \ |
287 |
plugins/pmrfc3164sd/Makefile \ |
288 |
plugins/pmlastmsg/Makefile \ |
289 |
@@ -1261,6 +1284,7 @@ |
290 |
plugins/omdbalerting/Makefile \ |
291 |
plugins/omuxsock/Makefile \ |
292 |
plugins/imfile/Makefile \ |
293 |
+ plugins/imzeromq/Makefile \ |
294 |
plugins/imsolaris/Makefile \ |
295 |
plugins/imptcp/Makefile \ |
296 |
plugins/imttcp/Makefile \ |
297 |
@@ -1304,6 +1328,7 @@ |
298 |
echo " threaded plain tcp input module enabled: $enable_imttcp" |
299 |
echo " imdiag enabled: $enable_imdiag" |
300 |
echo " file input module enabled: $enable_imfile" |
301 |
+echo " ZeroMQ input module enabled: $enable_imzeromq" |
302 |
echo " Solaris input module enabled: $enable_imsolaris" |
303 |
echo " periodic statistics module enabled: $enable_impstats" |
304 |
echo " input template module will be compiled: $enable_imtemplate" |
305 |
@@ -1311,6 +1336,7 @@ |
306 |
echo "---{ output plugins }---" |
307 |
echo " Mail support enabled: $enable_mail" |
308 |
echo " omprog module will be compiled: $enable_omprog" |
309 |
+echo " omzeromq module will be compiled: $enable_omzeromq" |
310 |
echo " output mongodb module will be compiled: $enable_ommongodb" |
311 |
echo " omstdout module will be compiled: $enable_omstdout" |
312 |
echo " omhdfs module will be compiled: $enable_omhdfs" |