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/couch2.yaml | 136 +++++++++++++++++++++++++++++++++---------------------
 1 file changed, 83 insertions(+), 53 deletions(-)

(limited to 'hiera/couch2.yaml')

diff --git a/hiera/couch2.yaml b/hiera/couch2.yaml
index d2e5d95..2d21f49 100644
--- a/hiera/couch2.yaml
+++ b/hiera/couch2.yaml
@@ -77,8 +77,8 @@ mail:
     - mx1.bitmask.net
 name: couch2
 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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
-      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
+      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
+      po3MYeeWXw==
       -----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