1 files changed, 17 insertions, 44 deletions
diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml
index b9861b9..91e4015 100644
--- a/hiera/chameleon.yaml
+++ b/hiera/chameleon.yaml
@@ -200,7 +200,7 @@ hosts:
   clam: 
     domain_full: clam.dev.bitmask.net
     domain_internal: clam.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCajNm7/fQTZGrPHlAQvViRyJNw0VUYfY8O7BAQxEPsBkyShRoSLm/naDn62TNrj8+Qp0P9A3JJAFmHz3R26Qy2EibBVHzSPhPbNfC2tVCjT8nnvPQFdu2ZAnCG2VCdm/RmLrTXyAApkHXebD37GhTYOAaP2om3jV6KJpKnwYh4g7qPwC/o1h5O5F9HJKRV/aa32mwmxk7bttisDSru1AN/Ag2GibE7z6+HINKAhC4Ptyf0LReKShbPmrULHxfNXXlqNix280NeY/bqsWl03HAmttyRATXA+Repp92CLq24wJC5rBUw/1G8mGCz7HlmRiH72WeuA6mRZrrRoNODiAF"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqXPBidNRThgSRlEeKFuLxnGf/kmkaHoBimkZRrN7kxhGAwYSrf5mtUGqVFWGcWMPYhqU1uGkZnCgQWV9d60OmWNIZNqsq5Rs343PGKW9S3LrnAa0yFZKLRtESCh53taxF+uJ/vcV76oai+I7b2EZOVtUP6F+iSb3/D+piAcL+p284KkKywsj9FREoh+dpMHthSb7bQDSKqq9UZJVEDQev1tjT7FHnbIY0QJLcYBtYbj945G63UYPQbHVxkl2GCaTXLKaC5CfLRH6cHvwLS3HtyCFEgo9fw0BqztN+Q50+YiQYlKmY6DEnMxwyB7/CjzBcDPa+e0qXygV2mjaHsuN9"
     ip_address: "176.53.69.22"
     port: 4422
   deer: 
@@ -218,15 +218,15 @@ hosts:
   elephant: 
     domain_full: elephant.dev.bitmask.net
     domain_internal: elephant.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCYskvUxkCVcQlJksuQJKV4S8YA3kefBHQio4X1BU2d8OJxv/GrrFsjzcsitjjmo77Y7bscOzyt/L+cCSwgfzAmtK3uwv31SgV6eQRJlXpf/HrtK5VQQVj/qe1R/R2fn4ij++sDkNfofuHqo68U1LjSZoqvTG5lExiXnN0GJKF9SwZ7t0/72Nm8DU4i6YQ+89VPU0xZdR1USyz2c++MaseizNra1vr4pxF0GmYnY4xB/UNmRvPRvPrwNCp1I3twnFE9onVWV6HUaMB4hHXqksUE4uGHlkO+LxniceyQTzqhlN1brwF92jbP+0QtsFfFdrAbdLVxxEbTvNU9WonpU+AL"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7XlP9uTmyHhP8x3ZqKZZfAiUtrVueWm+5yYJ1hJYHv9+o3WLN3AAv8q+ISd5AHE8XyHgXUZHfYZ8kOtF4DqPAXshhXxvmoRu5bSl+H36q0wFDUkM5z97IM46/ryDaQD0JlgNkZPARlHqZbKOf8ge4uVRxgV18bw9+E8aoNkjnMnC6TZBjXmpwa1tnIrfRN0NEEBYUyN8Hz8zZ0FA6o3q6FvWq1UzCntU4lhzvFV83PzU7r1tnUr8qWiVw708oPTduK9Lvzx7jgpNJYDKlCUJscXfwL4CYtn9AzaCTS1LsbH0apr7ccGatFwZ+6SRZQ9wUCsd6vP2reM93MTyYVg7N"
     ip_address: "176.53.69.13"
     port: 4422
   elk: 
     domain_full: elk.dev.bitmask.net
     domain_internal: elk.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAQhe04n0cSyx0VXXZnYiYPA1+1jOVmNV9u+sf2T0zhOrWIuX0i9+anzwtKdGaIu659Sus59EoyHYioHXfd7KPT/k0HupHu8K68J6L3pS8Jsdbpf8Ud76FcxJRqB9VbjFJ3GAO+Me7xaIFFtvwyVq2RkGdGaIhwvyq5yodJfPk33GJOxGh9J2I2Gn1xSLROWnz+ve7hrrpoysoGRbrrIMIrvHXH6ncrxKsubr7j5Pc+zQz1JY63A0bNQQSv+mZY2cLR/7vTFWurmlz58hKUfyaC6c6cHska7cuuYdEw//iQxN7v156IudZODhBn71mzfQiXi7Bsa2pfZwKFqctfbsz"
-    ip_address: "1.209.122.22"
-    port: 22
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrcf0LAT87yXYy8D6M2cnn88Cq+sHn+yCc5bApC8eDAsnEhU85AM23uPPlhvrGUlC2sWq5027693OOiUeoWuIv62J0ezggw4m8NLp8Y1zWsx9jS7y3wUHjGmZcB/abWUOLLT9ouQoZeGRqix0jaSkO1VnjRwKzPPhLYhbsxuVVy2hvAWDoV0ufaJi1N+wpqPzDrUa5SrlEyGbhnPiA+AlVU6GyCxB/DV+PiURf+W52dDeiFkOGlPgwu4vzMj1nes6wrQKTguINBw+6tTIF3C6hIqtbIRu+EVV4JFQ/UjuaZ57ubw616R3BC8IJdwSycZ3TFbEDLRpG9AkKS/OBI8OV"
+    ip_address: "1.209.122.21"
+    port: 4422
   frog: 
     domain_full: frog.bitmask.net
     domain_internal: frog.bitmask.i
@@ -302,13 +302,13 @@ hosts:
   snail: 
     domain_full: snail.dev.bitmask.net
     domain_internal: snail.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLU8dg8lzmOOjQGfBvbUlDjyClqcxSDyCanP2Z4j8GU24a5sHTLydLIs2FM6xY/HmvZx1pBe7V/4gXVHG3Ym8P+kC/H6gybZIQpIZpjDzx5VsuZSeMk0PaEKCvMw3vbGcrKvtJWUw9aF9E5b/nDB3d/uy/EdW01wpEv8OQzqtNmoodVW9G8sxcdp+VzsowK1W7wMYcau7f1BzIxEnUnZaA0HWRiMYR0ggFfyO1P64X3KeVD4mv1xf243cqDSt2ODoZBcdp42Y/hn6ARCZUK8tpyFWvohLJOf5JNwX7I47czSd7SIFRLnncV1d5K6Egf9pFLaJPaTXC6chmv7Xvl6ut"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGhGw8BA+EBnkf0puixL34qlzciMCnVfot3OySQp5bRlrTYkHnsbjjHjj0UmccQMHLOdo06wK8vgWWuXOL6kH/FFZ3EumoIwrt5Nfwe2kIvPtJNlgqCEGCA9fkZSffQdbkdfgH68XCPDClgKeol5lp/epuDu3FBAU7ZglQCnbljSEUDmlGfn2rc06QikmnzvetDrLllV78KwIseclx/2zb97+JAiTcPIEYxWW7LKOoHwOYXVo4mJNMMOcuaEyomhO1j3TMWOcmvEwFdwyF34dhN4Hte6Tqz4StNd7T7xezu2qZ8dCQ59S4G80zZuAfHoZxqzbR5DSq/MF7lblGpgHt"
     ip_address: "176.53.69.14"
     port: 4422
   starfish: 
     domain_full: starfish.dev.bitmask.net
     domain_internal: starfish.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClQH3zJNBilfI6FeMR9xi3HPZPK0GD0frwJyfAtaCRaWdJAXwO/kjScrOeF+JWgaDL3Ej7nRz3lo2qeQKRhC2HawA+dDSZKbreOg5nghEFT4NY5h8brKLk0/d7+8fUofsyTRrS+gfAauqxiRcmcy8prMiAdLL8SWcb9ylExq9AvxovIJ1CPZ59PL5Hc/REFybnux1y2qdQ0IewZ4DKx16/0NLArIYxNNwRn3qp8Vy1I/2VPpwpeH8kgN+v4/9iL32TM5dLlZ4uKed/WTSKyWalN1HbAGgV5Sx9KXmPoo/0l/CqCAJzLqttACWZbutE+O6fQqYg7o7idhQ6VDE2YKe/"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkbUoYD7f7Sbl+ElkJmxopRXh21DhcrVfFqlUwSdSpnAtgTSFRC1JMrDkPdJ69htsYiwoB+Bed0FQyCB4NU0QJbgM73VXJ0SqrpJJKx/7Ry5E8aBukiaAe8k8O6ZbnPeoZx11PwrSlS9Wrh928tuH7/ism7XHytlFYayYywvY2djIy9TbLsuOV6EQmVAVONhRVet4iOiFqfFDplRjttFVMJROO8W51YDdcTEwR+gLwS7yKp3e/XZT1vrHzmKo7j9saEgC0KncJrGDqoZ0Q1U0Did+MmHRQTJ13TcjHDnCiU7nO9w6OgGo4nTzGOJCjJkJm8opCxT3X0jCcHIkmEIU/"
     ip_address: "176.53.69.23"
     port: 4422
   thrips: 
