new unstable environment

4 files changed, 87 insertions, 20 deletions

diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml
index bba13b0..498a063 100644
--- a/hiera/aardwolf.yaml
+++ b/hiera/aardwolf.yaml
@@ -4,6 +4,7 @@ contacts:
 couch: 
   mode: plain
   port: 5984
+  pwhash_alg: pbkdf2
   users: 
     admin: 
       password: LYaDX9L9QKe2Re6p8dFKhu_t2XCxTqNZ
@@ -57,7 +58,7 @@ hosts:
   cat: 
     domain_full: cat.unstable.bitmask.net
     domain_internal: cat.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDlZP1jixPvDC+tI5cQpV8GpK5+OciNyCJyzdxZ0tiP6xjz76WWhynALuGQyJJilNPZLVnVnX7tLvw1aeRkvopQdF7J1f6AM+JbmX3jNqCXDjellcSPWtiKKJ2szaObfZ0yi+zkzSlG+umZ1xhMLgRHAPJaVqeNQVXygQhtuzAzd+Qpm1EAf8M8x6PJIu/Ui3S4nnB/eaZW7JtnTMhBiNzhMBsITp1ZRe4rhlH3ZrKgAztlBQix7jfRo8kXvZi65fWt0T44mjGgO5gdcZnTrGSJoJIdCN9IzESH+szc9jNJKpti0s4g3EU/pm8gfDLnI2V9J4/dOnH9/BlKfnUxbdWV"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDj61YBIu6Aj50z56wQSsPOxhlrZ9+8nOuxdf6lcszevagNEaoQDxoAcvyz3jB03NXHTRM6cTRSw5FRQFAcJqaaY1+ZrKxA5Dtjp7aC8cZ3FQ5iEOsgKhMpZgf40LBaGkSgY9qgzPvYTu6Xat9LAXISlhLlhjAY4U/Jr6Eu0EUeq2z9BrAusrOMtlG4P5/jLCt1tsXhZ/jx6LtAgrX0a04SSy/Rhb+Csuyh+PXDXTQyy2SRD0xDYH1crIugnFpkOIyXj3wAqWQIGYqehCXvZNFFbhEHOoRR6MsWxcuVIMT8b80XzOfKwPCsEulWQNJScn3SebudcuhLygJoGVW3lVXD"
     ip_address: "199.119.112.206"
     port: 22
   donkey: 
@@ -67,7 +68,11 @@ hosts:
       - unstable.bitmask.net
     domain_full: donkey.unstable.bitmask.net
     domain_internal: donkey.unstable.bitmask.i
+<<<<<<< dd6dbf179b94d6949d210e9a61457deedf03b0e1
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDeGJUfpwMo9Iw6cSY4Z5SRuJ9/DjxEUU37qF35MfhLnSzaQO8I/SATo93X5wL+wP4M9XxJoOhiB3PQh27QfAKiDr6ZT5xAqYCThG/vLx9v7bP9ROayZxaSisMxI0hVOXAzFt5CXX0W0Bh9XlM8rhmdobnAIhqm2vt1g6seYRCPGLX7O6qgddveFQ7TzL6eFco55nlhHXhM+s3rXTY5FCOCB5zETW80zpKencwdt2H8+CDhYru/rRKbv1BDvvM28+noOrMS1MLjKeCLvHKNFymNdOSqdmBwyiNE6afpuVXDq+Q+CG/0qvbyDEJX31CnGtHYkz3LBqOBh+OOi6YfqTl"
+=======
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC95g1uv5y+UolV7tzgScG3Y8OxERwgPCWlVy2O+UAXO+GEiGZ9iPPJbMSu3VAzXG/7I8x3M9ZlyQGTtG9TiVKQAR/cTL7PWJir8GClhoHoqsbrj8xuQuDLvaRG5MKqaU7yLNR8bBdSRdn9ObCFr8S+tWbXCpLhLB4m3/vfuMxZAdVdrFw3cn9O5QdBp2icFiDAWAIjr9brXM5c5FBPg2lTpfEkQoUAIBIvA8W2+Tj3cvYrG5WIa0w4+LCN9c5NvYH3xYNSZESU7p1P50OnhOFT2zbKneGBcLc74ZsEhR3vwHPmpe/62yCqrGZTZF8Z6Hr3/kq5/Bd58yqjH1uUw0Jh"
+>>>>>>> new unstable environment
     ip_address: "199.119.112.207"
     port: 22
 ip_address: "199.119.112.205"
