HAYASHI Kentaro
null+****@clear*****
Thu Sep 6 17:21:59 JST 2012
HAYASHI Kentaro 2012-09-06 17:21:59 +0900 (Thu, 06 Sep 2012) New Revision: a7cdf8c8da84f3e22405e213fdeb8d98eb7a8cff https://github.com/groonga/groonga/commit/a7cdf8c8da84f3e22405e213fdeb8d98eb7a8cff Log: deb rpm: use unified helper script on restart Added files: data/scripts/Makefile.am Modified files: configure.ac data/Makefile.am data/init.d/redhat/groonga-httpd packages/debian/groonga-httpd.install packages/rpm/centos/groonga.spec.in packages/rpm/fedora/Makefile.am packages/rpm/fedora/groonga.spec.in Modified: configure.ac (+1 -0) =================================================================== --- configure.ac 2012-09-06 15:54:58 +0900 (0ac3cea) +++ configure.ac 2012-09-06 17:21:59 +0900 (40faa8f) @@ -252,6 +252,7 @@ AC_CONFIG_FILES([ data/systemd/Makefile data/systemd/fedora/Makefile data/systemd/fedora/sysconfig/Makefile + data/scripts/Makefile tools/Makefile doc/Makefile doc/locale/Makefile Modified: data/Makefile.am (+2 -1) =================================================================== --- data/Makefile.am 2012-09-06 15:54:58 +0900 (eca37ba) +++ data/Makefile.am 2012-09-06 17:21:59 +0900 (ebf3ac8) @@ -4,7 +4,8 @@ SUBDIRS = \ munin \ init.d \ logrotate.d \ - systemd + systemd \ + scripts pkgsysconfdir = $(sysconfdir)/$(PACKAGE) dist_pkgsysconf_DATA = \ Modified: data/init.d/redhat/groonga-httpd (+2 -1) =================================================================== --- data/init.d/redhat/groonga-httpd 2012-09-06 15:54:58 +0900 (4fc0e30) +++ data/init.d/redhat/groonga-httpd 2012-09-06 17:21:59 +0900 (96610f0) @@ -23,6 +23,7 @@ name="groonga-httpd" prog="groonga-httpd" GROONGA_HTTPD=/usr/sbin/$prog +GROONGA_HTTPD_RESTART=/usr/sbin/$prog-restart CURL=/usr/bin/curl USER=groonga GROUP=groonga @@ -151,7 +152,7 @@ case "$1" in stop ;; restart) - restart + ${GROONGA_HTTPD_RESTART} ;; reload) killproc $groonga -HUP Added: data/scripts/Makefile.am (+1 -0) 100644 =================================================================== --- /dev/null +++ data/scripts/Makefile.am 2012-09-06 17:21:59 +0900 (a9b5039) @@ -0,0 +1 @@ +dist_sbin_SCRIPTS = groonga-httpd-restart Modified: packages/debian/groonga-httpd.install (+1 -0) =================================================================== --- packages/debian/groonga-httpd.install 2012-09-06 15:54:58 +0900 (7c25da8) +++ packages/debian/groonga-httpd.install 2012-09-06 17:21:59 +0900 (7aea295) @@ -1,2 +1,3 @@ usr/sbin/groonga-httpd +usr/sbin/groonga-httpd-restart etc/groonga/httpd/* Modified: packages/rpm/centos/groonga.spec.in (+1 -0) =================================================================== --- packages/rpm/centos/groonga.spec.in 2012-09-06 15:54:58 +0900 (4796247) +++ packages/rpm/centos/groonga.spec.in 2012-09-06 17:21:59 +0900 (8663cc8) @@ -265,6 +265,7 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/groonga-httpd %{_initddir}/groonga-httpd %{_sbindir}/groonga-httpd +%{_sbindir}/groonga-httpd-restart %files doc %defattr(-,root,root,-) Modified: packages/rpm/fedora/Makefile.am (+0 -3) =================================================================== --- packages/rpm/fedora/Makefile.am 2012-09-06 15:54:58 +0900 (bc81f2a) +++ packages/rpm/fedora/Makefile.am 2012-09-06 17:21:59 +0900 (0fe3a44) @@ -1,6 +1,3 @@ EXTRA_DIST = groonga.spec.in noinst_DATA = groonga.spec -if FEDORA_PLATFORM -dist_sbin_SCRIPTS = groonga-httpd-upgrade -endif Modified: packages/rpm/fedora/groonga.spec.in (+2 -2) =================================================================== --- packages/rpm/fedora/groonga.spec.in 2012-09-06 15:54:58 +0900 (0d057c2) +++ packages/rpm/fedora/groonga.spec.in 2012-09-06 17:21:59 +0900 (8bb0167) @@ -241,7 +241,7 @@ fi if [ $1 = 1 ] ; then /bin/systemctl daemon-reload >/dev/null 2>&1 || : elif [ $1 = 2 ]; then - %{_sbindir}/groonga-httpd-upgrade + %{_sbindir}/groonga-httpd-restart fi %post libs -p /sbin/ldconfig @@ -325,7 +325,7 @@ fi %config(noreplace) %{_sysconfdir}/groonga/httpd/* %dir %{_unitdir}/groonga-httpd.service %{_sbindir}/groonga-httpd -%{_sbindir}/groonga-httpd-upgrade +%{_sbindir}/groonga-httpd-restart %files doc %defattr(-,root,root,-) -------------- next part -------------- HTML����������������������������...Download
