[Groonga-commit] groonga/groonga [master] deb: split groonga-server package into groonga-server-http/gqtp

Back to archive index

HAYASHI Kentaro null+****@clear*****
Fri Sep 21 19:33:15 JST 2012


HAYASHI Kentaro	2012-09-21 19:33:15 +0900 (Fri, 21 Sep 2012)

  New Revision: 45d33f343a920f67cdaa398ebd5f534fade3e0d5
  https://github.com/groonga/groonga/commit/45d33f343a920f67cdaa398ebd5f534fade3e0d5

  Log:
    deb: split groonga-server package into groonga-server-http/gqtp

  Copied files:
    packages/debian/groonga-server-gqtp.default
      (from packages/debian/groonga-server.default)
    packages/debian/groonga-server-gqtp.dirs
      (from packages/debian/groonga-server.dirs)
    packages/debian/groonga-server-gqtp.init
      (from packages/debian/groonga-server.init)
  Modified files:
    packages/debian/control
  Renamed files:
    packages/debian/groonga-server-common.logrotate
      (from packages/debian/groonga-server.logrotate)
    packages/debian/groonga-server-http.default
      (from packages/debian/groonga-server.default)
    packages/debian/groonga-server-http.dirs
      (from packages/debian/groonga-server.dirs)
    packages/debian/groonga-server-http.init
      (from packages/debian/groonga-server.init)

  Modified: packages/debian/control (+24 -4)
===================================================================
--- packages/debian/control    2012-09-21 19:08:42 +0900 (5367fae)
+++ packages/debian/control    2012-09-21 19:33:15 +0900 (21f0e03)
@@ -46,23 +46,42 @@ Description: Fulltext search engine. (meta-package for server use)
  .
  This package provides common settings for server use.
 
-Package: groonga-server
+Package: groonga-server-http
 Section: database
 Architecture: any
-Replaces: groonga (<< 1.2.0-1)
-Breaks: groonga (<< 1.2.0-1)
+Replaces: groonga-server (<< 2.0.7-1)
+Breaks: groonga-server (<< 2.0.7-1)
+Conflicts: groonga-httpd
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},
   adduser,
   curl,
   groonga-server-common (= ${binary:Version})
-Description: Fulltext search engine. (meta-package for server use)
+Description: Fulltext search engine. (meta-package for HTTP server use)
  Groonga is an open-source fulltext search engine and column store.
  It lets you write high-performance applications that requires fulltext search.
  .
  This package depends all groonga related package for server use.
 
+Package: groonga-server-gqtp
+Section: database
+Architecture: any
+Replaces: groonga-server (<< 2.0.7-1)
+Breaks: groonga-server (<< 2.0.7-1)
+Depends:
+  ${misc:Depends},
+  ${shlibs:Depends},
+  adduser,
+  curl,
+  groonga-server-common (= ${binary:Version})
+Description: Fulltext search engine. (meta-package for GQTP server use)
+ Groonga is an open-source fulltext search engine and column store.
+ It lets you write high-performance applications that requires fulltext search.
+ .
+ This package depends all groonga related package for server use.
+
+
 Package: libgroonga-dev
 Section: libdevel
 Architecture: any
@@ -142,6 +161,7 @@ Section: database
 Architecture: any
 Replaces: groonga (<< 1.2.0-1)
 Breaks: groonga (<< 1.2.0-1)
+Conflicts: groonga-server-http
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},

  Renamed: packages/debian/groonga-server-common.logrotate (+0 -0) 100%
===================================================================

  Copied: packages/debian/groonga-server-gqtp.default (+4 -4) 55%
===================================================================
--- packages/debian/groonga-server.default    2012-09-21 19:08:42 +0900 (2be5369)
+++ packages/debian/groonga-server-gqtp.default    2012-09-21 19:33:15 +0900 (4904fcf)
@@ -2,11 +2,11 @@
 #USER=groonga
 #GROUP=groonga
 #ADDRESS=127.0.0.1
-#PORT=10041
+#PORT=10043
 #DATABASE=/var/lib/groonga/db/db
-#LOG_PATH=/var/log/groonga/groonga.log
-#QUERY_LOG_PATH=/var/log/groonga/query.log
-#PROTOCOL=http
+#LOG_PATH=/var/log/groonga/groonga-gqtp.log
+#QUERY_LOG_PATH=/var/log/groonga/query-gqtp.log
+#PROTOCOL=gqtp
 
 # Comment out this to disable groonga daemon.
 ENABLE=yes

  Copied: packages/debian/groonga-server-gqtp.dirs (+0 -0) 100%
