xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 01:26:38 +00:00
Code Issues Releases Wiki Activity

support local syslog:1)ship logrotate and log filter rule files in xCATsn;2)refine syslog script to enable log filter and rotate rules (#3921)

Browse Source
This commit is contained in:
yangsong 2017-09-15 16:03:43 +08:00 committed by Bin Xu
parent 852e996eff
commit a183e3b8f2
5 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makerpm
View File

@ -145,6 +145,8 @@ function makexcat {
cp xcat.conf $RPMROOT/SOURCES
cp xcat.conf.apach24 $RPMROOT/SOURCES
cp xCATSN $RPMROOT/SOURCES
cp -a ../xCAT/etc/rsyslog.d $RPMROOT/
cp -a ../xCAT/etc/logrotate.d $RPMROOT/
cd - >/dev/null
elif [ "$RPMNAME" = "xCAT-buildkit" ]; then
ARCH="noarch"

1
xCAT-server/share/xcat/netboot/rh/service.rhels7.ppc64le.pkglist
View File

@ -45,3 +45,4 @@ vim-minimal
vsftpd
wget
xz
rsyslog

1
xCAT-server/share/xcat/netboot/rh/service.rhels7.x86_64.pkglist
View File

@ -44,3 +44,4 @@ vim-minimal
vsftpd
wget
xz
rsyslog

15
xCAT/postscripts/syslog
View File

@ -243,6 +243,14 @@ config_rsyslog_V8()
s/#module(load="imtcp")/module(load="imtcp")/;
s/#input(type="imtcp" port="514")/input(type="imtcp" port="514")/' $conf_file
fi
if [ $isSN -eq 1 ] ; then
[ -d "/etc/xcat/rsyslog.conf" ] && cp -a /etc/xcat/rsyslog.conf/* /etc/rsyslog.d/
if [ -d "/etc/xcat/logrotate.conf" ];then
mkdir -p "/etc/logrotate.d/"
cp -a /etc/xcat/logrotate.conf/* /etc/logrotate.d/
fi
fi
# Mark the end of xCAT section
echo "# $xCATSettingsEND" >> $conf_file
@ -261,6 +269,13 @@ config_rsyslog_V8()
[ -f "$conf_file" ] && sed -i '/#\$ModLoad \+imudp\|imtcp\|imudp.so\|imtcp.so/s/^#//;
/#\$InputTCPServerRun\|UDPServerRun.*/s/^#//' $conf_file
[ -f "/etc/rsyslog.d/xcat-cluster.conf" ] && rm -f "/etc/rsyslog.d/xcat-cluster.conf" ;
[ -f "/etc/rsyslog.d/xcat-compute.conf" ] && rm -f "/etc/rsyslog.d/xcat-compute.conf" ;
[ -f "/etc/rsyslog.d/xcat-debug.conf" ] && rm -f "/etc/rsyslog.d/xcat-debug.conf" ;
[ -f "/etc/logrotate.d/xcat" ] && rm -f "/etc/logrotate.d/xcat"
fi

6
xCATsn/xCATsn.spec
View File

@ -93,6 +93,8 @@ tar -xf license.tar
%install
%ifos linux
mkdir -p $RPM_BUILD_ROOT/etc/xcat/conf.orig
mkdir -p $RPM_BUILD_ROOT/etc/xcat/rsyslog.conf
mkdir -p $RPM_BUILD_ROOT/etc/xcat/logrotate.conf
mkdir -p $RPM_BUILD_ROOT/etc/apache2/conf.d
mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d/
mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/
@ -102,6 +104,8 @@ cp %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf.d/xcat.conf
cp %{SOURCE3} $RPM_BUILD_ROOT/etc/xCATSN
cp %{SOURCE1} $RPM_BUILD_ROOT/etc/xcat/conf.orig/xcat.conf.apach22
cp %{SOURCE6} $RPM_BUILD_ROOT/etc/xcat/conf.orig/xcat.conf.apach24
cp -a etc/rsyslog.d/* $RPM_BUILD_ROOT/etc/xcat/rsyslog.conf/
cp -a etc/logrotate.d/* $RPM_BUILD_ROOT/etc/xcat/logrotate.conf/
mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/xCAT
cp LICENSE.html $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/xCAT
@ -249,6 +253,8 @@ fi
/etc/xcat/conf.orig/xcat.conf.apach22
/etc/httpd/conf.d/xcat.conf
/etc/apache2/conf.d/xcat.conf
/etc/xcat/logrotate.conf/
/etc/xcat/rsyslog.conf/
%endif
/etc/xCATSN
%defattr(-,root,root)