From: Frank Brehm Date: Mon, 31 Jul 2017 09:03:02 +0000 (+0200) Subject: committing changes in /etc after emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=4a84d893da08a2850b207d4c351c2506025faabf;p=config%2Fberta%2Fetc.git committing changes in /etc after emerge run Package changes: --- diff --git a/.etckeeper b/.etckeeper index a0c9895..0bb79e0 100755 --- a/.etckeeper +++ b/.etckeeper @@ -118,7 +118,6 @@ 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' @@ -382,11 +381,6 @@ 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' @@ -430,7 +424,6 @@ 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 deleted file mode 100644 index f70b8e5..0000000 --- a/conf.d/groonga +++ /dev/null @@ -1,8 +0,0 @@ -# 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 deleted file mode 100644 index 42d569e..0000000 --- a/groonga/groonga.conf +++ /dev/null @@ -1,11 +0,0 @@ -# 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 deleted file mode 100644 index f58d09a..0000000 --- a/groonga/httpd/groonga-httpd.conf +++ /dev/null @@ -1,68 +0,0 @@ -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 deleted file mode 100644 index 17e2923..0000000 --- a/groonga/synonyms.tsv +++ /dev/null @@ -1,5 +0,0 @@ -# -*- coding: utf-8 -*- -# -# key[TAB]synonym1[TAB]synonym2[TAB]... -# -#groonga groonga rroonga mroonga diff --git a/init.d/groonga b/init.d/groonga deleted file mode 100755 index 7d11ab6..0000000 --- a/init.d/groonga +++ /dev/null @@ -1,20 +0,0 @@ -#!/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 -}