New certs, new release

14 files changed, 126 insertions, 132 deletions

diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml
index db2b2bd..8c871bd 100644
--- a/hiera/aardwolf.yaml
+++ b/hiera/aardwolf.yaml
@@ -107,19 +107,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.10
+    revision: tags/0.10.0
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: master
+      component: "0.10"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.9
+    revision: tags/0.9.2
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/alpaca.yaml b/hiera/alpaca.yaml
index 6c7c499..f90cf2f 100644
--- a/hiera/alpaca.yaml
+++ b/hiera/alpaca.yaml
@@ -256,19 +256,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.10
+    revision: tags/0.10.0
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: master
+      component: "0.10"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.9
+    revision: tags/0.9.2
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/ant.yaml b/hiera/ant.yaml
index 62d728c..cc0b101 100644
--- a/hiera/ant.yaml
+++ b/hiera/ant.yaml
@@ -86,19 +86,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.10
+    revision: tags/0.10.0
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: master
+      component: "0.10"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.9
+    revision: tags/0.9.2
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index f70d0ff..2d3085e 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -106,19 +106,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.10
+    revision: tags/0.10.0
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: master
+      component: "0.10"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.9
+    revision: tags/0.9.2
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/demodex.yaml b/hiera/demodex.yaml
index 91602ec..a93268b 100644
--- a/hiera/demodex.yaml
+++ b/hiera/demodex.yaml
@@ -47,19 +47,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.10
+    revision: tags/0.10.0
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: master
+      component: "0.10"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.9
+    revision: tags/0.9.2
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/diplocaulus.yaml b/hiera/diplocaulus.yaml
index e9eb7f3..d72c40b 100644
--- a/hiera/diplocaulus.yaml
+++ b/hiera/diplocaulus.yaml
@@ -55,19 +55,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.10
+    revision: tags/0.10.0
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: master
+      component: "0.10"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.9
+    revision: tags/0.9.2
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index 1e8f5e1..b2e1b27 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -447,7 +447,7 @@ nagios:
       openvpn_gateway_address: "46.165.242.169"
       services: 
         - openvpn
-        - tor
+        - tor_relay
       ssh_port: 4422
     tuatara: 
       domain_full_suffix: unstable.bitmask.net
@@ -486,13 +486,13 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.10
+    revision: tags/0.10.0
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: master
+      component: "0.10"
   soledad: 
     package: soledad-server
     revision: latest
diff --git a/hiera/giraffe.yaml b/hiera/giraffe.yaml
index dcd270c..0233fc5 100644
--- a/hiera/giraffe.yaml
+++ b/hiera/giraffe.yaml
@@ -101,19 +101,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.10
+    revision: tags/0.10.0
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: master
+      component: "0.10"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.9
+    revision: tags/0.9.2
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -222,92 +222,92 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
-      s02ix2KlFpLdIhrBNHsMbXPZ7mCgHQg27+Y=
+      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
+      JNx31/P4HWgWUjSlpZSyifXSdQijHY1mOA==
       -----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
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index 61b3b88..dc5f9ba 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -212,19 +212,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.10
+    revision: tags/0.10.0
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: master
+      component: "0.10"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.9
+    revision: tags/0.9.2
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/lynx.yaml b/hiera/lynx.yaml
index b38a783..fb35dff 100644
--- a/hiera/lynx.yaml
+++ b/hiera/lynx.yaml
@@ -219,19 +219,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.10
+    revision: tags/0.10.0
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: master
+      component: "0.10"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.9
+    revision: tags/0.9.2
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml
index ad1afc5..33a9714 100644
--- a/hiera/millipede.yaml
+++ b/hiera/millipede.yaml
@@ -79,19 +79,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.10
+    revision: tags/0.10.0
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: master
+      component: "0.10"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.9
+    revision: tags/0.9.2
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/orangutan.yaml b/hiera/orangutan.yaml
index e736bfc..c1a8757 100644
--- a/hiera/orangutan.yaml
+++ b/hiera/orangutan.yaml
@@ -256,19 +256,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.10
+    revision: tags/0.10.0
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: master
+      component: "0.10"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.9
+    revision: tags/0.9.2
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/otter.yaml b/hiera/otter.yaml
index 910f011..aedf524 100644
--- a/hiera/otter.yaml
+++ b/hiera/otter.yaml
@@ -69,7 +69,7 @@ platform:
 service_type: user_service
 services: 
   - openvpn
-  - tor
+  - tor_relay
 sources: 
   apt: 
     backports: "http://deb.debian.org/debian/"
@@ -80,19 +80,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.10
+    revision: tags/0.10.0
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: master
+      component: "0.10"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.9
+    revision: tags/0.9.2
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -158,18 +158,12 @@ tags:
   - demovpn
   - frankfurt
 tor: 
-  bandwidth_rate: 100
+  bandwidth_rate: 6550
   contacts: 
     - sysdev@leap.se
-  family: otterdVuPt9yFz8SpKm
-  hidden_service: 
-    active: ~
-    address: ~
-    key_type: RSA
-    private_key: ~
-    public_key: ~
-    single_hop: false
+  family: ""
   nickname: otterdVuPt9yFz8SpKm
+  type: relay
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----
diff --git a/hiera/tuatara.yaml b/hiera/tuatara.yaml
index be3a1f8..557dfc5 100644
--- a/hiera/tuatara.yaml
+++ b/hiera/tuatara.yaml
@@ -80,19 +80,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.10
+    revision: tags/0.10.0
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: master
+      component: "0.10"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.9
+    revision: tags/0.9.2
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: