1. photon
  2. Commit a92e6f99789f486c07234ea16769e57dec015f65
Browse code

Add journald config to rsyslog and syslog-ng

Change-Id: Id46a4cfc9eb6edfd6514b0b31a4f4a22a9e67c1f
Reviewed-on: http://photon-jenkins.eng.vmware.com/539
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: suezzelur <anishs@vmware.com>

suezzelur authored on 2016/02/18 08:51:29
Showing 5 changed files
SPECS/rsyslog/50-rsyslog-journald.conf
History View file @ a92e6f9
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,2 @@
0 
+[Journal]
1 
+ForwardToSyslog=yes
SPECS/rsyslog/rsyslog.service
History View file @ a92e6f9
0 2 
new file mode 100644
... ... 
@@ -0,0 +1,18 @@
0 
+[Unit]
1 
+Description=System Logging Service
2 
+Requires=syslog.socket
3 
+Documentation=man:rsyslogd(8)
4 
+Documentation=http://www.rsyslog.com/doc/
5 
+Conflicts=syslog-ng.service
6 
+
7 
+[Service]
8 
+Type=notify
9 
+ExecStart=/usr/sbin/rsyslogd -n $RSYSLOGD_PARAMS
10 
+StandardOutput=null
11 
+Environment=RSYSLOGD_PARAMS=
12 
+ExecReload=/bin/kill -HUP $MAINPID
13 
+Restart=on-failure
14 
+
15 
+[Install]
16 
+WantedBy=multi-user.target
17 
+Alias=syslog.service
SPECS/rsyslog/rsyslog.spec
History View file @ a92e6f9
... ... 
@@ -1,11 +1,13 @@
1 1 
 Summary:	Rocket-fast system for log processing
2 2 
 Name:		rsyslog
3 3 
 Version:	8.15.0
4 
-Release:	1%{?dist}
4 
+Release:	2%{?dist}
5 5 
 License:	GPLv3+ and ASL 2.0
6 6 
 URL:		http://www.rsyslog.com/
7 7 
 Source0:	http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
8 8 
 %define sha1 rsyslog=e1d5ff63c96bce9945dc65581c8e195950256d3c
9 
+Source1:        rsyslog.service
10 
+Source2:        50-rsyslog-journald.conf
9 11 
 Group:		System Environment/Base
10 12 
 Vendor:		VMware, Inc.
11 13 
 Distribution:	Photon
... ... 
@@ -17,7 +19,7 @@ BuildRequires:	liblogging-devel
17 17 
 BuildRequires:	librelp-devel
18 18 
 BuildRequires:  autogen
19 19 
 BuildRequires:  gnutls-devel
20 
-Requires:   gnutls
20 
+Requires:   	gnutls
21 21 
 Requires:	systemd
22 22 
 Requires:	libestr
23 23 
 Requires:	json-c
... ... 
@@ -32,8 +34,8 @@ It offers high-performance, great security features and a modular design. While
32 32 
 %build
33 33 
 ./configure \
34 34 
 	--prefix=%{_prefix} \
35 
-    --enable-relp \
36 
-    --enable-gnutls\
35 
+    	--enable-relp \
36 
+    	--enable-gnutls\
37 37 
 	--enable-imfile \
38 38 
 	--enable-imjournal \
39 39 
 	--enable-impstats \
... ... 
@@ -43,7 +45,10 @@ make %{?_smp_mflags}
43 43 
 %install
44 44 
 make DESTDIR=%{buildroot} install
45 45 
 install -vd %{buildroot}%{_libdir}/systemd/system/
46 
-mv %{buildroot}/lib/systemd/system/rsyslog.service  %{buildroot}%{_libdir}/systemd/system/rsyslog.service
46 
+install -vd %{buildroot}%{_sysconfdir}/systemd/journald.conf.d/
47 
+rm -f %{buildroot}/lib/systemd/system/rsyslog.service
48 
+install -p -m 644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/
49 
+install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/systemd/journald.conf.d/
47 50 
 find %{buildroot} -name '*.la' -delete
48 51 
 %check
49 52 
 make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
