added koala as couch node to unstable, leap cert update updated all unstable certs

1 files changed, 99 insertions, 52 deletions

diff --git a/hiera/octopus.yaml b/hiera/octopus.yaml
index 014fb4a..834887b 100644
--- a/hiera/octopus.yaml
+++ b/hiera/octopus.yaml
@@ -22,13 +22,25 @@ haproxy:
   couch: 
     listen_port: 4096
     servers: 
-      panda: 
+      koala: 
         backup: false
         host: localhost
         port: 4000
         weight: 100
         writable: true
+      panda: 
+        backup: false
+        host: localhost
+        port: 4001
+        weight: 100
+        writable: true
 hosts: 
+  koala: 
+    domain_full: koala.unstable.bitmask.net
+    domain_internal: koala.unstable.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/vYiNb13aZ+qPxrJlCTioJ6km/qhmlXqXID+gINmACVLq+67lfhDhK6ecr4wHpPnItzYpL+VCd/3SW51cZn7tKog2i3o4ZosajyKxj6AgPDOXGot3CKJzTwTuVvqfZWFnFEz9EOPjEFhuN/P+11qkqWcYnv1nezkiPIMxlwDtIu1zdFBoTA9xVLhmtotkVmlne0Lx+9aUnYNjC2bGBSuJ5cMUh/BSD0cFOte/UmWORXc2b2Pe1vllJ/WiJjFEaccmFVfwOQlORh9o+xDypp721qzdl437An4X7mt9ZCbzuY6ZIfYo6KD9eLQ5PuTsyls5/ujE2WnO4au+OIvmNM3X"
+    ip_address: "199.119.112.124"
+    port: 4422
   octopus: 
     domain_full: octopus.unstable.bitmask.net
     domain_internal: octopus.unstable.bitmask.i
@@ -72,6 +84,7 @@ mynetworks:
   - "198.252.153.85"
   - "199.119.112.10"
   - "199.119.112.12"
+  - "199.119.112.124"
   - "199.119.112.16"
   - "199.119.112.19"
   - "199.119.112.23"
@@ -156,8 +169,13 @@ ssh:
 stunnel: 
   clients: 
     couch_client: 
-      panda_5984: 
+      koala_5984: 
         accept_port: 4000
+        connect: koala.unstable.bitmask.i
+        connect_port: 15984
+        original_port: 5984
+      panda_5984: 
+        accept_port: 4001
         connect: panda.unstable.bitmask.i
         connect_port: 15984
         original_port: 5984
@@ -201,32 +219,37 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      MIIEwjCCAqqgAwIBAgIRAM7D3cZp42JWBbAjMb3BPM0wDQYJKoZIhvcNAQELBQAw
+      MIIFwjCCA6qgAwIBAgIRAOXNIeJQH7eyBh8diJ2r7FYwDQYJKoZIhvcNAQELBQAw
       SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
-      GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE0MDQwODAwMDAwMFoXDTE1
-      MDQwODAwMDAwMFowJzElMCMGA1UEAwwcb2N0b3B1cy51bnN0YWJsZS5iaXRtYXNr
-      Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL13ls4KC4lJAAYE
-      HhblkM5dAHCZtyj6QMukc6FRl4CaVz/g9JkvOnd2oi0Z4nK0bmlCAIA8H33usNG7
-      Hl/uCVCHwXjHLx+lVBBZ6TPvaeeGv27gYLYlhYGbG3KM9qsd/V7hnlV6lwmTClqY
-      d7A6dDWm8yya8XPrDbC5OmwYUnrPRIMggTBbOUn1tKilGLpDFuYd4Hu1WDW6SK/B
-      K2CyxbdzeqnHssNjyA0TJziE9Npy/4G5qrY182OCIHOwW9qoWABNil4QUx5b6un3
-      Ex1CHE9nGNCDGRT1G0xwXhv6pNrW6UQxM66rPVGlDGUCTnniRuA4ak5teESTL4hp
-      OOYBausCAwEAAaOBxTCBwjAdBgNVHQ4EFgQUkPwMxeszAxJh8YGtyJe4W/8iXmUw
-      SQYDVR0RBEIwQIIab2N0b3B1cy51bnN0YWJsZS5iaXRtYXNrLmmCHG9jdG9wdXMu
-      dW5zdGFibGUuYml0bWFzay5uZXSHBMd3cBAwCwYDVR0PBAQDAgWgMB0GA1UdJQQW
-      MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFLmB
-      gyy9rLMJ2KRx7z66LdSVPg+PMA0GCSqGSIb3DQEBCwUAA4ICAQCPkbVPRtUfZ9he
-      ge0X3G6OJtvkBAL9CPpw3tSU9dhIyY+PQKonUc978m+eOpIRVCNlkhdDafIn7JT4
-      uqt96SaqHHkyfoPpjqaCvrXB7aCpXRHX5rSg8hSpcHYKr1dtKy7/B/JwrFQ4I2mw
-      tAv0LXy7uyit8P+sRuli0OuF917+HZC4X+DQXMsp4NLgDiEO7TsQJF1EiVTjM32d
-      oIE3F7EMCIbtvSk6eu0XYvPlSwAlmS+8qxs8qNKUWP/XRHl2/BiA/olGNeZ83z5W
-      0bkeHnWx2D2Pq1EE4fUc8Bach+/Qo7lkRBbtINJC8WxGg715gqQpWmF0h1hAyXA8
-      iAEcTKbNmiY0KPHrfObDhpDeDLUsgy5xYAo/Mh6e5ma8VDKmeH2nomWRK+P+AtCm
-      qndqwW74HB2j2l0XZJUBMEXkeI1/veHP45QkcqDUhB17IBxjBEjibTsAXjA4giHi
-      YeuRAROnTBBAcqK7OKm9nd7/mc9qJQJtF+H1QFeexnT33wQJRsKExtVTTuseAIoc
-      mU6HxqrxXGj/bhaX101xCbN/CiQ1gkWE1p4CLvNokERvnfmkhfF8V/OSCL3fJ6G8
-      6KWYqrBl01Hz+y01L7wT8kVdOxGYA2bj1E1hXEitaoMsqhSzgOiWmOIFbGieydpO
-      Mf7lfjCglBkHLGQgdfDVcbATnjzYBA==
+      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
       -----END CERTIFICATE-----
   client_ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -439,31 +462,55 @@ x509:
       -----END RSA PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: true