summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-11-19 22:37:27 +0100
committervarac <varacanero@zeromail.org>2015-11-19 22:37:27 +0100
commit9295586a8a4ab5d770feb11225009a7f8095fe0d (patch)
tree97300213f1e54723c7f1ac4ea7fae0beac7272e7
parent00e373c7d594158385d7ed71258578b41789c3e8 (diff)
use couchdb on aardwolf
-rw-r--r--hiera/aardwolf.yaml34
-rw-r--r--nodes/aardwolf.json6
2 files changed, 10 insertions, 30 deletions
diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml
index 9445b15..13289ee 100644
--- a/hiera/aardwolf.yaml
+++ b/hiera/aardwolf.yaml
@@ -2,14 +2,10 @@
contacts:
- sysdev@leap.se
couch:
- bigcouch:
- cookie: 8Eptmk6hSCaLN6WjWaZGtQbq2IKXnTRe
- ednp_port: 9002
- epmd_port: 4369
- neighbors: []
- master: false
- mode: multimaster
+ master: true
+ mode: master
port: 5984
+ pwhash_alg: pbkdf2
users:
admin:
password: LYaDX9L9QKe2Re6p8dFKhu_t2XCxTqNZ
@@ -59,19 +55,7 @@ firewall:
port: 22
to: "199.119.112.124"
stunnel: []
-hosts:
- aardwolf:
- domain_full: aardwolf.unstable.bitmask.net
- domain_internal: aardwolf.unstable.bitmask.i
- host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCq3vwGhiuz1xUG8nL8c1f2+sw8fLcKIpQ0K6W2Bv3dz5/MjdyrsvAz6y/fLfWE2WAGNOaPhYmPFNPbCr6TAWX38NjTRVg2jqwHmdRKTbpGZeRQo3KQ+8UZULQYHVOQAAsdpBhZb5oluBj7et8ZtA/DK52PNXnprbUF0tY6QsXuMA/3XLG1Oc4mb28VbwjdV2ww/SrFqbuAT/hgYHGkC5Ji3wcIdd2gd2Doa2HmAXl8FkLfAyybfXbGVSClSTH+0LH7FqE/octJUyQjVroZzW2LDGbPP+g9ilhuegW6XSTWRUpRtdYsELMUjq3jhasl02dWmWfcbLLlzAi/88SGbkVB"
- ip_address: "199.119.112.124"
- port: 22
- cat:
- domain_full: cat.unstable.bitmask.net
- domain_internal: cat.unstable.bitmask.i
- host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCiGuqt+UfwqRvJdL6vioX8+oyRnZZKZ8uPKbMRmT7uR7z15Ox4QpNpW2aOTJ8Dwy4jPo5icEkYeGxXNdJMuooIxc1SgcaTpyh/epVGNV/K409t9KAi057eEMgp75dKi7f8kq+jvXeK1+ZdT6DvxvHQVMkKi0KeT8rw2F2Vdqh2upGiHtjLDXtF2ySLjwJ3gxqVjvsfDUxIYdBabK3eLuRINXwGKnJHmKO6MqQR4dOlOPG+3EdgVunWmVSA+1Uo8EZU6kbJ9T5MbpEDAV9K0R1HgdB2UTu/agFOVOYKylROcNzu2nES9qCat6/THK8lCVKBDywjpoQZ9vqSH9oFwond"
- ip_address: "199.119.112.123"
- port: 22
+hosts: {}
ip_address: "199.119.112.124"
location:
country_code: US
@@ -164,19 +148,11 @@ ssh:
ports: "60000:61000"
port: 22
stunnel:
- clients:
- ednp_clients: {}
- epmd_clients: {}
+ clients: {}
servers:
couch_server:
accept_port: 15984
connect_port: 5984
- ednp_server:
- accept_port: 19002
- connect_port: 9002
- epmd_server:
- accept_port: 14369
- connect_port: 4369
tags:
- dc
- unstable
diff --git a/nodes/aardwolf.json b/nodes/aardwolf.json
index 903f7fb..78dd41e 100644
--- a/nodes/aardwolf.json
+++ b/nodes/aardwolf.json
@@ -7,5 +7,9 @@
"tags": [
"dc",
"unstable"
- ]
+ ],
+ "couch": {
+ "master": true,
+ "pwhash_alg": "pbkdf2"
+ }
}