[couchdb] branch master updated: remove mention of os daemons and externals in ini files

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 73f1565  remove mention of os daemons and externals in ini files
73f1565 is described below

commit 73f15655d46bf9bb4b47e363379c9e2fe030dd26
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Wed May 16 18:44:16 2018 +0200

    remove mention of os daemons and externals in ini files
---
 rel/overlay/etc/default.ini | 24 +-----------------------
 rel/overlay/etc/local.ini   | 14 --------------
 2 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 8b47cb0..5f77e7b 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -8,7 +8,7 @@ database_dir = {{data_dir}}
 view_index_dir = {{view_index_dir}}
 ; util_driver_dir =
 ; plugin_dir =
-os_process_timeout = 5000 ; 5 seconds. for view and external servers.
+os_process_timeout = 5000 ; 5 seconds. for view servers.
 max_dbs_open = 500
 delayed_commits = false
 ; Method used to compress everything that is appended to database and view index files, except
@@ -277,7 +277,6 @@ os_process_limit = 100
 
 [daemons]
 index_server={couch_index_server, start_link, []}
-external_manager={couch_external_manager, start_link, []}
 query_servers={couch_proc_manager, start_link, []}
 vhosts={couch_httpd_vhost, start_link, []}
 httpd={couch_httpd, start_link, []}
@@ -322,12 +321,6 @@ _design = {couch_httpd_db, handle_design_req}
 _temp_view = {couch_mrview_http, handle_temp_view_req}
 _view_cleanup = {couch_mrview_http, handle_cleanup_req}
 
-; The external module takes an optional argument allowing you to narrow it to a
-; single script. Otherwise the script name is inferred from the first path section
-; after _external's own path.
-; _mypath = {couch_httpd_external, handle_external_req, <<"mykey">>}
-; _external = {couch_httpd_external, handle_external_req}
-
 [httpd_design_handlers]
 _compact = {couch_mrview_http, handle_compact_req}
 _info = {couch_mrview_http, handle_info_req}
@@ -338,21 +331,6 @@ _update = {couch_mrview_show, handle_doc_update_req}
 _view = {couch_mrview_http, handle_view_req}
 _view_changes = {couch_mrview_http, handle_view_changes_req}
 
-; enable external as an httpd handler, then link it with commands here.
-; note, this api is still under consideration.
-; [external]
-; mykey = /path/to/mycommand
-
-; Here you can setup commands for CouchDB to manage
-; while it is alive. It will attempt to keep each command
-; alive if it exits.
-; [os_daemons]
-; some_daemon_name = /path/to/script -with args
-; [os_daemon_settings]
-; max_retries = 3
-; retry_time = 5
-
-
 [uuids]
 ; Known algorithms:
 ;   random - 128 bits of random awesome
diff --git a/rel/overlay/etc/local.ini b/rel/overlay/etc/local.ini
index 6b46f0f..e3b7b15 100644
--- a/rel/overlay/etc/local.ini
+++ b/rel/overlay/etc/local.ini
@@ -46,23 +46,12 @@
 [query_servers]
 ;nodejs = /usr/local/bin/couchjs-node /path/to/couchdb/share/server/main.js
 
-
-[httpd_global_handlers]
-;_google = {couch_httpd_proxy, handle_proxy_req, <<"http://www.google.com">>}
-
 [couch_httpd_auth]
 ; If you set this to true, you should also uncomment the WWW-Authenticate line
 ; above. If you don't configure a WWW-Authenticate header, CouchDB will send
 ; Basic realm="server" in order to prevent you getting logged out.
 ; require_valid_user = false
 
-[os_daemons]
-; For any commands listed here, CouchDB will attempt to ensure that
-; the process remains alive. Daemons should monitor their environment
-; to know when to exit. This can most easily be accomplished by exiting
-; when stdin is closed.
-;foo = /path/to/command -with args
-
 [daemons]
 ; enable SSL support by uncommenting the following line and supply the PEM's below.
 ; the default ssl port CouchDB listens on is 6984
@@ -103,9 +92,6 @@
 [vhosts]
 ;example.com = /database/
 
-[update_notification]
-;unique notifier name=/full/path/to/exe -with "cmd line arg"
-
 ; To create an admin account uncomment the '[admins]' section below and add a
 ; line in the format 'username = password'. When you next start CouchDB, it
 ; will change the password to a hash (so that your passwords don't linger