diff options
| author | varac <varacanero@zeromail.org> | 2015-11-19 22:25:47 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-11-19 22:25:47 +0100 |
| commit | 00e373c7d594158385d7ed71258578b41789c3e8 (patch) | |
| tree | 30ffd388c0ff070854db279cdf7df4385190b56c | |
| parent | a18cf068cfba32d091de66c6bd0698c2a5674391 (diff) | |
use couchdb on quetzal
| -rw-r--r-- | hiera/quetzal.yaml | 50 | ||||
| -rw-r--r-- | nodes/quetzal.json | 10 | ||||
| -rw-r--r-- | provider.jessie.json | 2 |
3 files changed, 38 insertions, 24 deletions
diff --git a/hiera/quetzal.yaml b/hiera/quetzal.yaml index b6189e6..4a0aed0 100644 --- a/hiera/quetzal.yaml +++ b/hiera/quetzal.yaml @@ -8,14 +8,10 @@ clamav: contacts: - sysdev@leap.se couch: - bigcouch: - cookie: mefnJs8gkPSwHJKmeBJFnUxvMyuHaPA3 - ednp_port: 9002 - epmd_port: 4369 - neighbors: [] - master: false - mode: multimaster + master: true + mode: master port: 5984 + pwhash_alg: pbkdf2 users: admin: password: HU7SqpT7cjzkR9hKVjYZwkuMYIrpbdMx @@ -102,11 +98,17 @@ definition_files: "quetzal": { "hostname": "quetzal.jessie.bitmask.net", "ip_address": "199.119.112.197", + "location": "washington_d_c_", "port": 465 } }, "locations": { - + "washington_d_c_": { + "country_code": "US", + "hemisphere": "N", + "name": "Washington D.C.", + "timezone": "-5" + } }, "serial": 1, "version": 1 @@ -117,11 +119,17 @@ definition_files: "quetzal": { "hostname": "quetzal.jessie.bitmask.net", "ip_address": "199.119.112.197", + "location": "washington_d_c_", "port": 2323 } }, "locations": { - + "washington_d_c_": { + "country_code": "US", + "hemisphere": "N", + "name": "Washington D.C.", + "timezone": "-5" + } }, "serial": 1, "version": 1 @@ -175,7 +183,7 @@ haproxy: backup: false host: localhost port: 5984 - weight: 10 + weight: 100 writable: true hosts: quetzal: @@ -185,7 +193,11 @@ hosts: ip_address: "199.119.112.197" port: 22 ip_address: "199.119.112.197" -location: ~ +location: + country_code: US + hemisphere: "N" + name: "Washington D.C." + timezone: "-5" mail: smarthost: [] mx: @@ -229,8 +241,8 @@ nickserver: domain: nicknym.jessie.bitmask.net port: 6425 platform: - major_version: "0.8" - version: "0.8" + major_version: "0.9" + version: "0.9" rbls: - zen.spamhaus.org service_type: public_service @@ -316,19 +328,13 @@ ssh: stunnel: clients: couch_client: {} - ednp_clients: {} - epmd_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: [] +tags: + - dc + - jessie webapp: admins: - azul diff --git a/nodes/quetzal.json b/nodes/quetzal.json index 5f8f3d6..31178eb 100644 --- a/nodes/quetzal.json +++ b/nodes/quetzal.json @@ -2,5 +2,13 @@ "ip_address": "199.119.112.197", "environment": "jessie", "tags": ["jessie", "dc"], - "services": ["webapp", "couchdb", "mx", "soledad"] + "services": ["webapp", "couchdb", "mx", "soledad"], + "platform": { + "major_version": "0.9", + "version": "0.9" + }, + "couch": { + "master": true, + "pwhash_alg": "pbkdf2" + } } diff --git a/provider.jessie.json b/provider.jessie.json index d9c977c..b84b1c4 100644 --- a/provider.jessie.json +++ b/provider.jessie.json @@ -4,6 +4,6 @@ "allow_anonymous": false }, "platform": { - "branch": "jessie" + "branch": "develop" } } |