... ... 
@@ -62,9 +67,12 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
62 62 
 %{_mandir}/man5/*
63 63 
 %{_mandir}/man8/*
64 64 
 %{_libdir}/systemd/system/rsyslog.service
65 
+%{_sysconfdir}/systemd/journald.conf.d/*
65 66 
 %changelog
66 
-*   Mon Jan 11  2016 Xiaolin Li <xiaolinl@vmware.com> 8.15.0-1
67 
--   Update rsyslog to 8.15.0
67 
+*   	Wed Feb 17 2016 Anish Swaminathan <anishs@vmware.com>  8.15.0-2
68 
+-   	Add journald conf and new service file.
69 
+*   	Mon Jan 11  2016 Xiaolin Li <xiaolinl@vmware.com> 8.15.0-1
70 
+-   	Update rsyslog to 8.15.0
68 71 
 *	Wed Jun 17 2015 Divya Thaluru <dthaluru@vmware.com> 8.10.0-1
69 72 
 -	Initial build. First version
70 73
SPECS/syslog-ng/60-syslog-ng-journald.conf
History View file @ a92e6f9
71 74 
new file mode 100644
... ... 
@@ -0,0 +1,2 @@
0 
+[Journal]
1 
+ForwardToSyslog=yes
SPECS/syslog-ng/syslog-ng.spec
History View file @ a92e6f9
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Next generation system logger facilty
2 2 
 Name:		syslog-ng
3 3 
 Version:	3.6.4
4 
-Release:	1%{?dist}
4 
+Release:	2%{?dist}
5 5 
 License:	GPL + LGPL
6 6 
 URL:		https://www.balabit.com/network-security/syslog-ng/opensource-logging-system
7 7 
 Group:		System Environment/Daemons
... ... 
@@ -9,8 +9,9 @@ Vendor:		VMware, Inc.
9 9 
 Distribution: 	Photon
10 10 
 Source0:	http://my.balabit.com/downloads/syslog-ng/open-source-edition/%{version}/source/%{name}_%{version}.tar.gz
11 11 
 %define sha1 syslog-ng=53b14cae037a5ca996fd7b67cf16d29970afedf9
12 
+Source1:        60-syslog-ng-journald.conf
12 13 
 Requires:	glib
13 
-Requires:   eventlog
14 
+Requires:   	eventlog
14 15 
 Requires:	python2
15 16 
 BuildRequires:	eventlog
16 17 
 BuildRequires:	glib-devel
... ... 
@@ -64,7 +65,8 @@ find %{buildroot} -name "*.la" -exec rm -f {} \;
64 64 
 rm %{buildroot}/%{_libdir}/pkgconfig/syslog-ng-test.pc
65 65 
 rm %{buildroot}/%{_libdir}/syslog-ng/libtest/libsyslog-ng-test.a
66 66 
 rm -rf %{buildroot}/%{_infodir}
67 
-
67 
+install -vd %{buildroot}%{_sysconfdir}/systemd/journald.conf.d/
68 
+install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/systemd/journald.conf.d/
68 69 
 %{_fixperms} %{buildroot}/*
69 70
70 71 
 %check
... ... 
@@ -93,6 +95,7 @@ rm -rf %{buildroot}/*
93 93 
 /usr/share/include/scl/*
94 94 
 /usr/share/tools/*
95 95 
 /usr/share/man/*
96 
+%{_sysconfdir}/systemd/journald.conf.d/*
96 97
97 98 
 %files devel
98 99 
 /usr/include/syslog-ng/*.h
... ... 
@@ -110,6 +113,8 @@ rm -rf %{buildroot}/*
110 110 
 /usr/lib/pkgconfig/syslog-ng.pc
111 111
112 112 
 %changelog
113 
+*   	Wed Feb 17 2016 Anish Swaminathan <anishs@vmware.com>  3.6.4-2
114 
+-   	Add journald conf file.
113 115 
 *   	Wed Jan 20 2016 Anish Swaminathan <anishs@vmware.com> 3.6.4-1
114 116 
 -   	Upgrade version.
115 117 
 *       Tue Jan 12 2016 Anish Swaminathan <anishs@vmware.com>  3.6.2-5