1 files changed, 96 insertions, 90 deletions
diff --git a/hiera/chipmonk.yaml b/hiera/chipmonk.yaml
index 1cff21a..b2220e3 100644
--- a/hiera/chipmonk.yaml
+++ b/hiera/chipmonk.yaml
@@ -18,12 +18,15 @@ domain:
 enabled: true
 environment: clientdev
 haproxy: 
-  servers: 
-    gadwall: 
-      backup: false
-      host: localhost
-      port: 4000
-      weight: 100
+  couch: 
+    listen_port: 4096
+    servers: 
+      gadwall: 
+        backup: false
+        host: localhost
+        port: 4000
+        weight: 100
+        writable: true
 hosts: 
   chipmonk: 
     domain_full: chipmonk.cdev.bitmask.net
@@ -44,39 +47,42 @@ location:
 mail: 
   smarthost: []
 mynetworks: 
-  - "199.119.112.5"
-  - "192.168.5.5"
-  - "199.119.112.9"
-  - "192.168.5.9"
-  - "202.85.227.204"
-  - "199.119.112.10"
-  - "192.168.5.10"
+  - "176.53.69.127"
+  - "176.53.69.13"
+  - "176.53.69.14"
   - "176.53.69.21"
-  - "204.13.164.162"
-  - "198.252.153.85"
-  - "85.17.92.143"
-  - "204.13.164.171"
-  - "199.119.112.4"
+  - "176.53.69.22"
+  - "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"
+  - "192.168.5.5"
+  - "192.168.5.8"
+  - "192.168.5.9"
+  - "198.252.153.82"
   - "198.252.153.83"
+  - "198.252.153.85"
+  - "199.119.112.10"
+  - "199.119.112.12"
+  - "199.119.112.16"
+  - "199.119.112.19"
   - "199.119.112.23"
-  - "192.168.5.23"
-  - "176.53.69.14"
+  - "199.119.112.4"
+  - "199.119.112.5"
   - "199.119.112.8"
-  - "192.168.5.8"
-  - "176.53.69.22"
-  - "199.119.112.19"
-  - "192.168.5.19"
-  - "176.53.69.127"
+  - "199.119.112.9"
+  - "202.85.227.195"
+  - "204.13.164.162"
+  - "204.13.164.171"
   - "204.13.164.57"
-  - "176.53.69.13"
-  - "199.119.112.12"
-  - "192.168.5.12"
-  - "199.119.112.16"
-  - "192.168.5.16"
-  - "176.53.69.23"
-  - "198.252.153.82"
+  - "85.17.92.143"
 name: chipmonk
+platform: 
+  major_version: "0.6"
+  version: "0.6"
 service_type: user_service
 services: 
   - mx
@@ -117,11 +123,14 @@ ssh:
     ports: "60000:61000"
   port: 22
 stunnel: 
-  couch_client: 
-    gadwall_5984: 
-      accept_port: 4000
-      connect: gadwall.cdev.bitmask.i
-      connect_port: 15984
+  clients: 
+    couch_client: 
+      gadwall_5984: 
+        accept_port: 4000
+        connect: gadwall.cdev.bitmask.i
+        connect_port: 15984
+        original_port: 5984
+  servers: {}
 tags: 
   - clientdev
   - dc