===================================================================

  Copied: packages/debian/groonga-server-gqtp.init (+8 -8) 95%
===================================================================
--- packages/debian/groonga-server.init    2012-09-21 19:08:42 +0900 (d1ad7ec)
+++ packages/debian/groonga-server-gqtp.init    2012-09-21 19:33:15 +0900 (01ad5a1)
@@ -1,6 +1,6 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          groonga
+# Provides:          groonga-server-gqtp
 # Required-Start:    $remote_fs $network
 # Required-Stop:     $remote_fs $network
 # Default-Start:     2 3 4 5
@@ -23,17 +23,17 @@ USER=groonga
 GROUP=groonga
 DATABASE=/var/lib/groonga/db/db
 ADDRESS=127.0.0.1
-PORT=10041
-PROTOCOL=http
-LOG_PATH=/var/log/groonga/groonga.log
-QUERY_LOG_PATH=/var/log/groonga/query.log
-PIDFILE=/var/run/groonga/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
+PORT=10043
+PROTOCOL=gqtp
+LOG_PATH=/var/log/groonga/groonga-$PROTOCOL.log
+QUERY_LOG_PATH=/var/log/groonga/query-$PROTOCOL.log
+PIDFILE=/var/run/groonga/$NAME-$PROTOCOL.pid
+SCRIPTNAME=/etc/init.d/$NAME-server-$PROTOCOL
 OPTION_ARGS=""
 START_STOP_DAEMON_ARGS=""
 ENABLE="no"
 
-DEFAULT_FILE=/etc/default/groonga-server
+DEFAULT_FILE=/etc/default/groonga-server-gqtp
 
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0

  Renamed: packages/debian/groonga-server-http.default (+2 -2) 65%
===================================================================
--- packages/debian/groonga-server.default    2012-09-21 19:08:42 +0900 (2be5369)
+++ packages/debian/groonga-server-http.default    2012-09-21 19:33:15 +0900 (19fa89b)
@@ -4,8 +4,8 @@
 #ADDRESS=127.0.0.1
 #PORT=10041
 #DATABASE=/var/lib/groonga/db/db
-#LOG_PATH=/var/log/groonga/groonga.log
-#QUERY_LOG_PATH=/var/log/groonga/query.log
+#LOG_PATH=/var/log/groonga/groonga-http.log
+#QUERY_LOG_PATH=/var/log/groonga/query-http.log
 #PROTOCOL=http
 
 # Comment out this to disable groonga daemon.

  Renamed: packages/debian/groonga-server-http.dirs (+0 -0) 100%
===================================================================

  Renamed: packages/debian/groonga-server-http.init (+6 -6) 95%
===================================================================
--- packages/debian/groonga-server.init    2012-09-21 19:08:42 +0900 (d1ad7ec)
+++ packages/debian/groonga-server-http.init    2012-09-21 19:33:15 +0900 (87814da)
@@ -1,6 +1,6 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          groonga
+# Provides:          groonga-server-http
 # Required-Start:    $remote_fs $network
 # Required-Stop:     $remote_fs $network
 # Default-Start:     2 3 4 5
@@ -25,15 +25,15 @@ DATABASE=/var/lib/groonga/db/db
 ADDRESS=127.0.0.1
 PORT=10041
 PROTOCOL=http
-LOG_PATH=/var/log/groonga/groonga.log
-QUERY_LOG_PATH=/var/log/groonga/query.log
-PIDFILE=/var/run/groonga/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
+LOG_PATH=/var/log/groonga/groonga-$PROTOCOL.log
+QUERY_LOG_PATH=/var/log/groonga/query-$PROTOCOL.log
+PIDFILE=/var/run/groonga/$NAME-$PROTOCOL.pid
+SCRIPTNAME=/etc/init.d/$NAME-server-$PROTOCOL
 OPTION_ARGS=""
 START_STOP_DAEMON_ARGS=""
 ENABLE="no"
 
-DEFAULT_FILE=/etc/default/groonga-server
+DEFAULT_FILE=/etc/default/groonga-server-http
 
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0
-------------- next part --------------
HTML����������������������������...
下载 



More information about the Groonga-commit mailing list
Back to archive index