From f66e70a9fa5fdcc12ebfa3f15129e570471e3c3f Mon Sep 17 00:00:00 2001
From: Varac <varac@leap.se>
Date: Tue, 27 Jun 2017 11:19:09 +0200
Subject: leap compile

---
 hiera/otter.yaml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'hiera/otter.yaml')

diff --git a/hiera/otter.yaml b/hiera/otter.yaml
index 9c150dc..9410959 100644
--- a/hiera/otter.yaml
+++ b/hiera/otter.yaml
@@ -5,6 +5,7 @@ contacts:
 development: 
   site_config: true
 dns: 
+  aliases: []
   public: true
 domain: 
   full: otter.demo.bitmask.net
@@ -64,8 +65,8 @@ openvpn:
   unlimited_prefix: UNLIMITED
   user_ips: false
 platform: 
-  major_version: "0.9"
-  version: "0.9"
+  major_version: "0.10"
+  version: "0.10"
 service_type: user_service
 services: 
   - openvpn
@@ -80,18 +81,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.9
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.9"
+      basic: "http://deb.leap.se/platform"
+      component: master
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.8
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -130,6 +132,9 @@ ssh:
       key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDU6cVvh+1LYRYNff17s06E2ZBN5M5VEMYP15JNvM05ARNF7UuLuq0o9CrVRxFIknGBHOB2mtf0Tnc2opbJiq3fOJ/YKv2DBLcm+mrJvJC8gqi1JP76bUEETfuwkB2RHbzvJtDRo991IQcLaKpPjXQ4DBSdKgo4cldQVcpRFGmy3S7IsUjUmvfY/StyHc8bux2yjBDyzUdEA7MiXl7Vu6HA6xD5B+QYO71QVyfl2cYaJ10cxrVE1lJaqLjku8UoaKP1FU4PiLY2or2J1sQEvuhkxoIvYUPpIqEmH43ZeFLxTBMUv2leJs8BmKygzcW35jzZcsK5t23hp40gU7DOX8A1
       type: ssh-rsa
     micah: 
+      key: AAAAC3NzaC1lZDI1NTE5AAAAIFWPWdMWtDKPbcQBQnOytGcOX0Qt97yJuObDY9gI/22W
+      type: ssh-ed25519
+    micah2: 
       key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC5xvAs8c8KmJ/Lt2TiYthxOVEgUkprbLWVOwK1Hmc+3h6rV4iyT//8dv8Ov79ZMOAuqQhQ5fz7RckOTqoexW/kzbFhXw5NEt+eqHonayiAh8LVt2K79GbMtWmS2ss81ivDyQkaW3+PK5IDibsoOfNeuAZ17Hgudatjc4v7WEjVliYBwPLAA5DUZt8wf7nNQX3moHGE8A+d3S0UDQyEmT657D1p8jmrpg9qTL7nuvjZTq7v/mVErnIDUY83FGdrT1F+gPlCLetzSDeaNkYFm+RjVixF2pZKT+BsHkj/8nTJw7NBh/BTG34pSyuCmepwBBwPEISkfMAEA9Ag+TXq+Oe53GmmBa92asusM7XzyPTxUcvnUAp4kxn5i+65dDx4F2//cVe7+CNCdl8N5p88Xe3jmsTeEdEXnmXPFOBbvAE0kikDE30FqU06u/pLDy7ZG3JTZZtvvFuKrYokgQysDMLaxlMVMANs9WugJkOlexzOeDDgptPf8f2fQs2Q9Xo0xq1wrtD4kdopgtF1LLEFcUDKp7+nev+czzNWbv6ccZotlicZIqauYnBjjGPYz0sC4OCvZjz7bK7nDsdHoaZBSl1YUhTyLUDH2XH8V1lbEOJhfJSp+vZMJETIe8oP+uByEt01FIt8JsRhijXoKCPfXp59P9d3KS8vuaUsCEVrpkkalQ==
       type: ssh-rsa
     monitor: 
@@ -165,6 +170,7 @@ tor:
     key_type: RSA
     private_key: ~
     public_key: ~
+    single_hop: false
   nickname: otterdVuPt9yFz8SpKm
 x509: 
   ca_cert: |
-- 
cgit v1.2.3