Remove haproxy, new unstable cert

3 files changed, 13 insertions, 29 deletions

diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index 5dadd5e..e768419 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -7,6 +7,7 @@ couchdb_leap_mx_user:
   password: C3L8QnFCMpaKGQghMAW9gERSmhAuNvfC
   salt: b4ac83520fa38b3acb722984fe5e3343
   username: leap_mx
+couchdb_port: 4000
 development: 
   site_config: true
 dns: 
@@ -31,16 +32,6 @@ firewall:
     port: 22
     to: "199.119.112.206"
   stunnel: []
-haproxy: 
-  couch: 
-    listen_port: 4096
-    servers: 
-      aardwolf: 
-        backup: false
-        host: localhost
-        port: 4000
-        weight: 100
-        writable: true
 hosts: 
   aardwolf: 
     domain_full: aardwolf.unstable.bitmask.net
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index 8bc914e..87fc34b 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -173,16 +173,6 @@ firewall:
       - 6425
       - 80
     to: "199.119.112.207"
-haproxy: 
-  couch: 
-    listen_port: 4096
-    servers: 
-      aardwolf: 
-        backup: false
-        host: localhost
-        port: 4000
-        weight: 100
-        writable: true
 hosts: 
   aardwolf: 
     domain_full: aardwolf.unstable.bitmask.net
@@ -716,6 +706,7 @@ webapp:
     password: LYaDX9L9QKe2Re6p8dFKhu_t2XCxTqNZ
     salt: b9d35fd378ba1598e843d5a784cfdf7e
     username: admin
+  couchdb_port: 4000
   couchdb_webapp_user: 
     password: enfhmsmcLc3Az3GF6TFKwRk99Iqjm2ew
     salt: 478bf7e8ca879a9711b279055f00153e
@@ -972,10 +963,10 @@ x509:
       -----END CERTIFICATE-----
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIGDDCCBPSgAwIBAgISA+1NpsKb61NEDgpNaT7yOTmvMA0GCSqGSIb3DQEBCwUA
+      MIIGDDCCBPSgAwIBAgISA5QRZeYmkf/kqc7/h8i4q3RLMA0GCSqGSIb3DQEBCwUA
       MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzAyMDkwNzU0MDBaFw0x
-      NzA1MTAwNzU0MDBaMB8xHTAbBgNVBAMTFHVuc3RhYmxlLmJpdG1hc2submV0MIIC
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzAzMjkwODQwMDBaFw0x
+      NzA2MjcwODQwMDBaMB8xHTAbBgNVBAMTFHVuc3RhYmxlLmJpdG1hc2submV0MIIC
       IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAx0u3IkbJ8qpGsFOWCm4K3QKk
       /50vHLTq/gqU4xYeGCvpHQRw59wasVCLSZWEmemVjBQtQ7tjWUYaVbFHtqRX/KwG
       IQIEZ4mkfneDczI71EVIsJMPn8sjzZrQHHyMSLFe3xIKCtsb25UlxmIL93h7KrvG
@@ -999,12 +990,12 @@ x509:
       bGllZCB1cG9uIGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRh
       bmNlIHdpdGggdGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczov
       L2xldHNlbmNyeXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEA
-      jfJIulpH0bh9MtlIJYRm/SERgBOsuVcyfShXQ/q1Cjsl48rBy85bZdi31pFmOEG6
-      gmUOkUBIKID0YBqXtDOd94J2K2dEGwiI7JPKwyTriuGKiwfKV+bQ081YX0cHqRMb
-      GYuzq0v8VbPpU0+CEkIdlPXwZiJg2Rg8gv5OfiAapEz4vN9E1GLYROeFpzkMxznW
-      a2gO3dqvoCysqf4REDxN734gYO9EULXYoU91ik8KfkBGD1c1RaP5NZCNdpLv/PmX
-      SEKyDrnrnq96rTWVmNtR9twptr/2yLRUr8HdJmUTmrzvMenfgEZcuII6l4sXRLzK
-      JZtXcow9R+B+rVTbMNO8FQ==
+      GPKCz7/WhJr/4cV34jDuAU3f5vGRcBPiy2mEYR87Es5N316G4HLh060tqARNqW9X
+      wPJcdqYQS2O+12Dd1uEhGWRpQIfcEuGmUUDJghxwqak25gBQw0ZqXXijTyMxLzlb
+      tG83d9OwOuBEqKd6s/QhlJ0I39okludyAljBF+KtGtl4DOJpLDzQ/M/jhGlEQyBM
+      RShy1V8OnAVxs/C+IyHPRGwOxHVIZe17hfmSxAEyJAYNNRzCDiwwqLpWWmXXibUX
+      Sw/Y0qVIw89gnVBvx1PJyveEbyzm3DXD6T8FokKcpXyqNRI3HtxMEabY/JH+Uqwv
+      hrfzZ4EfekySWL60szPP8Q==
       -----END CERTIFICATE-----
       -----BEGIN CERTIFICATE-----
       MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/hiera/orangutan.yaml b/hiera/orangutan.yaml
index db3aa20..7fa0332 100644
--- a/hiera/orangutan.yaml
+++ b/hiera/orangutan.yaml
@@ -43,6 +43,7 @@ couchdb_leap_mx_user:
   password: dJvVzZACdssXbDPgmUwurZYwcUByMIyq
   salt: 7af30167817f2e9494021851323a6b6b
   username: leap_mx
+couchdb_port: 5984
 definition_files: 
   eip_service: |-
       {
@@ -354,6 +355,7 @@ webapp:
     password: jgU3EHDw4zsz4sV2cCEEpxzyNqF5K7wn
     salt: b0ffebcc5fbfd4c7bb757912e143a642
     username: admin
+  couchdb_port: 5984
   couchdb_webapp_user: 
     password: SgmHyQyLISHbRCzHzMURHEgUmSCnQpAw
     salt: 2e13b660747c5d3f41bc6f604e8c2273