@@ -110,7 +115,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/experimental-0.8"
+      basic: "http://deb.leap.se/0.8"
   soledad: 
     package: soledad-server
     revision: latest
@@ -179,7 +184,11 @@ testing:
   api_hosts: 
     - donkey.unstable.bitmask.net
   api_uri: "https://api.unstable.bitmask.net:4430/1"
+<<<<<<< dd6dbf179b94d6949d210e9a61457deedf03b0e1
   monitor_auth_token: pAfrMH9kd7FfdKq5m2k9FxYhghhpZ5Qr
+=======
+  monitor_auth_token: AuAf4eu94UfDNLqnujJLrbLVnBxRHPeR
+>>>>>>> new unstable environment
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index b36f037..ac29b93 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -45,13 +45,13 @@ hosts:
   aardwolf: 
     domain_full: aardwolf.unstable.bitmask.net
     domain_internal: aardwolf.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC11esHnJtvHtzJwmqxKx4QLNGF/jw/EU8DxVOwkuho51sFh/Fn3FZXrkJ7pbLcVigIuoYbhmhAdtGGPrPKUpknhdPOjDN4YsySE68+VlqzRm+Zp7vyyFo8j+jTgvUEGxctEeEpuidqnx+Z77vyC0NDcOOZKVKel94iny27Oipo0x50dBAL+CrRqCYEad5h6iEi2Tlnd54m/yfPk6VNDZoLuN66mY1fh2xyxArYnOBA9/GnyzMb77rsOhc9XAtEd65ZHKdM/Sv6mz79qJ5ZXPrnNWqMvZjjrvdoLEZ5tz9i6gHEq9X0QelkjSUQYHIxk0iYeUCjxS29KmWns5thOWtv"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMU1HBNNU7daYV0sdbRBrRLhl8SfsbvP5zcAhZbi4bMbL2nC9SzvGXYqstWoG46j35e6h38Xjpi+8MfRK6kQP2fyhoBiQCZU1oyqvwg1PX2CmcABWYKlMfVIsdkl+VRgeMVuwdEl7yk/fHUg+ulyUIvcV/qH+X+ME6MWtRNeT/sdDyaALbVXZ5mIKDDMy8xnarywDRKJhzdvP00ifS2xVfWrSyo+tzUx+HzKkc5eosYBjBWPBNjfgYdQMMz1nh0T6NE4ucwloYO0TZnVW30crEMLQnqzKHTweJ4GkUGcxPVk8OYqvQ2CC68FhSs8dSJwk8jhddneOkrzGFq0OmOu9/"
     ip_address: "199.119.112.205"
     port: 22
   cat: 
     domain_full: cat.unstable.bitmask.net
     domain_internal: cat.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDlZP1jixPvDC+tI5cQpV8GpK5+OciNyCJyzdxZ0tiP6xjz76WWhynALuGQyJJilNPZLVnVnX7tLvw1aeRkvopQdF7J1f6AM+JbmX3jNqCXDjellcSPWtiKKJ2szaObfZ0yi+zkzSlG+umZ1xhMLgRHAPJaVqeNQVXygQhtuzAzd+Qpm1EAf8M8x6PJIu/Ui3S4nnB/eaZW7JtnTMhBiNzhMBsITp1ZRe4rhlH3ZrKgAztlBQix7jfRo8kXvZi65fWt0T44mjGgO5gdcZnTrGSJoJIdCN9IzESH+szc9jNJKpti0s4g3EU/pm8gfDLnI2V9J4/dOnH9/BlKfnUxbdWV"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDj61YBIu6Aj50z56wQSsPOxhlrZ9+8nOuxdf6lcszevagNEaoQDxoAcvyz3jB03NXHTRM6cTRSw5FRQFAcJqaaY1+ZrKxA5Dtjp7aC8cZ3FQ5iEOsgKhMpZgf40LBaGkSgY9qgzPvYTu6Xat9LAXISlhLlhjAY4U/Jr6Eu0EUeq2z9BrAusrOMtlG4P5/jLCt1tsXhZ/jx6LtAgrX0a04SSy/Rhb+Csuyh+PXDXTQyy2SRD0xDYH1crIugnFpkOIyXj3wAqWQIGYqehCXvZNFFbhEHOoRR6MsWxcuVIMT8b80XzOfKwPCsEulWQNJScn3SebudcuhLygJoGVW3lVXD"
     ip_address: "199.119.112.206"
     port: 22
   donkey: 
