Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add couchdb conf dir #5285

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
+828 −59
Open

Add couchdb conf dir #5285

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c3f2b24
Add the default configuration files for CouchDB 2.3.
style95 Jul 15, 2022
2bd4be9
Remove the erlang cookie generation step as it is configurable via vm…
style95 Jul 15, 2022
b971fae
Add the conf dir for CouchDB.
style95 Jul 15, 2022
3fbe947
Add a test case for CouchDB config.
style95 Jul 15, 2022
da21130
Update the deployment script for CouchDB.
style95 Jul 15, 2022
47d7094
Change the target to the coordinator.
style95 Jul 15, 2022
619ece8
Configure the become_user.
style95 Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ansible/environments/docker-machine/group_vars/all
View file
Original file line number Diff line number Diff line change
@@ -32,6 +32,7 @@ whisk_api_localhost_name: "openwhisk"

# Hardcoded for docker-machine since db init runs on host not inside VM
db_prefix: whisk_dockermachine_
db_confdir: "{{ config_root_dir }}/couchdb"

# API GW connection configuration
apigw_auth_user: ""
1 change: 1 addition & 0 deletions ansible/environments/jenkins/group_vars/openwhisk-vm1-he-de
View file
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@ runtimes_bypass_pull_for_local_images: true
invoker_use_runc: "{{ ansible_distribution != 'MacOSX' }}"

db_prefix: whisk_local_
db_confdir: "{{ config_root_dir }}/couchdb"

# API GW connection configuration
apigw_auth_user: ""
1 change: 1 addition & 0 deletions ansible/environments/jenkins/group_vars/openwhisk-vm2-he-de
View file
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@ runtimes_bypass_pull_for_local_images: true
invoker_use_runc: "{{ ansible_distribution != 'MacOSX' }}"

db_prefix: whisk_local_
db_confdir: "{{ config_root_dir }}/couchdb"

# API GW connection configuration
apigw_auth_user: ""
1 change: 1 addition & 0 deletions ansible/environments/jenkins/group_vars/openwhisk-vm3-he-de
View file
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@ runtimes_bypass_pull_for_local_images: true
invoker_use_runc: "{{ ansible_distribution != 'MacOSX' }}"

db_prefix: whisk_local_
db_confdir: "{{ config_root_dir }}/couchdb"

# API GW connection configuration
apigw_auth_user: ""
1 change: 1 addition & 0 deletions ansible/environments/local/group_vars/all
View file
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@ runtimes_bypass_pull_for_local_images: true
invoker_use_runc: "{{ ansible_distribution != 'MacOSX' }}"

db_prefix: whisk_local_
db_confdir: "{{ config_root_dir }}/couchdb"

# API GW connection configuration
apigw_auth_user: ""
1 change: 1 addition & 0 deletions ansible/environments/vagrant/group_vars/all
View file
Original file line number Diff line number Diff line change
@@ -24,6 +24,7 @@ runtimes_bypass_pull_for_local_images: true
invoker_use_runc: "{{ ansible_distribution != 'MacOSX' }}"

db_prefix: whisk_local_
db_confdir: "{{ config_root_dir }}/couchdb"

# API GW connection configuration
apigw_auth_user: ""
2 changes: 2 additions & 0 deletions ansible/group_vars/all
View file
Original file line number Diff line number Diff line change
@@ -281,6 +281,8 @@ db:
port: "{{ db_port | default(lookup('ini', 'db_port section=db_creds file={{ playbook_dir }}/db_local.ini')) }}"
host: "{{ db_host | default(lookup('ini', 'db_host section=db_creds file={{ playbook_dir }}/db_local.ini')) }}"
persist_path: "{{ db_persist_path | default(false) }}"
dir:
become: "{{ db_dir_become | default(true) }}"
instances: "{{ groups['db'] | length }}"
authkeys:
- guest
11 changes: 11 additions & 0 deletions ansible/roles/couchdb/files/default.d/10-docker-default.ini
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
; CouchDB Configuration Settings
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These default files are from the apache/couchdb:2.3 image.


; Custom settings should be made in this file. They will override settings
; in default.ini, but unlike changes made to default.ini, this file won't be
; overwritten on server upgrade.

[chttpd]
bind_address = any

[httpd]
bind_address = any
11 changes: 11 additions & 0 deletions ansible/roles/couchdb/files/default.d/README
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
CouchDB default configuration files

Files found under the etc/default.d directory that end with .ini are
parsed within couchdb(1) at startup.

This directory is intended for distribution-specific overrides of
CouchDB defaults. Package maintainers should be placing overrides in
this directory.

System administrator should place overrides in the etc/local.d directory
instead.
Loading