From f618f7104bd155f6fe7c90f9e6a9d7522c7b3a1f Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Thu, 9 Apr 2015 08:06:46 -0700
Subject: recompile local

---
 hiera/couch1.yaml | 136 +++++++++++++++++++++++++++++++++---------------------
 1 file changed, 83 insertions(+), 53 deletions(-)

(limited to 'hiera/couch1.yaml')

diff --git a/hiera/couch1.yaml b/hiera/couch1.yaml
index eb42acd..2ed53d3 100644
--- a/hiera/couch1.yaml
+++ b/hiera/couch1.yaml
@@ -77,8 +77,8 @@ mail:
     - mx1.bitmask.net
 name: couch1
 platform: 
-  major_version: "0.6"
-  version: "0.6.1"
+  major_version: "0.7"
+  version: "0.7"
 service_type: public_service
 services: 
   - couchdb
@@ -108,11 +108,11 @@ sources:
     revision: latest
     type: apt
   tapicero: 
-    revision: origin/version/0.6.1
+    revision: origin/version/0.7
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.6
+    revision: origin/version/0.7
     source: "https://leap.se/git/leap_web"
     type: git
 squid_deb_proxy_client: true
@@ -214,62 +214,92 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
-      BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQwNDA4MDAwMDAwWhcNMTUw
-      NDA4MDAwMDAwWjAdMRswGQYDVQQDDBJjb3VjaDEuYml0bWFzay5uZXQwggEiMA0G
-      CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMY06kltTPqFCtaYFSB8k/Nh9VmEN4
-      QkBqVe65fGVVTXCWxIbln3Wtc/U3DedHTooY1xy1SuVISYkT1Tdh23oKKSj3a2Cy
-      klJdXH5kPLXD0lL5wVj795v/XF1viWYC/+iCP122tqJ5mViDg/BxWZaaLP+Pdy0l
-      mz6nu+a0/xhV2YpC35OIMSezRcL15L1E1Swf4BcUlrXun7n3uYzpXCxs6SaeLm0q
-      XdQMIukdSHdptkORjrupweX7vWuuglodQS3c3aIOe8xbxADGxvJ4wi86Lm96GQPv
-      bOXK74xyYerLZr+IeILJpsB7r/doLMTl2fqjYaagxtO/BZli5lrjWyhTAgMBAAGj
-      gbEwga4wHQYDVR0OBBYEFKPRoUjKTFDbA8GC5oZnsPd8wkhFMDUGA1UdEQQuMCyC
-      EGNvdWNoMS5iaXRtYXNrLmmCEmNvdWNoMS5iaXRtYXNrLm5ldIcECgUFLDALBgNV
-      HQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAkGA1UdEwQC
-      MAAwHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48wDQYJKoZIhvcNAQEL
-      BQADggIBAGB4ImV2Vf1HYZgytL8vsybX5BY4/Poq6YCcYR2viJ3rVChK1AMSIOG2
-      fMLqkVnaj8GJMiJZYDqdulhgR6kG+RgaMCrewAkmZQjMIHCOqm9DwhWUmtyOKMI5
-      7709tScHjCN479ayCQ1fHChl9dxNdGrCXuIEcjTM85YryrYOMKDTDNwh9Bb7j7v5
-      J8J4PAXf8gFpXzDdbRCwCaH6/9visLJfkrIMgCP76sBOijKs3GYnF5UygrZOSFNy
-      JJ7jMhOHmil4EOtc5tO+a2pwbFMu3qF52bBw3SWt68j7zN0cPRwPCfkXvLs3ci3n
-      Q+Mtg17F8ccWwOYBxv0xf2rw/qbjc/6CuzJyn2W4N7yKcXfIHHdAtRiqKMdQdU2a
-      rc66DmLDONJii6ZHn1fraHIDGyZMHtUmJzEHyWH6b+fsc0DG/EO4Dhm42O6xlPfl
-      d6QcNv03HReyaFLEhaNrZhTs1TKkctKviuuxwS/Y60M7E/K8XycyBpkSTTgC+wiu
-      R5dk22y9yMhjg4ENW0f5vpljYGjP1ffNr66p12uUBNkXFobrktIc7Qg/Tz4R3uoa
-      7AQ/LsmCL5K6F5OqPAUMwc7w1Jp2CSq0sqBSuyjq5Xaom2eQcRD02c1pcLfJwWRS
-      iEbJwlSbPVGpScfRfoaOlyiH96btwnWvaIBgf3Ii7dLTSc2EIO5s
+      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
+      E/pmwVKBiw==
       -----END CERTIFICATE-----
   commercial_ca_cert: ~
   commercial_cert: ~
   commercial_key: ~
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: false
-- 
cgit v1.2.3