rel-eng/packages/spacewalk-search | 2
search-server/spacewalk-search/spacewalk-search.spec | 54 ++++++++---
search-server/spacewalk-search/src/config/rhn-search.service | 12 ++
3 files changed, 54 insertions(+), 14 deletions(-)
New commits:
commit 6867ef9e40e4acee597bfe278891025f993bc75f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 5 13:36:05 2013 +0100
Automatic commit of package [spacewalk-search] release [1.9.4-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search
index e83a724..1698c40 100644
--- a/rel-eng/packages/spacewalk-search
+++ b/rel-eng/packages/spacewalk-search
@@ -1 +1 @@
-1.9.3-1 search-server/spacewalk-search/
+1.9.4-1 search-server/spacewalk-search/
diff --git a/search-server/spacewalk-search/spacewalk-search.spec
b/search-server/spacewalk-search/spacewalk-search.spec
index 043ff35..427cc07 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -4,7 +4,7 @@ Name: spacewalk-search
Summary: Spacewalk Full Text Search Server
Group: Applications/Internet
License: GPLv2
-Version: 1.9.3
+Version: 1.9.4
Release: 1%{?dist}
# This src.rpm is cannonical upstream
# You can obtain it using this set of commands
@@ -179,6 +179,9 @@ fi
%attr(755, root, root) %{_var}/lib/rhn/search/indexes/docs
%changelog
+* Tue Feb 05 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.4-1
+- added systemd service for rhn-search
+
* Mon Feb 04 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.3-1
- remove unnecessary cast
- 905872 - fix errata search by CVE
commit be66277698d46b89d31063c217b1f11522e52b2c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 5 10:07:12 2013 +0100
packed rhn-search systemd stuff
diff --git a/search-server/spacewalk-search/spacewalk-search.spec
b/search-server/spacewalk-search/spacewalk-search.spec
index 6b539fe..043ff35 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -66,10 +66,12 @@ BuildRequires: redstone-xmlrpc
#BuildRequires: picocontainer
BuildRequires: tanukiwrapper
BuildRequires: simple-core
+%if 0%{?fedora} <=16
Requires(post): chkconfig
Requires(preun): chkconfig
# This is for /sbin/service
Requires(preun): initscripts
+%endif
%description
This package contains the code for the Full Text Search Server for
@@ -87,7 +89,12 @@ install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/lib
install -d -m 755 $RPM_BUILD_ROOT%{_var}/lib/rhn/search
install -d -m 755 $RPM_BUILD_ROOT%{_var}/lib/rhn/search/indexes
ln -s -f %{_prefix}/share/rhn/search/indexes/docs
$RPM_BUILD_ROOT%{_var}/lib/rhn/search/indexes/docs
+%if 0%{?fedora}
+install -d -m 755 $RPM_BUILD_ROOT%{_sbindir}
+install -d -m 755 $RPM_BUILD_ROOT%{_unitdir}
+%else
install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
+%endif
install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
install -d -m 755 $RPM_BUILD_ROOT%{_var}/log/rhn/search
install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/nutch
@@ -96,7 +103,12 @@ install -p -m 644 dist/%{name}-%{version}.jar
$RPM_BUILD_ROOT%{_prefix}/share/rh
# using install -m does not preserve the symlinks
cp -d lib/* $RPM_BUILD_ROOT/%{_prefix}/share/rhn/search/lib
install -p -m 644 src/config/etc/logrotate.d/rhn-search
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/rhn-search
+%if 0%{?fedora}
+install -p -m 755 src/config/rhn-search $RPM_BUILD_ROOT%{_sbindir}
+install -p -m 755 src/config/rhn-search.service $RPM_BUILD_ROOT%{_unitdir}
+%else
install -p -m 755 src/config/rhn-search $RPM_BUILD_ROOT%{_initrddir}
+%endif
ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT%{_bindir}/rhnsearchd
install -p -m 644 src/config/search/rhn_search.conf
$RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_search.conf
install -p -m 644 src/config/search/rhn_search_daemon.conf
$RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_search_daemon.conf
@@ -106,12 +118,14 @@ ln -s -f
%{_prefix}/share/rhn/search/lib/spacewalk-search-%{version}.jar $RPM_BU
rm -rf $RPM_BUILD_ROOT
%post
-# This adds the proper /etc/rc*.d links for the script
-/sbin/chkconfig --add rhn-search
-
-was_running=0
-if /sbin/service rhn-search status > /dev/null 2>&1 ; then
- was_running=1
+if [ -f /etc/init.d/rhn-search ]; then
+ # This adds the proper /etc/rc*.d links for the script
+ /sbin/chkconfig --add rhn-search
+
+ was_running=0
+ if /sbin/service rhn-search status > /dev/null 2>&1 ; then
+ was_running=1
+ fi
fi
# Migrate original /usr/share/rhn/search/indexes/*
@@ -119,8 +133,10 @@ fi
cd %{_prefix}/share/rhn/search/indexes && /bin/ls | /bin/grep -v docs | while
read i ; do
if [ ! -e %{_var}/lib/rhn/search/indexes/$i ] ; then
if [ $was_running -eq 1 ] ; then
- /sbin/service rhn-search stop > /dev/null 2>&1
- was_running=2
+ if [ -f /etc/init.d/rhn-search ]; then
+ /sbin/service rhn-search stop > /dev/null 2>&1
+ was_running=2
+ fi
fi
/bin/mv $i %{_var}/lib/rhn/search/indexes/$i
# If the mv failed for whatever reason, symlink
@@ -131,20 +147,29 @@ cd %{_prefix}/share/rhn/search/indexes && /bin/ls |
/bin/grep -v docs | while re
fi
done
-if [ $was_running -eq 1 ] ; then
- /sbin/service rhn-search status > /dev/null 2>&1 || /sbin/service
rhn-search start > /dev/null 2>&1
+if [ -f /etc/init.d/rhn-search ]; then
+ if [ $was_running -eq 1 ] ; then
+ /sbin/service rhn-search status > /dev/null 2>&1 || /sbin/service
rhn-search start > /dev/null 2>&1
+ fi
fi
%preun
if [ $1 = 0 ] ; then
- /sbin/service rhn-search stop >/dev/null 2>&1
- /sbin/chkconfig --del rhn-search
+ if [ -f /etc/init.d/rhn-search ]; then
+ /sbin/service rhn-search stop >/dev/null 2>&1
+ /sbin/chkconfig --del rhn-search
+ fi
fi
%files
%attr(755, root, root) %{_var}/log/rhn/search
%{_prefix}/share/rhn/search/lib/*
+%if 0%{?fedora}
+%attr(755, root, root) %{_sbindir}/rhn-search
+%attr(755, root, root) %{_unitdir}/rhn-search.service
+%else
%attr(755, root, root) %{_initrddir}/rhn-search
+%endif
%attr(755, root, root) %{_bindir}/rhnsearchd
%{_prefix}/share/rhn/config-defaults/rhn_search.conf
%{_prefix}/share/rhn/config-defaults/rhn_search_daemon.conf
commit 32b5a64d6319f4ed9c39ba4945c53e3780a580c5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 5 10:12:00 2013 +0100
added systemd service for rhn-search
diff --git a/search-server/spacewalk-search/src/config/rhn-search.service
b/search-server/spacewalk-search/src/config/rhn-search.service
new file mode 100644
index 0000000..c3b5c26
--- /dev/null
+++ b/search-server/spacewalk-search/src/config/rhn-search.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=This is Spacewalk search engine.
+After=local-fs.target network.target httpd.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/rhn-search start
+ExecStop=/usr/sbin/rhn-search stop
+
+[Install]
+WantedBy=multi-user.target
+
Show replies by date