committing changes in /etc after emerge run

Package changes:
+app-text/groonga-6.1.2

diff --git a/.etckeeper b/.etckeeper
index 9c2db238a8fd075d2da7cda36316edae839efbfb..9c8669ed42f737a5a784ec67b13fd29197491054 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -119,6 +119,7 @@ maybe chmod 0644 'conf.d/dmesg'
 maybe chmod 0644 'conf.d/fsck'
 maybe chmod 0644 'conf.d/git-daemon'
 maybe chmod 0644 'conf.d/gpm'
+maybe chmod 0644 'conf.d/groonga'
 maybe chmod 0644 'conf.d/hostname'
 maybe chmod 0644 'conf.d/hwclock'
 maybe chmod 0644 'conf.d/ip6tables'
@@ -383,6 +384,11 @@ maybe chmod 0755 'gpm'
 maybe chmod 0644 'gpm/gpm-root.conf'
 maybe chmod 0644 'gpm/gpm-syn.conf'
 maybe chmod 0644 'gpm/gpm-twiddler.conf'
+maybe chmod 0755 'groonga'
+maybe chmod 0644 'groonga/groonga.conf'
+maybe chmod 0755 'groonga/httpd'
+maybe chmod 0644 'groonga/httpd/groonga-httpd.conf'
+maybe chmod 0644 'groonga/synonyms.tsv'
 maybe chmod 0644 'group'
 maybe chmod 0644 'group-'
 maybe chmod 0755 'grub.d'
@@ -425,6 +431,7 @@ maybe chmod 0755 'init.d/dmeventd'
 maybe chmod 0755 'init.d/fsck'
 maybe chmod 0755 'init.d/git-daemon'
 maybe chmod 0755 'init.d/gpm'
+maybe chmod 0755 'init.d/groonga'
 maybe chmod 0755 'init.d/hostname'
 maybe chmod 0755 'init.d/hwclock'
 maybe chmod 0755 'init.d/ip6tables'

diff --git a/conf.d/groonga b/conf.d/groonga
new file mode 100644 (file)
index 0000000..f70b8e5
--- /dev/null
+++ b/conf.d/groonga
@@ -0,0 +1,8 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+#GROONGA_USER=groonga
+#GROONGA_GROUP=groonga
+#GROONGA_PID=/run/groonga/groonga.pid
+#CONFIG_FILE=/etc/groonga/groonga.conf
+DATABASE=/var/lib/groonga/db

diff --git a/groonga/groonga.conf b/groonga/groonga.conf
new file mode 100644 (file)
index 0000000..42d569e
--- /dev/null
+++ b/groonga/groonga.conf
@@ -0,0 +1,11 @@
+# encoding = utf-8
+# log-level = 1
+# bind-address = 0.0.0.0
+# port = 10041
+# server-id = groonga.example.com
+# max-threads = 2
+# admin-html-path = /usr/share/groonga/html/admin
+# protocol = http
+# log-path = /var/log/groonga/groonga.log
+# query-log-path = /var/log/groonga/query.log
+# cache-limit = 100

diff --git a/groonga/httpd/groonga-httpd.conf b/groonga/httpd/groonga-httpd.conf
new file mode 100644 (file)
index 0000000..f58d09a
--- /dev/null
+++ b/groonga/httpd/groonga-httpd.conf
@@ -0,0 +1,68 @@
+worker_processes 1;
+pid /var/lib/run/groonga-httpd.pid;
+
+# Match this to the file owner of Groonga database files if groonga-httpd is
+# run as root.
+user groonga groonga;
+
+env GRN_IN_VALUES_TOO_MANY_INDEX_MATCH_RATIO;
+env GRN_BETWEEN_TOO_MANY_INDEX_MATCH_RATIO;
+env GRN_II_CURSOR_SET_MIN_ENABLE;
+env GRN_INDEX_CHUNK_SPLIT_ENABLE;
+env GRN_MECAB_CHUNKED_TOKENIZE_ENABLED;
+env GRN_MECAB_CHUNK_SIZE_THRESHOLD;
+
+events {
+  worker_connections 1024;
+}
+
+http {
+  include mime.types;
+  default_type application/octet-stream;
+  sendfile on;
+  keepalive_timeout 65;
+
+  # The default Groonga database path.
+  groonga_database /var/lib/lib/groonga/db/db;
+
+  # Create a Groonga database automatically if the Groonga database doesn't
+  # exist.
+  #
+  # Note that this option is danger when worker_processes is greater than 1.
+  # Because one or more worker processes may create the same Groonga database
+  # at the same time. If you can create a Groonga database before running
+  # groonga-httpd, you should do it.
+  groonga_database_auto_create on;
+
+  # The default Groonga cache limit. The cache limit can be set
+  # for each worker. It can't be set for each Groonga database.
+  # groonga_cache_limit 100;
+
+  server {
+    listen 10041;
+    server_name localhost;
+
+    location /d/ {
+      groonga on;
+      # You can disable log for Groonga.
+      # groonga_log_path off;
+      # You can disable query log for Groonga.
+      # groonga_query_log_path off;
+      # You can custom database path.
+      # groonga_database /path/to/groonga/db;
+      # If you send large data with one 'load' command, you may need to
+      # increase the max size limitation.
+      # client_max_body_size 50m;
+    }
+
+    location / {
+      root /usr/share/groonga/html/admin;
+      index index.html;
+    }
+
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+      root html;
+    }
+  }
+}