@@ -344,62 +353,58 @@ x509:
       -----END CERTIFICATE-----
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIFDjCCAvagAwIBAgIDDsl6MA0GCSqGSIb3DQEBDQUAMHkxEDAOBgNVBAoTB1Jv
-      b3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAGA1UEAxMZ
-      Q0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSc3VwcG9y
-      dEBjYWNlcnQub3JnMB4XDTE0MDQwODE1MzQzNloXDTE0MTAwNTE1MzQzNlowGzEZ
-      MBcGA1UEAxMQY2Rldi5iaXRtYXNrLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-      ADCCAQoCggEBAKjKBkcB9eip1gJt+er7WY8Qc7/Mh5+kUMIHkxa9Q03NWwxGuKYo
-      YXJOSGmLfZ6J7O4tIXvSFq9VY4kH3vLZDH/zJq4sDlrl2kUgus5NGWc3v+5wu6si
-      xLXoTPtjk+q8nBByDOyiTga+34zWxpxTpJLJj+RUws8T4x2p66Leojh1WljE6iXG
-      sHw7H5PFKBBIr/sBedS31NUek2gbYM20SeFxyWHWy0J1SAXIRLfGje0WcI7hR/c1
-      t2oLO57KKJ9DooZvARf6foLLScaqhHeO6opeVhQeQjO5jX97NEzxifMGqfmk7krD
-      1nikbu38oIK4N+ySEXE1rcLeBoJ31S2KHjMCAwEAAaOB/DCB+TAMBgNVHRMBAf8E
-      AjAAMA4GA1UdDwEB/wQEAwIDqDA0BgNVHSUELTArBggrBgEFBQcDAgYIKwYBBQUH
-      AwEGCWCGSAGG+EIEAQYKKwYBBAGCNwoDAzAzBggrBgEFBQcBAQQnMCUwIwYIKwYB
-      BQUHMAGGF2h0dHA6Ly9vY3NwLmNhY2VydC5vcmcvMDEGA1UdHwQqMCgwJqAkoCKG
-      IGh0dHA6Ly9jcmwuY2FjZXJ0Lm9yZy9yZXZva2UuY3JsMDsGA1UdEQQ0MDKCEGNk
-      ZXYuYml0bWFzay5uZXSgHgYIKwYBBQUHCAWgEgwQY2Rldi5iaXRtYXNrLm5ldDAN
-      BgkqhkiG9w0BAQ0FAAOCAgEAO6QC5hsJiHQjXJmNOGOPqmEGnI/7yuQ26QOqwiEm
-      ooDNx7ziVk/73oG8Z+cfw3TPJ+mCu4i+dMzMrir+D4HNBepD9mWChu54gJboIVnb
-      dW9mvxpYHAhwempcw8QXVdI0jxzZXxWdEFd9alhQmJVEppfscz87dtT5sf/u0o4t
-      cDm2ME0PyenpeiVix7YtpcCnqFTnWtNYBwR6kCHlDr/V8wlp1EOgvOBFHUIpiRwi
-      bJ5BER4YLN4iWIKGTBF+lqPFsmEM/hkbk7OUjwv1uX/LeD3x+iUNvfRgkbKJMUUl
-      ddOdaeKhm5N216tpFo4hehGM1KW9/PHMW/GoIpm6eVkjeV51dD8g5ICPPwig1QUj
-      0rGiq4m+PFgg71oTXBU6eZSH7ZBca7fyOZYyESZHb1xa4HZgKLDeldt0VhApODbx
-      TmW3vDAo7iBElUcOvdxRRZzSSVOcslDbypnnECLJDoBrnaIAVj1eeMTYa2ETbVmF
-      nTVi7c2gixjXka7k4OtmKfeg+cQZvtNxfb9owE1wcFnCv3Bbz42HLcqxHvnGKpIp
-      Ig2JBgTqu7hQGhRnKYFSxq6DIxVXPmnN3O8PfrRx2rX+0AyXHaJlN1oiBAmChxC2
-      GazD5oO2EWIJMbo8bPpLy6oE7ZHl74hAyDsTRIAemh5cwGAVeSjiQj4DRqbSXSJ5
-      oCo=
+      MIIEcDCCAligAwIBAgIQZapGmb3M2eXlfyXvmTnKwDANBgkqhkiG9w0BAQsFADBK
+      MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
+      BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQxMDAyMDAwMDAwWhcNMTUx
+      MDAyMDAwMDAwWjAtMRAwDgYDVQQKDAdCaXRtYXNrMRkwFwYDVQQDDBBjZGV2LmJp
+      dG1hc2submV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvtDUNqCS
+      W8Gd3rdxG4fG+LGABxrD+A2CbwNJNZ1kte6t4h8h6bVAjIoVUzwt3fHbtoDGJAwi
+      IACZ5NQSBfAL0mZPu9EPhgBZNd5G/uzsYPAEOFlHuKRhlFsVJqApvlChkJpGFNoH
+      oDUGVWs4bmGq9e+Dc/6eouFGz8sqQfHWfKhnuX1T84oJGAzEm5pKIKkdUDMk9xIM
+      4SV+fKC5qrcmVDxpIgnJHI42sINSKS0xj9bhioGw5wFkstnxtpGNB3VDpaZ4pK/o
+      kw7NI9tHeguIxiMf1S9O4JeTyquShT6OXZrf1wR9nRS882cFnwruM9jsXbMILCeO
+      Y3Y7ZJ8c3jhtCQIDAQABo28wbTAdBgNVHQ4EFgQUkMbMHgml/FP5noJVRJ9C+oVs
+      lBEwCwYDVR0PBAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAkGA1UdEwQCMAAw
+      HwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48wDQYJKoZIhvcNAQELBQAD
+      ggIBAKNKgOnxYYiRSTNUYbAzfr5g6RmBndpc8vsFtcKcVtbIAm2HseiQLGqTbmIa
+      jbtbqd3138WG8wLDuiEVHeE8rzF1FMyncvJXFpee0X7BLWW+pm3qG4o+q49gxmZi
+      qN3+nUxMJWgw0ooK2nyzgp/AJ2iX8+b0oZTLCaG1SUAC8zoxbBlEmKldkpJSTVqE
+      gNBycX4+KQ9MrwsIqrDKCiKn2+IqmDThuaVmtkzXggLp6CsqJoedOiV3IAtxbl64
+      6GFAgT7OZVrnlSpylk53u8fthLCoM+0vuF0+9wWkxERxwywsgxRI5U5JibIzOuy3
+      Jce4Bs/n9h0ZWrZQBjyIptaGPpAJFpxFhhZm2yNGt6So2HctR5B9mSSedZg9a8XQ
+      bdV6ZNQEgBEY7tPPpmAMBGTEzynD3ivN/MFgB2BadT2V04dGQy5f2RzoT56iwRly
+      wPSHllPxt8gm8d9VswSZKD9IaUi6exM2x4yiu9qZWD8+PDR9OP9QmEio7TVuxXJ5
+      /vYkq1++ig5GxJDDdfuV2BY5vTOm9qkpIAw/usu9ZIETyQkzy1mc4Yt7hxjPq+Xr
+      7CENhUxhDJt45cs8kSk4OEtlivDHabt5wEDtcxXkDFdudseVf6iT4TfkcHyQDsRj
+      hgknwqmkAIwfmJjWWLNkQoTuxXRKm0ZmtWXIYlpk/d323Dau
       -----END CERTIFICATE-----
   commercial_key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
@@ -430,3 +435,4 @@ x509:
       c9OAySi7JcI0Pl9/ilUtc53EpsalTEaN3uuFlQoL8A8OKxabskS9bw==
       -----END RSA PRIVATE KEY-----
   use: true
+  use_commercial: true