use leap_platform:develop for unstable.bm, updated hiera files

5 files changed, 21 insertions, 60 deletions

diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml
index b3bbdda..94b642d 100644
--- a/hiera/aardwolf.yaml
+++ b/hiera/aardwolf.yaml
@@ -78,7 +78,7 @@ mail:
 name: aardwolf
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: public_service
 services: 
   - couchdb
@@ -112,7 +112,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index 3ba5ea1..2dd4255 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -55,7 +55,6 @@ mynetworks:
   - "176.53.69.14"
   - "176.53.69.22"
   - "176.53.69.23"
-  - "192.168.5.10"
   - "192.168.5.12"
   - "192.168.5.19"
   - "192.168.5.4"
@@ -64,7 +63,6 @@ mynetworks:
   - "198.252.153.82"
   - "198.252.153.83"
   - "198.252.153.85"
-  - "199.119.112.10"
   - "199.119.112.12"
   - "199.119.112.123"
   - "199.119.112.124"
@@ -85,7 +83,7 @@ mynetworks:
 name: cat
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: user_service
 services: 
   - mx
@@ -111,7 +109,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index 0dcc4a1..24dfcbc 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -25,27 +25,6 @@ definition_files:
               ],
               "user_ips": false
             },
-            "host": "seahorse.unstable.bitmask.net",
-            "ip_address": "199.119.112.13",
-            "location": "washington_d_c_"
-          },
-          {
-            "capabilities": {
-              "adblock": false,
-              "filter_dns": false,
-              "limited": false,
-              "ports": [
-                "443"
-              ],
-              "protocols": [
-                "tcp",
-                "udp"
-              ],
-              "transport": [
-                "openvpn"
-              ],
-              "user_ips": false
-            },
             "host": "tuatara.unstable.bitmask.net",
             "ip_address": "199.119.112.148",
             "location": "washington_d_c_"
@@ -212,12 +191,6 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCiGuqt+UfwqRvJdL6vioX8+oyRnZZKZ8uPKbMRmT7uR7z15Ox4QpNpW2aOTJ8Dwy4jPo5icEkYeGxXNdJMuooIxc1SgcaTpyh/epVGNV/K409t9KAi057eEMgp75dKi7f8kq+jvXeK1+ZdT6DvxvHQVMkKi0KeT8rw2F2Vdqh2upGiHtjLDXtF2ySLjwJ3gxqVjvsfDUxIYdBabK3eLuRINXwGKnJHmKO6MqQR4dOlOPG+3EdgVunWmVSA+1Uo8EZU6kbJ9T5MbpEDAV9K0R1HgdB2UTu/agFOVOYKylROcNzu2nES9qCat6/THK8lCVKBDywjpoQZ9vqSH9oFwond"
     ip_address: "199.119.112.123"
     port: 22
-  chameleon: 
-    domain_full: chameleon.unstable.bitmask.net
-    domain_internal: chameleon.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCbam3MYRlMunsimA/FMoS3qH03GcSTS7PPphE5es7oucWidaBp8HUKhl9SXTXe/98wYWTTMZPdWvjJvloWHxTAH1nt/TQxcCRZLPjaInt7NUo3aV5u0ADNaBKvcI8mFZMECSOol8ss+2+HHaqN3AQXcrotClz0vDb0a/9wPBKO0/oYR9PaDBR2wqq5TpOQn7lLmvygMCxvMr9PGgn02RnVsMHQ7qBH+Dk2MDM9DqT4Nr/WW61kwQKv1G/cfAD0MFN2HHMBj6Tx4pHPgTm9GhlEGmkUzykNSrqkg5V69peqeDTkNTkWy6WIwzk0Td7ohhLypa4dMUB5miSPHObrKSDJ"
-    ip_address: "192.168.5.10"
-    port: 4422
   chipmonk: 
     domain_full: chipmonk.cdev.bitmask.net
     domain_internal: chipmonk.cdev.bitmask.i
@@ -285,8 +258,8 @@ hosts:
     ip_address: "85.17.92.143"
     port: 4422
   ladybug: 
-    domain_full: ladybug.dev.bitmask.net
-    domain_internal: ladybug.dev.bitmask.i
+    domain_full: ladybug.bitmask.net
+    domain_internal: ladybug.bitmask.i
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDB2QMVLYRTwLfZzafas9wTfh1OsHCuRFc1yfezZt/hPPYbNREkbDLW7xgvCBFAqZdRU/1EEyzTdLwUPWP7RtFRSVPrBn3Re9Y2DmVno4YR/7SklWo330tc3aNX5sVFfvgSLHqe4T/SOSmQvjPz/AxkRekIi7Rsjrew9C3SiCZ9S3PygxEQw3XnPoeh4Kju1fl7eXSzLwWVu1TtUJvRn6gbP9+qTY5/1e9MHEBD0zOXO7tAcRWwjkzMPdQ1GgMqvAqamtIXOmG2RWXApeaitix8qZQlC/eb1pJzlh2b5MNiizJPS1rCqnGSN3Jx6H5CqthKWu1JaUzxGhLacuu5AWSN"
     ip_address: "192.168.5.8"
     port: 22
@@ -309,8 +282,8 @@ hosts:
     ip_address: "46.165.242.166"
     port: 4422
   seahorse: 
-    domain_full: seahorse.unstable.bitmask.net
-    domain_internal: seahorse.unstable.bitmask.i
+    domain_full: seahorse.bitmask.net
+    domain_internal: seahorse.bitmask.i
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfIO4Zdb7Xl1xP3Nw6hCSRSU9t6D2l3HpP38V1VM+2sLHDUdGDlHYWgUlfril5wZ6DdvU1DO2xrSTPDR1LrLEk/OKuFthnNUmRfE+NQQbf/KjEfj+AFj36l9evbWwef/EwECOtydQYZTEabVvrt0yprHYnfd728UklkFjXg67962X9A8DtK2OcPovEbcpPA3vo88+SZukNXAFUQcZPbX5ux0WZ1RH0GQVLVFo0dL4dQdEHZIXVYNvI9X7FzcN4WNjYyZfibiCmo3zdv15Hybh1NMQtBC6H5ZtiykzqL7cbUmmKeYzgIycFnewUxr6P4WyWx7/kPqfR/0Dw5aQqufw1"
     ip_address: "192.168.5.12"
     port: 4422
@@ -433,16 +406,6 @@ nagios:
       services: 
         - mx
       ssh_port: 22
-    chameleon: 
-      domain_full_suffix: unstable.bitmask.net
-      domain_internal: chameleon.unstable.bitmask.i
-      domain_internal_suffix: unstable.bitmask.i
-      environment: unstable
-      ip_address: "199.119.112.10"
-      services: 
-        - monitor
-        - webapp
-      ssh_port: 4422
     chipmonk: 
       domain_full_suffix: cdev.bitmask.net
       domain_internal: chipmonk.cdev.bitmask.i
@@ -547,10 +510,10 @@ nagios:
         - openvpn
       ssh_port: 4422
     ladybug: 
-      domain_full_suffix: dev.bitmask.net
-      domain_internal: ladybug.dev.bitmask.i
-      domain_internal_suffix: dev.bitmask.i
-      environment: development
+      domain_full_suffix: bitmask.net
+      domain_internal: ladybug.bitmask.i
+      domain_internal_suffix: bitmask.i
+      environment: disabled
       ip_address: "199.119.112.8"
       services: 
         - backup
@@ -586,10 +549,10 @@ nagios:
         - tor
       ssh_port: 4422
     seahorse: 
-      domain_full_suffix: unstable.bitmask.net
-      domain_internal: seahorse.unstable.bitmask.i
-      domain_internal_suffix: unstable.bitmask.i
-      environment: unstable
+      domain_full_suffix: bitmask.net
+      domain_internal: seahorse.bitmask.i
+      domain_internal_suffix: bitmask.i
+      environment: disabled
       ip_address: "199.119.112.12"
       openvpn_gateway_address: "199.119.112.13"
       services: 
@@ -654,7 +617,7 @@ nickserver:
   port: 6425
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: public_service
 services: 
   - monitor
@@ -681,7 +644,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/tuatara.yaml b/hiera/tuatara.yaml
index aff9bc4..eaf30fb 100644
--- a/hiera/tuatara.yaml
+++ b/hiera/tuatara.yaml
@@ -54,7 +54,7 @@ openvpn:
   user_ips: false
 platform: 
   major_version: "0.7"
-  version: "0.7"
+  version: "0.7.1"
 service_type: user_service
 services: 
   - openvpn
@@ -80,7 +80,7 @@ sources:
     source: "https://leap.se/git/tapicero"
     type: git
   webapp: 
-    revision: origin/version/0.7
+    revision: origin/version/0.7.1
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/provider.unstable.json b/provider.unstable.json
index ae9d527..ac6ac8e 100644
--- a/provider.unstable.json
+++ b/provider.unstable.json
@@ -3,6 +3,6 @@
         "allow_anonymous": false
     },
     "platform": {
-        "branch": "0.7.0"
+        "branch": "develop"
     }
 }