@@ -320,7 +320,7 @@ hosts:
   urchin: 
     domain_full: urchin.dev.bitmask.net
     domain_internal: urchin.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC5KHWPUGhpPTvgDCyUeg59eYHN6QEPUck37GlKeRod24M2ShqsYB9F2Awg8fUEJSDjufJFhpSnafTfNQ5Da++jsCqb+EfSkBd7PKxI2ny5N5RkNnSNTPhKAKehLWqGhNZ6ClpCHpvxkx0peRgOt5Y3etWEcA/cG9MdIALPcugegsCym+UzepyYH8omBBBIVqaMPzhkz8xRnsun1cNshi0M7IgSVcPOZx4Fc2LFqs8hdTXrrMRJPsa3MMaRmNzyVAM7pPomvF0Lp1ZOwQxEwkvF8pa90ioYP63RzwcV9eveKMQXNfIVjcMnOCL7M1IAToYj0jgw6SN7TZfdFqCIEOV7"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkcNk748DAajCK3W99eLrc15nRGFeeEH4YLbsVd4gwNLzKsmVdm2oOAXl6Qb9nW2FIwsl37LR5dB/AU7lWQVICQ4CSdy9pwoWh6rd4tbobyMaQLDtx/oUXJlYBy7KBInSMxIPs2MRe9SG3BfhWvuj1m+bBSfqRQVj3YeE1M3pTMNHrYjDcdXusGITAxqNYDtN3+d4npVClavO5MuxQ4yr/vS8ibfvO21PMp2Sa9JtTXNX2Y1fF3xq0XT5UZd8YhnN/WWIaAxtkp3WMFLTOkFYTo+T3/C0Gsx6v+xCjKyytviquOJeLVJQ5ofP2RC0cSYdJJA1gs8bgUce3Sdp1+iij"
     ip_address: "176.53.69.21"
     port: 4422
   wallaby: 
@@ -460,10 +460,10 @@ nagios:
       domain_internal: elk.dev.bitmask.i
       domain_internal_suffix: dev.bitmask.i
       environment: development
-      ip_address: "1.209.122.22"
+      ip_address: "1.209.122.21"
       services: 
         - couchdb
-      ssh_port: 22
+      ssh_port: 4422
     frog: 
       domain_full_suffix: bitmask.net
       domain_internal: frog.bitmask.i
@@ -637,37 +637,12 @@ nickserver:
   domain: nicknym.unstable.bitmask.net
   port: 6425
 platform: 
-  major_version: "0.7"
-  version: "0.7"
+  major_version: "0.6"
+  version: "0.6"
 service_type: public_service
 services: 
   - monitor
   - webapp
-sources: 
-  apt: 
-    backports: "http://http.debian.net/debian/"
-    basic: "http://http.debian.net/debian/"
-    security: "http://security.debian.org/"
-  leap-mx: 
-    package: leap-mx
-    revision: latest
-    type: apt
-  nickserver: 
-    revision: origin/master
-    source: "https://leap.se/git/nickserver"
-    type: git
-  soledad: 
-    package: soledad-server
-    revision: latest
-    type: apt
-  tapicero: 
-    revision: origin/version/0.7
-    source: "https://leap.se/git/tapicero"
-    type: git
-  webapp: 
-    revision: origin/version/0.7
-    source: "https://leap.se/git/leap_web"
-    type: git
 ssh: 
   authorized_keys: 
     azul: 
@@ -755,16 +730,12 @@ webapp:
   client_certificates: 
     bit_size: 2048
     digest: SHA256
-    life_span: "2 months"
+    life_span: 2m
     limited_prefix: LIMITED
     unlimited_prefix: UNLIMITED
   client_version: 
     max: ~
-    min: "0.7"
-  couchdb_admin_user: 
-    password: LYaDX9L9QKe2Re6p8dFKhu_t2XCxTqNZ
-    salt: b9d35fd378ba1598e843d5a784cfdf7e
-    username: admin
+    min: "0.5"
   couchdb_webapp_user: 
     password: enfhmsmcLc3Az3GF6TFKwRk99Iqjm2ew
     salt: 478bf7e8ca879a9711b279055f00153e
@@ -784,8 +755,10 @@ webapp:
     - maildrop
     - postmaster
     - ssladmin
-    - vmail
     - www-data
+  git: 
+    revision: origin/version/0.6
+    source: "https://leap.se/git/leap_web"
   modules: 
     - billing
     - help