diff --git a/groonga/synonyms.tsv b/groonga/synonyms.tsv
new file mode 100644 (file)
index 0000000..17e2923
--- /dev/null
+++ b/groonga/synonyms.tsv
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+#
+# key[TAB]synonym1[TAB]synonym2[TAB]...
+#
+#groonga       groonga rroonga mroonga

diff --git a/group b/group
index fb9cd4fc7e991af143b3b1cdd1c0ff69b2b3dd11..2a5a421917b8e603bc302444b597d3bb71552a01 100644 (file)
--- a/group
+++ b/group
@@ -51,3 +51,4 @@ postgres:x:70:
 mysql:x:60:
 puppet:x:235:
 puppetdb:x:234:
+groonga:x:233:

diff --git a/group- b/group-
index 881f935ba3cb8744d7d325d169357cc1a756f017..fb9cd4fc7e991af143b3b1cdd1c0ff69b2b3dd11 100644 (file)
--- a/group-
+++ b/group-
@@ -50,3 +50,4 @@ ssmtp:x:236:
 postgres:x:70:
 mysql:x:60:
 puppet:x:235:
+puppetdb:x:234:

diff --git a/gshadow b/gshadow
index 56857a9d13b35624a36cffe44cddb5ee7bec444d..de94e4b27e5c1b947515db0ad8645466f88b108d 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -51,3 +51,4 @@ postgres:!::
 mysql:!::
 puppet:!::
 puppetdb:!::
+groonga:!::

diff --git a/gshadow- b/gshadow-
index 16c32d0b96abe6bcd238800613cee5d52cd11471..56857a9d13b35624a36cffe44cddb5ee7bec444d 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -50,3 +50,4 @@ ssmtp:!::
 postgres:!::
 mysql:!::
 puppet:!::
+puppetdb:!::

diff --git a/init.d/groonga b/init.d/groonga
new file mode 100755 (executable)
index 0000000..7d11ab6
--- /dev/null
+++ b/init.d/groonga
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command=/usr/bin/groonga
+command_args="-d --pid-path ${GROONGA_PID:-/run/groonga/groonga.pid} --config-path=${CONFIG_FILE:-/etc/groonga/groonga.conf} ${DATABASE}"
+pidfile="${GROONGA_PID:-/run/groonga/groonga.pid}"
+start_stop_daemon_args="--quiet --user ${GROONGA_USER:-groonga}:${GROONGA_GROUP:-groonga}"
+
+depend() {
+       use net
+}
+
+start_pre() {
+       checkpath -d /run/groonga -o ${GROONGA_USER:-groonga}:${GROONGA_GROUP:-groonga}
+       if  [ ! -e "${DATABASE}" ] ; then
+               einfo "Creating database ${DATABASE}"
+               su -s /bin/sh -c "/usr/bin/groonga -n ${DATABASE} quit" ${GROONGA_USER:-groonga}
+       fi
+}

diff --git a/passwd b/passwd
index 299e346ff7d73264d51c40c247dfc2650adf7928..20e4e6952a14cdde8cf588159fca9ecff22657b8 100644 (file)
--- a/passwd
+++ b/passwd
@@ -31,3 +31,4 @@ postgres:x:70:70:added by portage for postgresql:/var/lib/postgresql:/bin/sh
 mysql:x:60:60:added by portage for mariadb:/dev/null:/sbin/nologin
 puppet:x:109:235:added by portage for puppet:/var/lib/puppet:/sbin/nologin
 puppetdb:x:110:234:added by portage for puppetdb:/opt/puppetlabs/server/data/puppetdb:/sbin/nologin
+groonga:x:111:233:added by portage for groonga:/dev/null:/sbin/nologin

diff --git a/passwd- b/passwd-
index fc1d4fe88439bfb5b7826dda344547a0b44d9009..299e346ff7d73264d51c40c247dfc2650adf7928 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -30,3 +30,4 @@ postmaster:x:14:237:added by portage for mailbase:/var/spool/mail:/sbin/nologin
 postgres:x:70:70:added by portage for postgresql:/var/lib/postgresql:/bin/sh
 mysql:x:60:60:added by portage for mariadb:/dev/null:/sbin/nologin
 puppet:x:109:235:added by portage for puppet:/var/lib/puppet:/sbin/nologin
+puppetdb:x:110:234:added by portage for puppetdb:/opt/puppetlabs/server/data/puppetdb:/sbin/nologin

diff --git a/shadow b/shadow
index c4f0f061add64fed162977d5628af0b98da46eeb..87c667137f4b0b4e68f76aa4797a64f290630050 100644 (file)
--- a/shadow
+++ b/shadow
@@ -30,3 +30,4 @@ postgres:!:17156::::::
 mysql:!:17156::::::
 puppet:!:17156::::::
 puppetdb:!:17164::::::
+groonga:!:17246::::::

diff --git a/shadow- b/shadow-
index 42de3541197866faf3ebf6c7d1c6409c57478ffe..c4f0f061add64fed162977d5628af0b98da46eeb 100644 (file)
--- a/shadow-
+++ b/shadow-
@@ -29,3 +29,4 @@ postmaster:!:17155::::::
 postgres:!:17156::::::
 mysql:!:17156::::::
 puppet:!:17156::::::
+puppetdb:!:17164::::::