summaryrefslogtreecommitdiff
path: root/hiera/mx1.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'hiera/mx1.yaml')
-rw-r--r--hiera/mx1.yaml96
1 files changed, 42 insertions, 54 deletions
diff --git a/hiera/mx1.yaml b/hiera/mx1.yaml
index 9bf16bc..37d5ce6 100644
--- a/hiera/mx1.yaml
+++ b/hiera/mx1.yaml
@@ -18,21 +18,17 @@ domain:
enabled: true
environment: local
haproxy:
- couch:
- listen_port: 4096
- servers:
- couch1:
- backup: false
- host: localhost
- port: 4000
- weight: 10
- writable: true
- couch2:
- backup: false
- host: localhost
- port: 4001
- weight: 10
- writable: true
+ servers:
+ couch1:
+ backup: false
+ host: localhost
+ port: 4000
+ weight: 10
+ couch2:
+ backup: false
+ host: localhost
+ port: 4001
+ weight: 10
hosts:
couch1:
domain_full: couch1.bitmask.net
@@ -52,41 +48,38 @@ mail:
smarthost: []
mynetworks:
- "176.53.69.127"
- - "176.53.69.13"
- - "176.53.69.14"
- - "176.53.69.21"
- - "176.53.69.22"
+ - "199.119.112.9"
+ - "192.168.5.9"
- "176.53.69.23"
- - "192.168.5.10"
- - "192.168.5.12"
- - "192.168.5.16"
- - "192.168.5.19"
- - "192.168.5.23"
- - "192.168.5.4"
+ - "199.119.112.5"
- "192.168.5.5"
- - "192.168.5.8"
- - "192.168.5.9"
- - "198.252.153.82"
- - "198.252.153.83"
- - "198.252.153.85"
+ - "176.53.69.21"
+ - "204.13.164.171"
- "199.119.112.10"
+ - "192.168.5.10"
+ - "198.252.153.83"
- "199.119.112.12"
+ - "192.168.5.12"
+ - "204.13.164.162"
+ - "198.252.153.82"
- "199.119.112.16"
+ - "192.168.5.16"
+ - "204.13.164.57"
+ - "176.53.69.14"
- "199.119.112.19"
+ - "192.168.5.19"
+ - "176.53.69.13"
+ - "202.85.227.195"
- "199.119.112.23"
+ - "192.168.5.23"
+ - "85.17.92.143"
+ - "176.53.69.22"
- "199.119.112.4"
- - "199.119.112.5"
+ - "192.168.5.4"
+ - "198.252.153.85"
- "199.119.112.8"
- - "199.119.112.9"
- - "202.85.227.195"
- - "204.13.164.162"
- - "204.13.164.171"
- - "204.13.164.57"
- - "85.17.92.143"
+ - "192.168.5.8"
name: mx1
-platform:
- major_version: "0.6"
- version: "0.6"
service_type: user_service
services:
- mx
@@ -128,19 +121,15 @@ ssh:
ports: "60000:61000"
port: 22
stunnel:
- clients:
- couch_client:
- couch1_5984:
- accept_port: 4000
- connect: couch1.bitmask.i
- connect_port: 15984
- original_port: 5984
- couch2_5984:
- accept_port: 4001
- connect: couch2.bitmask.i
- connect_port: 15984
- original_port: 5984
- servers: {}
+ couch_client:
+ couch1_5984:
+ accept_port: 4000
+ connect: couch1.bitmask.i
+ connect_port: 15984
+ couch2_5984:
+ accept_port: 4001
+ connect: couch2.bitmask.i
+ connect_port: 15984
tags:
- local
x509:
@@ -565,4 +554,3 @@ x509:
ZxgCM4SPY7CPwZOXfXvV3suBehvJ1FJIWGz45wJAeBvH+sHIlTi4cw==
-----END RSA PRIVATE KEY-----
use: true
- use_commercial: true