5 files changed, 27 insertions, 50 deletions
diff --git a/hiera/ant.yaml b/hiera/ant.yaml
index 5e79950..9a20edf 100644
--- a/hiera/ant.yaml
+++ b/hiera/ant.yaml
@@ -35,20 +35,16 @@ couch:
 development: 
   site_config: true
 dns: 
-  public: true
+  public: false
 domain: 
   full: ant.demo.bitmask.net
   full_suffix: demo.bitmask.net
   internal: ant.demo.bitmask.i
   internal_suffix: demo.bitmask.i
-  name: ant.demo.bitmask.net
+  name: ant.demo.bitmask.i
 enabled: true
 environment: demo
 firewall: 
-  soledad: 
-    from: "*"
-    port: 2323
-    to: "198.252.153.82"
   ssh: 
     from: sysadmin
     port: 4422
@@ -75,20 +71,11 @@ mail:
   smarthost: []
 name: ant
 platform: 
-  major_version: "0.9"
-  version: "0.9"
-service_type: public_service
+  major_version: "0.10"
+  version: "0.10"
+service_type: internal_service
 services: 
   - couchdb
-  - soledad
-soledad: 
-  couchdb_leap_mx_user: 
-    username: leap_mx
-  couchdb_soledad_user: 
-    password: cGqWZqTdFc_fuSZvfPtUTL_7uMA6d5YC
-    salt: 514355e86f1d3fa4de42b677de21281d
-    username: soledad
-  port: 2323
 sources: 
   apt: 
     backports: "http://deb.debian.org/debian/"
@@ -99,18 +86,18 @@ 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/experimental-platform"
   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: 
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index 64a8e71..5c0f4f2 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -134,20 +134,10 @@ definition_files:
   soledad_service: |-
       {
         "hosts": {
-          "ant": {
-            "hostname": "ant.demo.bitmask.net",
-            "ip_address": "198.252.153.82",
-            "location": "seattle__wa",
-            "port": 2323
-          }
+      
         },
         "locations": {
-          "seattle__wa": {
-            "country_code": "US",
-            "hemisphere": "N",
-            "name": "Seattle, WA",
-            "timezone": "-7"
-          }
+      
         },
         "serial": 1,
         "version": 1
@@ -217,8 +207,8 @@ nickserver:
   domain: nicknym.demo.bitmask.net
   port: 6425
 platform: 
-  major_version: "0.9"
-  version: "0.9"
+  major_version: "0.10"
+  version: "0.10"
 service_type: public_service
 services: 
   - webapp
@@ -232,18 +222,18 @@ 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/experimental-platform"
   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: 
@@ -339,7 +329,7 @@ webapp:
     unlimited_prefix: UNLIMITED
   client_version: 
     max: ~
-    min: "0.7"
+    min: "0.9.4"
   couchdb_admin_user: 
     password: hfY4x7epQ7BrULbZJRgu5KKk4gR_J2AW
     salt: e1dca99375c513be477295f141b9f032
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml
index d2af465..5b548bd 100644
--- a/hiera/millipede.yaml
+++ b/hiera/millipede.yaml
@@ -64,8 +64,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
@@ -79,18 +79,18 @@ 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/experimental-platform"
   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: 
diff --git a/hiera/otter.yaml b/hiera/otter.yaml
index 6340e7c..0b7c3c5 100644
--- a/hiera/otter.yaml
+++ b/hiera/otter.yaml
@@ -64,8 +64,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 +80,18 @@ 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/experimental-platform"
   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: 
diff --git a/nodes/ant.json b/nodes/ant.json
index 3569ac8..8020d3d 100644
--- a/nodes/ant.json
+++ b/nodes/ant.json
@@ -1,6 +1,6 @@
 {
   "ip_address": "198.252.153.82",
-  "services": [ "couchdb", "soledad" ],
+  "services": [ "couchdb" ],
   "tags": [
     "demo",
     "seattle"