remove elk and urchin

1 files changed, 63 insertions, 47 deletions

diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml
index 8c05b53..7725d24 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -121,12 +121,6 @@ definition_files:
             "ip_address": "176.53.69.22",
             "location": "istanbul",
             "port": 2323
-          },
-          "urchin": {
-            "hostname": "urchin.dev.bitmask.net",
-            "ip_address": "176.53.69.21",
-            "location": "istanbul",
-            "port": 2323
           }
         },
         "locations": {
@@ -167,43 +161,19 @@ haproxy:
         port: 4000
         weight: 100
         writable: true
-      elk: 
-        backup: true
-        host: localhost
-        port: 4001
-        weight: 10
-        writable: true
-      urchin: 
-        backup: false
-        host: localhost
-        port: 4002
-        weight: 100
-        writable: true
 hosts: 
   clam: 
     domain_full: clam.dev.bitmask.net
     domain_internal: clam.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqXPBidNRThgSRlEeKFuLxnGf/kmkaHoBimkZRrN7kxhGAwYSrf5mtUGqVFWGcWMPYhqU1uGkZnCgQWV9d60OmWNIZNqsq5Rs343PGKW9S3LrnAa0yFZKLRtESCh53taxF+uJ/vcV76oai+I7b2EZOVtUP6F+iSb3/D+piAcL+p284KkKywsj9FREoh+dpMHthSb7bQDSKqq9UZJVEDQev1tjT7FHnbIY0QJLcYBtYbj945G63UYPQbHVxkl2GCaTXLKaC5CfLRH6cHvwLS3HtyCFEgo9fw0BqztN+Q50+YiQYlKmY6DEnMxwyB7/CjzBcDPa+e0qXygV2mjaHsuN9"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqsU3rov6ems9MEt/dt/bU3t8lwTUoFHwcADLyXgi+SfYr7KduMY+0NweHGR2Q5A3X3y4zJmulYxliFBdq8zYOp+etwNMwuqdy0qCjcbUn7VkvGI/AY4kcqJhcQRhvRfrB0auUyEKspTCjQ27M6HQgKyAlc3GSR6iu/fMmA+lw9p1QjNsCh9HHoaRe+qlg7tmAd5xkTlvk1xZpEz0MNKeNoGbblq+vTWKYfN3GBiwhQNfJhkIaqvzNgoSiqG7P4MY2gXkKfQSQXeVd2OT6kZN41KBBZPE7mRA9pFKIaEx3YGnwjxRrhzdrCz2F5uQzBZAtqs2gcIWeXE6/uvtr9JBz"
     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 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 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 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"
 location: 
   country_code: TR
@@ -222,11 +192,36 @@ nickserver:
   domain: nicknym.dev.bitmask.net
   port: 6425
 platform: 
-  major_version: "0.6"
-  version: "0.6"
+  major_version: "0.7"
+  version: "0.7"
 service_type: public_service
 services: 
   - webapp
+sources: 
+  apt: 
+    backports: "http://httpredir.debian.org/debian/"
+    basic: "http://httpredir.debian.org/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: 
@@ -250,6 +245,9 @@ ssh:
     kwadronaut: 
       key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw==
       type: ssh-rsa
+    meskio: 
+      key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w==
+      type: ssh-rsa
     micah: 
       key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw==
       type: ssh-rsa
@@ -271,16 +269,6 @@ stunnel:
         connect: clam.dev.bitmask.i
         connect_port: 15984
         original_port: 5984
-      elk_5984: 
-        accept_port: 4001
-        connect: elk.dev.bitmask.i
-        connect_port: 15984
-        original_port: 5984
-      urchin_5984: 
-        accept_port: 4002
-        connect: urchin.dev.bitmask.i
-        connect_port: 15984
-        original_port: 5984
   servers: {}
 tags: 
   - development
@@ -314,7 +302,11 @@ webapp:
     unlimited_prefix: UNLIMITED
   client_version: 
     max: ~
-    min: "0.5"
+    min: "0.7"
+  couchdb_admin_user: 
+    password: PkyRLKGfQAnmk64EXqHWBVsxJfksKXNH
+    salt: 51d3c78980b9cf319cadbc73896f7128
+    username: admin
   couchdb_webapp_user: 
     password: PvRAdP9JrjS8qRsNCpyQ_KVDBTgTNGkY
     salt: 86497f034c8ef09b097f5c757ab038b7
@@ -327,17 +319,41 @@ webapp:
   forbidden_usernames: 
     - admin
     - administrator
+    - administrators
+    - admins
     - arin-admin
     - certmaster
     - contact
+    - email
+    - help
+    - help-desk
+    - help-ticket
+    - help-tickets
+    - help_desk
+    - help_ticket
+    - help_tickets
+    - helpdesk
+    - helpticket
+    - helptickets
     - info
+    - mail
     - maildrop
+    - noreply
+    - owner
+    - owners
     - postmaster
+    - reply
+    - robot
     - ssladmin
+    - staff
+    - support
+    - tech-support
+    - tech_support
+    - techsupport
+    - ticket
+    - tickets
+    - vmail
     - www-data
-  git: 
-    revision: origin/version/0.6
-    source: "https://leap.se/git/leap_web"
   modules: 
     - billing
     - help