saving uncommitted changes in /etc prior to emerge run

This commit is contained in:
2015-05-09 21:02:32 +02:00
committed by root
parent 9673eeb673
commit ca0234de0d
20 changed files with 107 additions and 1570 deletions

View File

@@ -3,12 +3,12 @@
; Upgrading CouchDB will overwrite this file.
[vendor]
name = The Apache Software Foundation
version = 1.6.1
version = 1.5.1
[couchdb]
database_dir = /var/lib/couchdb
view_index_dir = /var/lib/couchdb
util_driver_dir = /usr/lib64/couchdb/erlang/lib/couch-1.6.1/priv/lib
util_driver_dir = /usr/lib64/couchdb/erlang/lib/couch-1.5.1/priv/lib
max_document_size = 4294967296 ; 4 GB
os_process_timeout = 5000 ; 5 seconds. for view and external servers.
max_dbs_open = 100
@@ -29,8 +29,6 @@ attachment_stream_buffer_size = 4096
plugin_dir = /usr/lib64/couchdb/plugins
; etc/couchdb/default.ini.tpl. Generated from default.ini.tpl.in by configure.
[database_compaction]
; larger buffer sizes can originate smaller files
doc_buffer_size = 524288 ; value in bytes
@@ -52,11 +50,8 @@ allow_jsonp = false
;server_options = [{backlog, 128}, {acceptor_pool_size, 16}]
; For more socket options, consult Erlang's module 'inet' man page.
;socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}]
socket_options = [{recbuf, 262144}, {sndbuf, 262144}]
log_max_chunk_size = 1000000
enable_cors = false
; CouchDB can optionally enforce a maximum uri length;
; max_uri_length = 8000
[ssl]
port = 6984
@@ -74,8 +69,6 @@ timeout = 600 ; number of seconds before automatic logout
auth_cache_size = 50 ; size is number of cache entries
allow_persistent_cookies = false ; set to true to allow persistent cookies
iterations = 10 ; iterations for password hashing
; min_iterations = 1
; max_iterations = 1000000000
; comma-separated list of public fields, 404 if empty
; public_fields =
@@ -128,8 +121,8 @@ credentials = false
use_users_db = false
[query_servers]
javascript = /usr/local/bin/couchjs /usr/local/share/couchdb/server/main.js
coffeescript = /usr/local/bin/couchjs /usr/local/share/couchdb/server/main-coffee.js
javascript = /usr/bin/couchjs /usr/share/couchdb/server/main.js
coffeescript = /usr/bin/couchjs /usr/share/couchdb/server/main-coffee.js
; Changing reduce_limit to false will disable reduce_limit.
@@ -155,9 +148,9 @@ compaction_daemon={couch_compaction_daemon, start_link, []}
[httpd_global_handlers]
/ = {couch_httpd_misc_handlers, handle_welcome_req, <<"Welcome">>}
favicon.ico = {couch_httpd_misc_handlers, handle_favicon_req, "/usr/local/share/couchdb/www"}
favicon.ico = {couch_httpd_misc_handlers, handle_favicon_req, "/usr/share/couchdb/www"}
_utils = {couch_httpd_misc_handlers, handle_utils_dir_req, "/usr/local/share/couchdb/www"}
_utils = {couch_httpd_misc_handlers, handle_utils_dir_req, "/usr/share/couchdb/www"}
_all_dbs = {couch_httpd_misc_handlers, handle_all_dbs_req}
_active_tasks = {couch_httpd_misc_handlers, handle_task_status_req}
_config = {couch_httpd_misc_handlers, handle_config_req}
@@ -359,3 +352,4 @@ min_file_size = 131072
; compacted in parallel.
;
;_default = [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}, {from, "23:00"}, {to, "04:00"}]