@@ -61,7 +61,7 @@ hosts:
       - unstable.bitmask.net
     domain_full: donkey.unstable.bitmask.net
     domain_internal: donkey.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDeGJUfpwMo9Iw6cSY4Z5SRuJ9/DjxEUU37qF35MfhLnSzaQO8I/SATo93X5wL+wP4M9XxJoOhiB3PQh27QfAKiDr6ZT5xAqYCThG/vLx9v7bP9ROayZxaSisMxI0hVOXAzFt5CXX0W0Bh9XlM8rhmdobnAIhqm2vt1g6seYRCPGLX7O6qgddveFQ7TzL6eFco55nlhHXhM+s3rXTY5FCOCB5zETW80zpKencwdt2H8+CDhYru/rRKbv1BDvvM28+noOrMS1MLjKeCLvHKNFymNdOSqdmBwyiNE6afpuVXDq+Q+CG/0qvbyDEJX31CnGtHYkz3LBqOBh+OOi6YfqTl"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC95g1uv5y+UolV7tzgScG3Y8OxERwgPCWlVy2O+UAXO+GEiGZ9iPPJbMSu3VAzXG/7I8x3M9ZlyQGTtG9TiVKQAR/cTL7PWJir8GClhoHoqsbrj8xuQuDLvaRG5MKqaU7yLNR8bBdSRdn9ObCFr8S+tWbXCpLhLB4m3/vfuMxZAdVdrFw3cn9O5QdBp2icFiDAWAIjr9brXM5c5FBPg2lTpfEkQoUAIBIvA8W2+Tj3cvYrG5WIa0w4+LCN9c5NvYH3xYNSZESU7p1P50OnhOFT2zbKneGBcLc74ZsEhR3vwHPmpe/62yCqrGZTZF8Z6Hr3/kq5/Bd58yqjH1uUw0Jh"
     ip_address: "199.119.112.207"
     port: 22
 ip_address: "199.119.112.206"
@@ -90,12 +90,14 @@ mynetworks:
   - "198.252.153.82"
   - "198.252.153.83"
   - "198.252.153.85"
+  - "199.119.112.12"
   - "199.119.112.150"
   - "199.119.112.205"
   - "199.119.112.206"
   - "199.119.112.207"
   - "199.119.112.208"
   - "199.119.112.223"
+  - "199.119.112.8"
   - "204.13.164.171"
   - "204.13.164.57"
   - "37.218.240.50"
@@ -125,7 +127,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/experimental-0.8"
+      basic: "http://deb.leap.se/0.8"
   soledad: 
     package: soledad-server
     revision: latest
@@ -197,7 +199,11 @@ testing:
   api_hosts: 
     - donkey.unstable.bitmask.net
   api_uri: "https://api.unstable.bitmask.net:4430/1"
+<<<<<<< dd6dbf179b94d6949d210e9a61457deedf03b0e1
   monitor_auth_token: pAfrMH9kd7FfdKq5m2k9FxYhghhpZ5Qr
+=======
+  monitor_auth_token: AuAf4eu94UfDNLqnujJLrbLVnBxRHPeR
+>>>>>>> new unstable environment
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index 82ff7fb..3929442 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -29,7 +29,7 @@ definition_files:
               "user_ips": false
             },
             "host": "tuatara.unstable.bitmask.net",
-            "ip_address": "199.119.112.148",
+            "ip_address": "199.119.112.141",
             "location": "washington_d_c_"
           }
         ],
