From 98b366b774f4c64879d04cb749f2d95b20da1f21 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 3 Jun 2015 09:28:59 -0400
Subject: remove elk and urchin

---
 hiera/canvasback.yaml | 70 +++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 63 insertions(+), 7 deletions(-)

(limited to 'hiera/canvasback.yaml')

diff --git a/hiera/canvasback.yaml b/hiera/canvasback.yaml
index aa311b6..c118d32 100644
--- a/hiera/canvasback.yaml
+++ b/hiera/canvasback.yaml
@@ -153,11 +153,36 @@ nickserver:
   domain: nicknym.cdev.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: 
@@ -181,6 +206,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
@@ -223,12 +251,16 @@ webapp:
   client_certificates: 
     bit_size: 2048
     digest: SHA256
-    life_span: 2m
+    life_span: "2 months"
     limited_prefix: LIMITED
     unlimited_prefix: UNLIMITED
   client_version: 
     max: ~
-    min: "0.5"
+    min: "0.7"
+  couchdb_admin_user: 
+    password: abVQmkZubeAvncgcVSYRD4_pHANEItWb
+    salt: a5a58ff4365be3113f19014ea3050129
+    username: admin
   couchdb_webapp_user: 
     password: _CatyL3Ienc4wRrfPubrhyfYCFmCyt9t
     salt: 1c1dd6eb78f027414f1638bd6c902a5a
@@ -241,17 +273,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
-- 
cgit v1.2.3