update elk to use port 4422 for ssh, like the others; re-deploy the dev machines, so their ssh keys changed

1 files changed, 14 insertions, 40 deletions

diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml
index bb1dc0f..8c05b53 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -168,10 +168,10 @@ haproxy:
         weight: 100
         writable: true
       elk: 
-        backup: false
+        backup: true
         host: localhost
         port: 4001
-        weight: 100
+        weight: 10
         writable: true
       urchin: 
         backup: false
@@ -183,25 +183,25 @@ 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
   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
   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
   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
 ip_address: "176.53.69.13"
@@ -222,36 +222,11 @@ nickserver:
   domain: nicknym.dev.bitmask.net
   port: 6425
 platform: 
-  major_version: "0.7"
-  version: "0.7"
+  major_version: "0.6"
+  version: "0.6"
 service_type: public_service
 services: 
   - 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: 
@@ -339,11 +314,7 @@ webapp:
     unlimited_prefix: UNLIMITED
   client_version: 
     max: ~
-    min: "0.7"
-  couchdb_admin_user: 
-    password: PkyRLKGfQAnmk64EXqHWBVsxJfksKXNH
-    salt: 51d3c78980b9cf319cadbc73896f7128
-    username: admin
+    min: "0.5"
   couchdb_webapp_user: 
     password: PvRAdP9JrjS8qRsNCpyQ_KVDBTgTNGkY
     salt: 86497f034c8ef09b097f5c757ab038b7
@@ -364,6 +335,9 @@ webapp:
     - postmaster
     - ssladmin
     - www-data
+  git: 
+    revision: origin/version/0.6
+    source: "https://leap.se/git/leap_web"
   modules: 
     - billing
     - help