@@ -188,7 +188,7 @@ hosts:
   aardwolf: 
     domain_full: aardwolf.unstable.bitmask.net
     domain_internal: aardwolf.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC11esHnJtvHtzJwmqxKx4QLNGF/jw/EU8DxVOwkuho51sFh/Fn3FZXrkJ7pbLcVigIuoYbhmhAdtGGPrPKUpknhdPOjDN4YsySE68+VlqzRm+Zp7vyyFo8j+jTgvUEGxctEeEpuidqnx+Z77vyC0NDcOOZKVKel94iny27Oipo0x50dBAL+CrRqCYEad5h6iEi2Tlnd54m/yfPk6VNDZoLuN66mY1fh2xyxArYnOBA9/GnyzMb77rsOhc9XAtEd65ZHKdM/Sv6mz79qJ5ZXPrnNWqMvZjjrvdoLEZ5tz9i6gHEq9X0QelkjSUQYHIxk0iYeUCjxS29KmWns5thOWtv"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMU1HBNNU7daYV0sdbRBrRLhl8SfsbvP5zcAhZbi4bMbL2nC9SzvGXYqstWoG46j35e6h38Xjpi+8MfRK6kQP2fyhoBiQCZU1oyqvwg1PX2CmcABWYKlMfVIsdkl+VRgeMVuwdEl7yk/fHUg+ulyUIvcV/qH+X+ME6MWtRNeT/sdDyaALbVXZ5mIKDDMy8xnarywDRKJhzdvP00ifS2xVfWrSyo+tzUx+HzKkc5eosYBjBWPBNjfgYdQMMz1nh0T6NE4ucwloYO0TZnVW30crEMLQnqzKHTweJ4GkUGcxPVk8OYqvQ2CC68FhSs8dSJwk8jhddneOkrzGFq0OmOu9/"
     ip_address: "199.119.112.205"
     port: 22
   alpaca: 
@@ -210,7 +210,7 @@ hosts:
   cat: 
     domain_full: cat.unstable.bitmask.net
     domain_internal: cat.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDlZP1jixPvDC+tI5cQpV8GpK5+OciNyCJyzdxZ0tiP6xjz76WWhynALuGQyJJilNPZLVnVnX7tLvw1aeRkvopQdF7J1f6AM+JbmX3jNqCXDjellcSPWtiKKJ2szaObfZ0yi+zkzSlG+umZ1xhMLgRHAPJaVqeNQVXygQhtuzAzd+Qpm1EAf8M8x6PJIu/Ui3S4nnB/eaZW7JtnTMhBiNzhMBsITp1ZRe4rhlH3ZrKgAztlBQix7jfRo8kXvZi65fWt0T44mjGgO5gdcZnTrGSJoJIdCN9IzESH+szc9jNJKpti0s4g3EU/pm8gfDLnI2V9J4/dOnH9/BlKfnUxbdWV"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDj61YBIu6Aj50z56wQSsPOxhlrZ9+8nOuxdf6lcszevagNEaoQDxoAcvyz3jB03NXHTRM6cTRSw5FRQFAcJqaaY1+ZrKxA5Dtjp7aC8cZ3FQ5iEOsgKhMpZgf40LBaGkSgY9qgzPvYTu6Xat9LAXISlhLlhjAY4U/Jr6Eu0EUeq2z9BrAusrOMtlG4P5/jLCt1tsXhZ/jx6LtAgrX0a04SSy/Rhb+Csuyh+PXDXTQyy2SRD0xDYH1crIugnFpkOIyXj3wAqWQIGYqehCXvZNFFbhEHOoRR6MsWxcuVIMT8b80XzOfKwPCsEulWQNJScn3SebudcuhLygJoGVW3lVXD"
     ip_address: "199.119.112.206"
     port: 22
   clam: 
@@ -238,7 +238,7 @@ hosts:
       - unstable.bitmask.net
     domain_full: donkey.unstable.bitmask.net
     domain_internal: donkey.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDeGJUfpwMo9Iw6cSY4Z5SRuJ9/DjxEUU37qF35MfhLnSzaQO8I/SATo93X5wL+wP4M9XxJoOhiB3PQh27QfAKiDr6ZT5xAqYCThG/vLx9v7bP9ROayZxaSisMxI0hVOXAzFt5CXX0W0Bh9XlM8rhmdobnAIhqm2vt1g6seYRCPGLX7O6qgddveFQ7TzL6eFco55nlhHXhM+s3rXTY5FCOCB5zETW80zpKencwdt2H8+CDhYru/rRKbv1BDvvM28+noOrMS1MLjKeCLvHKNFymNdOSqdmBwyiNE6afpuVXDq+Q+CG/0qvbyDEJX31CnGtHYkz3LBqOBh+OOi6YfqTl"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC95g1uv5y+UolV7tzgScG3Y8OxERwgPCWlVy2O+UAXO+GEiGZ9iPPJbMSu3VAzXG/7I8x3M9ZlyQGTtG9TiVKQAR/cTL7PWJir8GClhoHoqsbrj8xuQuDLvaRG5MKqaU7yLNR8bBdSRdn9ObCFr8S+tWbXCpLhLB4m3/vfuMxZAdVdrFw3cn9O5QdBp2icFiDAWAIjr9brXM5c5FBPg2lTpfEkQoUAIBIvA8W2+Tj3cvYrG5WIa0w4+LCN9c5NvYH3xYNSZESU7p1P50OnhOFT2zbKneGBcLc74ZsEhR3vwHPmpe/62yCqrGZTZF8Z6Hr3/kq5/Bd58yqjH1uUw0Jh"
     ip_address: "199.119.112.207"
     port: 22
   dotterel: 
