null+****@clear*****
null+****@clear*****
2010年 9月 3日 (金) 11:15:54 JST
Kouhei Sutou 2010-09-03 02:15:54 +0000 (Fri, 03 Sep 2010) New Revision: ed8acfbd02780925f4aa6e6ebd0724e04d1d7609 Log: fix wrong options. Modified files: data/init.d/redhat/groonga rpm/fedora/groonga.spec.in Modified: data/init.d/redhat/groonga (+35 -21) =================================================================== --- data/init.d/redhat/groonga 2010-09-03 01:52:34 +0000 (bdd3872) +++ data/init.d/redhat/groonga 2010-09-03 02:15:54 +0000 (9f5212c) @@ -27,9 +27,9 @@ GROUP=groonga DATABASE=/var/lib/groonga/db/db ADDRESS=127.0.0.1 PIDFILE=/var/run/groonga/$prog.pid -PROTOCOL= -LOG_PATH= -QUERY_LOG_PATH= +PROTOCOL=gqtp +LOG_PATH=/var/log/groonga/groonga.log +QUERY_LOG_PATH=/var/log/groonga/query.log OPTION_ARGS="" if [ -f /etc/sysconfig/$name ]; then @@ -37,22 +37,8 @@ if [ -f /etc/sysconfig/$name ]; then fi DAEMON_ARGS="" -GROONGA_ARGS="-s" -if [ -n "${PIDFILE}" ]; then - GROONGA_ARGS="${GROONGA_ARGS} --pid-path ${PIDFILE}" -fi -if [ -n "${ADDRESS}" ]; then - GROONGA_ARGS="${GROONGA_ARGS} -a ${ADDRESS}" -fi -if [ -n "${LOG_PATH}" ]; then - GROONGA_ARGS="${GROONGA_ARGS} --log-path ${LOG_PATH}" -fi -if [ -n "${QUERY_LOG_PATH}" ]; then - GROONGA_ARGS="${GROONGA_ARGS} --query-log-path ${QUERY_LOG_PATH}" -fi -if [ -n "${PROTOCOL}" ]; then - GROONGA_ARGS="${GROONGA_ARGS} --protocol ${PROTOCOL}" -fi +GROONGA_ARGS="-d" + if [ -n "${USER}" ]; then if ! getent passwd | grep -q "^${USER}:"; then echo "$0: user for running $prog doesn't exist: ${USER}" >&2 @@ -69,7 +55,35 @@ if [ -n "${GROUP}" ]; then echo "$0: group for running $prog doesn't exist: ${GROUP}" >&2 exit 1 fi - DAEMON_ARGS="${DAEMON_ARGS} --group ${GROUP}" + CGROUP_DAEMON="${CGROUP_DAEMON} ${GROUP}" +fi + +if [ -n "${PIDFILE}" ]; then + mkdir -p $(dirname ${PIDFILE}) + if [ -n "${USER}" ]; then + chown -R ${USER} $(dirname ${PIDFILE}) + fi + GROONGA_ARGS="${GROONGA_ARGS} --pid-path ${PIDFILE}" +fi +if [ -n "${ADDRESS}" ]; then + GROONGA_ARGS="${GROONGA_ARGS} --address ${ADDRESS}" +fi +if [ -n "${LOG_PATH}" ]; then + mkdir -p $(dirname ${LOG_PATH}) + if [ -n "${USER}" ]; then + chown -R ${USER} $(dirname ${LOG_PATH}) + fi + GROONGA_ARGS="${GROONGA_ARGS} --log-path ${LOG_PATH}" +fi +if [ -n "${QUERY_LOG_PATH}" ]; then + mkdir -p $(dirname ${QUERY_LOG_PATH}) + if [ -n "${USER}" ]; then + chown -R ${USER} $(dirname ${QUERY_LOG_PATH}) + fi + GROONGA_ARGS="${GROONGA_ARGS} --query-log-path ${QUERY_LOG_PATH}" +fi +if [ -n "${PROTOCOL}" ]; then + GROONGA_ARGS="${GROONGA_ARGS} --protocol ${PROTOCOL}" fi GROONGA_ARGS="${GROONGA_ARGS} ${OPTION_ARGS}" @@ -96,7 +110,7 @@ RETVAL=0 start() { echo -n "Starting $name: " - daemon "$DAEMON_ARGS" $groonga "$GROONGA_ARGS" + daemon $DAEMON_ARGS $groonga "$GROONGA_ARGS" RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog Modified: rpm/fedora/groonga.spec.in (+6 -6) =================================================================== --- rpm/fedora/groonga.spec.in 2010-09-03 01:52:34 +0000 (42dc6a2) +++ rpm/fedora/groonga.spec.in 2010-09-03 02:15:54 +0000 (9078764) @@ -83,10 +83,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/groonga/modules/*/*.a rm $RPM_BUILD_ROOT%{_libdir}/*.la mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ -mv $RPM_BUILD_ROOT%{_sysconfdir}/groonga/init.d/redhat/groonga \ +install -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/groonga/init.d/redhat/groonga \ $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ -mv $RPM_BUILD_ROOT%{_sysconfdir}/groonga/init.d/redhat/sysconfig/groonga \ +install -m 644 $RPM_BUILD_ROOT%{_sysconfdir}/groonga/init.d/redhat/sysconfig/groonga \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ mv $RPM_BUILD_ROOT%{_datadir}/groonga/munin/ $RPM_BUILD_ROOT%{_datadir}/ @@ -143,8 +143,8 @@ if [ $1 -ge 1 ] ; then fi if [ $1 -eq 0 ]; then - /usr/sbin/userdel -r milter-manager || \ - %logmsg "User \"milter-manager\" could not be deleted." + /usr/sbin/userdel -r groonga || \ + %logmsg "User \"groonga\" could not be deleted." fi %postun libs -p /sbin/ldconfig @@ -162,9 +162,9 @@ fi %defattr(-,root,root,-) %doc %{_datadir}/man/ %config %{_sysconfdir}/groonga/ -%config %{_sysconfdir}/init.d/ -%config %{_sysconfdir}/sysconfig/ +%config %{_sysconfdir}/sysconfig/groonga %{_bindir}/* +%{_sysconfdir}/init.d/* %files libs %defattr(-,root,root,-)