Kouhei Sutou
null+****@clear*****
Fri Apr 22 13:46:31 JST 2016
Kouhei Sutou 2016-04-22 13:46:31 +0900 (Fri, 22 Apr 2016) New Revision: f36a831b2dde4745d09ac83410e5ae22fd7fbd29 https://github.com/groonga/groonga/commit/f36a831b2dde4745d09ac83410e5ae22fd7fbd29 Message: groonga-httpd: put PID file to /var/run/ by default Modified files: configure.ac data/groonga-httpd.conf.in groonga-httpd-conf.sh.in packages/debian/groonga-httpd.service Modified: configure.ac (+3 -0) =================================================================== --- configure.ac 2016-04-22 13:42:00 +0900 (3942982) +++ configure.ac 2016-04-22 13:46:31 +0900 (3231ee1) @@ -1525,6 +1525,9 @@ else fi AM_CONDITIONAL(WITH_GROONGA_HTTPD, test "$enable_groonga_httpd" = "yes") +GROONGA_HTTPD_PID_PATH="${localstatedir}/run/groonga-httpd.pid" +AC_SUBST(GROONGA_HTTPD_PID_PATH) + # mruby AC_ARG_ENABLE(mruby, [AS_HELP_STRING([--enable-mruby], Modified: data/groonga-httpd.conf.in (+1 -0) =================================================================== --- data/groonga-httpd.conf.in 2016-04-22 13:42:00 +0900 (6ab68a1) +++ data/groonga-httpd.conf.in 2016-04-22 13:46:31 +0900 (811e198) @@ -1,4 +1,5 @@ worker_processes 1; +pid @GROONGA_HTTPD_PID_PATH@; # Match this to the file owner of Groonga database files if groonga-httpd is # run as root. Modified: groonga-httpd-conf.sh.in (+1 -1) =================================================================== --- groonga-httpd-conf.sh.in 2016-04-22 13:42:00 +0900 (824b5d5) +++ groonga-httpd-conf.sh.in 2016-04-22 13:46:31 +0900 (b195b28) @@ -20,7 +20,7 @@ export GROONGA_HTTPD_ERROR_LOG_PATH="${localstatedir}/log/groonga/httpd/error.lo export GROONGA_HTTPD_HTTP_LOG_PATH="${localstatedir}/log/groonga/httpd/access.log" export GROONGA_HTTPD_GROONGA_LOG_PATH="${localstatedir}/log/groonga/httpd/groonga.log" export GROONGA_HTTPD_GROONGA_QUERY_LOG_PATH="${localstatedir}/log/groonga/httpd/groonga-query.log" -export GROONGA_HTTPD_PID_PATH="${localstatedir}/run/groonga/groonga-httpd.pid" +export GROONGA_HTTPD_PID_PATH="@GROONGA_HTTPD_PID_PATH@" export GROONGA_HTTPD_DEBUG="@grn_debug@" export GROONGA_HTTPD_WITH_PCRE="@GRN_WITH_PCRE@" export GROONGA_HTTPD_PCRE_CFLAGS="@PCRE_CFLAGS@" Modified: packages/debian/groonga-httpd.service (+0 -1) =================================================================== --- packages/debian/groonga-httpd.service 2016-04-22 13:42:00 +0900 (20f3816) +++ packages/debian/groonga-httpd.service 2016-04-22 13:46:31 +0900 (7ae8d04) @@ -9,7 +9,6 @@ Type=forking User=root Group=root ExecStartPre=-/bin/mkdir -p /var/log/groonga/httpd -ExecStartPre=-/bin/mkdir -p /var/run/groonga ExecStart=/usr/sbin/groonga-httpd ExecStop=/usr/sbin/groonga-httpd -s stop -------------- next part -------------- HTML����������������������������...Download