@@ -275,6 +275,12 @@ hosts:
     host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBL4iit51nt0P5yulG9s5iNP94MVGOXZTbPeHbnIqXmiYv8u5Cq8l/R4S9T8s9oh8PdZvGfWrbxewz3CaHgIvtbc="
     ip_address: "85.17.92.143"
     port: 4422
+  ladybug: 
+    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: "199.119.112.8"
+    port: 22
   leech: 
     domain_full: leech.demo.bitmask.net
     domain_internal: leech.demo.bitmask.i
@@ -303,6 +309,22 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCab6r51XEW9LjZVDZs3q/aIpn+oKo468ovivZIQPMmYMs6NUJ2z7Oc9YROAM3lfxcHHShNBIpxg/pSKnQ743hHavV3y+mEPbo4W3hbByuR6GJRaKxHP42NMfNxJUHpaix8jCrMkNypFGMss9C403quy62yGfN7hWIH/pWFR9z+GvWaLpl0J1T+sadeqYGrjiWPwmo88ZAo/RRsXEORyPMz/X7+pa+DvYrg9FqOnNNK0EvHI5asxRQMojpbt6DRpOkkDPkFZp/gpGRQCAbnaKtalkfC/HhbHepGiqQwMRphcpTmnJvOfIGy+YnUoV3RwoRzb5HAT6FkJ9c4gsTs+6Rp"
     ip_address: "46.165.242.166"
     port: 4422
+  ovenbird: 
+    aliases: 
+      - api.cdev.bitmask.net
+      - cdev.bitmask.net
+      - nicknym.cdev.bitmask.net
+    domain_full: ovenbird.cdev.bitmask.net
+    domain_internal: ovenbird.cdev.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtsIDPQkrOkbKZIhQEckY2uQKDXXN8/rQElMCwEbNuf25rz8ec5hSaMTOidjj0aAUSe33owu7fc5xvjbm2UY8zgpp3KMUlxwB27RPuegXrheA7HfZooXGwmlrBPgzUxHEDd3bp0KyNOOzabELQAxLEeACJSnKEKrwRXg4I4yDJpxZIHC79629804ScfaAI6aamqDnl5nMrr3eozjaWfrXGd/qyOYg+q7iw9HTK9rFR0tVuy4TFc/4doCqgJ4Dqx9jY1uewjA0xMAKb+8VqvmgC9GUHXye2Q4AXGFfrzjxsGpN8KkjwhiOCG/x2nxbhXJuq92w5t9+AyJzWSP6H1UOz"
+    ip_address: "199.119.112.151"
+    port: 22
+  seahorse: 
+    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: "199.119.112.12"
+    port: 4422
   snail: 
     domain_full: snail.dev.bitmask.net
     domain_internal: snail.dev.bitmask.i
@@ -312,7 +334,7 @@ hosts:
   tuatara: 
     domain_full: tuatara.unstable.bitmask.net
     domain_internal: tuatara.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUCLDyb/Gko3yY2CQNVa+25hQhlSufBLA5F4akkrSZ6/gCrZg/jCa+htftkCNd8INZOs2aETY1F3Fr2eMNlIk8dE5cNiSeQJsoxKa+Lbt0T5QPpc2D8vkd5wX0aF5hVFT5EohObNvtNIgdxIoriod8dDqF/F/w/8T1rX6VeEPIMmsh3vakYqA3ynd0GjRXADQjNj7uzpv/+pZfSr4GbWwQaTb/W+Na1JGaq2nrwGFATsogDhNzqJEhKfOP2Yb8dkMSV/mq9YCMoSXv1UaGDKF7+bmq3MKjXJ4qNWj5foowkvz/YP6HMqqY9zKaesyBh3rTgljxXI6b0Viumygbt3kp"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDT/9Z0BIVLpriNPdkk9cEsh0/tave+Jx80dcrt1/04tzFgitUl77AWnvcMIBfZKZTZpxZrakw/K165opvZEhuz/H7ztdc069HAVRn5wqpBvRVMovuhDtYaaFrFu5zo7Mg9MgJwc1Y0SUsBjItKuvgid5hRpy61N+0KDiXDl9T/QZj340kD/pMEHjqVmVoKkRn8/KK6S9cTaAAeTvbYfz/lPQHsyJ/M8emhySk/OCQIdAJ9SqMkX2MMd081tqFAa/H0D22vdgh9DhnrRlmmaZ5Z4P6P1U7ieLTWdLG5n7bTrPgWQAC5uElhzsa3uhlHyKgmHUWDr47hWCA1X0TCKZk/"
     ip_address: "199.119.112.208"
     port: 22
   wallaby: 
@@ -445,7 +467,6 @@ nagios:
       ip_address: "199.119.112.207"
       services: 
         - monitor
-        - pixelated
         - webapp
       ssh_port: 22
     dotterel: 
@@ -495,6 +516,15 @@ nagios:
       services: 
         - openvpn
       ssh_port: 4422
+    ladybug: 
+      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
+      ssh_port: 22
     leech: 
       domain_full_suffix: demo.bitmask.net
       domain_internal: leech.demo.bitmask.i
@@ -535,6 +565,25 @@ nagios:
         - openvpn
         - tor
       ssh_port: 4422
+    ovenbird: 
+      domain_full_suffix: cdev.bitmask.net
+      domain_internal: ovenbird.cdev.bitmask.i
+      domain_internal_suffix: cdev.bitmask.i
+      environment: clientdev
+      ip_address: "199.119.112.151"
+      services: 
+        - webapp
+      ssh_port: 22
+    seahorse: 
+      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: 
+        - openvpn
+      ssh_port: 4422
     snail: 
       domain_full_suffix: dev.bitmask.net
       domain_internal: snail.dev.bitmask.i
@@ -552,7 +601,7 @@ nagios:
       domain_internal_suffix: unstable.bitmask.i
       environment: unstable
       ip_address: "199.119.112.208"
-      openvpn_gateway_address: "199.119.112.148"
+      openvpn_gateway_address: "199.119.112.141"
       services: 
         - openvpn
       ssh_port: 22
@@ -580,7 +629,6 @@ platform:
 service_type: public_service
 services: 
   - monitor
-  - pixelated
   - webapp
 sources: 
   apt: 
@@ -597,13 +645,13 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/experimental-0.8"
+      basic: "http://deb.leap.se/0.8"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/develop
+    revision: origin/version/0.8
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -695,7 +743,11 @@ webapp:
       - "199.119.112.206"
       - "199.119.112.207"
       - "199.119.112.208"
+<<<<<<< dd6dbf179b94d6949d210e9a61457deedf03b0e1
     monitor: pAfrMH9kd7FfdKq5m2k9FxYhghhpZ5Qr
+=======
+    monitor: AuAf4eu94UfDNLqnujJLrbLVnBxRHPeR
+>>>>>>> new unstable environment
   api_version: 1
   billing: 
     braintree: 
diff --git a/hiera/tuatara.yaml b/hiera/tuatara.yaml
index 3b46bed..5d1b548 100644
--- a/hiera/tuatara.yaml
+++ b/hiera/tuatara.yaml
@@ -24,7 +24,7 @@ firewall:
     port: 
       - 21724
       - "443"
-    to: "199.119.112.148"
+    to: "199.119.112.141"
 hosts: {}
 ip_address: "199.119.112.208"
 location: 
@@ -37,7 +37,7 @@ mail:
     - cat.unstable.bitmask.net
 name: tuatara
 obfsproxy: 
-  gateway_address: "199.119.112.148"
+  gateway_address: "199.119.112.141"
   scramblesuit: 
     password: JJAUC422KNVGMMRXIZIGM3LOK44XMQ2Z
     port: 21724
@@ -53,7 +53,7 @@ openvpn:
     tls-cipher: DHE-RSA-AES128-SHA
     tun-ipv6: true
   filter_dns: false
-  gateway_address: "199.119.112.148"
+  gateway_address: "199.119.112.141"
   limited_prefix: LIMITED
   ports: 
     - "443"
@@ -85,7 +85,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/experimental-0.8"
+      basic: "http://deb.leap.se/0.8"
   soledad: 
     package: soledad-server
     revision: latest