Merge branch 'master' of ssh://leap.se/bitmask

1 files changed, 28 insertions, 57 deletions

diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml
index ff1add9..5d05bb7 100644
--- a/hiera/chameleon.yaml
+++ b/hiera/chameleon.yaml
@@ -137,10 +137,10 @@ development:
   site_config: true
 dns: 
   aliases: 
-    - api.unstable.bitmask.net
     - chameleon.unstable.bitmask.net
-    - nicknym.unstable.bitmask.net
     - unstable.bitmask.net
+    - api.unstable.bitmask.net
+    - nicknym.unstable.bitmask.net
   public: true
 domain: 
   full: chameleon.unstable.bitmask.net
@@ -151,15 +151,12 @@ domain:
 enabled: true
 environment: unstable
 haproxy: 
-  couch: 
-    listen_port: 4096
-    servers: 
-      panda: 
-        backup: false
-        host: localhost
-        port: 4000
-        weight: 100
-        writable: true
+  servers: 
+    panda: 
+      backup: false
+      host: localhost
+      port: 4000
+      weight: 100
 hosts: 
   ant: 
     domain_full: ant.demo.bitmask.net
@@ -184,12 +181,12 @@ hosts:
   clam: 
     domain_full: clam.dev.bitmask.net
     domain_internal: clam.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDR+ZrQQ4ggDM5ZpNyoVmZJ3cQwzlfrTorWohEY0BAhLDuxpKR5U95Dam8xckh4tM2o0ZFkayVYLoW2s1hrD8Rt6AYVM6l7z5tSf/lIbWO++PAoIKSPJmSmg7kZs+P3Tafs0VjJh3Ypc2nmqvih+oRPSSdDUP7Dqumham5GGWVG/Y7UzukY7r1SeWdFW3fEvR+74/rCpWbSPgG5Fckp9FTy82JV7z+E+S+UHD1Dcgpimve4GGAbHVySNPI1khNHeTFuPJCgehwLOInCexXJO5gIcqyj4d3xABt84BGEHbzaSYDiUNZJep/dOddGt+xTZCzmmFtYcSjUZLR+wQCMFOeH"
+    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMYfDEXXpRdNtIaa1aGLVqG/3laVEoLi4ujKAFKtsgOJqw6qd6Sph29Jyqb5SmXNqzebuVKbWmKogXia1wKnjUc="
     ip_address: "176.53.69.22"
   deer: 
     domain_full: deer.dev.bitmask.net
     domain_internal: deer.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDz1/VqEz2qDtR1lgUqhnS8G8wYaDwbB1lPsBhloyCFHuSKmr2DGjmVSVYKtmTXnQZhAuOQuME4RHiVgNPUAKOBGDTyA5eCdjUeguZm4CnZU0ISBj1iKSa1l7RHZDZmirC62f8OJ6Ma9Ls62BZN8Vy4T7v55qn5Ky+D+/XrDqlES3zTHoNWkR3Xn1JDZ1Ov20qvB2wdYRL6LStcB915BE1e56IrnOEq7ybg5h84Jtpx8fyq1Geynjoz3q3YUAQuhziawM6seQk+v7QUTGMHD/xyaRD/VZqGn65k4suin4OHb1gFysxf2xdwzEnhheItXZontQue5DgjE8GE/OlRCvdx"
+    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBORp1ohUpy+qSPhgklCvujSTGeIsHdY9hBDJZimfeRZFq3ZuZvLltrvla8++BBTCskgEUdGtNivK9I0oCviyDeA="
     ip_address: "202.85.227.195"
   demodex: 
     domain_full: demodex.dev.bitmask.net
@@ -199,12 +196,12 @@ hosts:
   elephant: 
     domain_full: elephant.dev.bitmask.net
     domain_internal: elephant.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClpJntSyXlBMiHfmZ6xIo1NiNCgomVOWrkl3nH+9nzqimKWqikp2DlR6jWSMebTyyuy8rB/1lbj7/Z3AxNXjUoOpGpyKrE3viNYZie4Y4QDn3hFPMxHjoYcD/OerosFFZe8Byf0ExTQ4VPmzNKdcTJN/QFjWWZk5AElX2OLnpSYOOBUwiDQeAJkALMmInXYO/+IXeBsygYND8+KZb0qfLpvgPYa4t0p8WVuRS/c0o+dtATmc2HN6N1YxEnmuzx1h1UDO6k4PRNDbO8+U7zsGagEpMJmzGc+liJxwDCgLCieQAxriXWTpiqxJ55pDtLIJKONaNP2UsUai2b9xQ9NsNN"
+    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOktOAJ7qxG2pC+qGVJTMNLMZGdhyInsuCX7phvQSTJxo2HNTUcSR/CJuLwsV0yqBVTmbrUNBCJS/n+x6bVqUeg="
     ip_address: "176.53.69.13"
   elk: 
     domain_full: elk.dev.bitmask.net
     domain_internal: elk.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDu95UcykhjBiamMLHpGqB1UrPScpihrfOvlX0yO4zTa3PoJy+tx06UNfZ5JZD5llsezZ5HifUANSQ0XFPeYr3Vf4wrbD59oilUQtNXyB8avXatipRljURp6Yb5w1/pputbuZSe8aqn1HMDrSkTILbaCSdF0y5vWvssU2eDmpaZMtNEgPvA39PHHgxLXno7aktMJ8Vc3Wvqm6aUiBURZILGPchnVHgiMZUNiwm/nx7eRkIv1OTOJwPRBAOzqZuKf3c6jemtAMpihlwq4hBl99f+mWe/Fpzy0pq+BkfCPCnOE9iXk9ELd7hl0MoLHMdjCoQeWdVVEm5gJTjx0iZCDdyF"
+    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJxIofc6JyVvppMKv/hZnMZp/aYeEcy5kHAW1O1/ZkHnclc/cmxEQ2HtRNhMXziOrYZG/UB9NCEBkTFG2PG6XH8="
     ip_address: "176.53.69.127"
   frog: 
     domain_full: frog.bitmask.net
@@ -254,12 +251,12 @@ hosts:
   snail: 
     domain_full: snail.dev.bitmask.net
     domain_internal: snail.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8wxuY3ytE1h/XDKYUkcAwIoGjhWTOafRrziSbpIxwNmadSKPh/sv7kUweRexFdoh+H1uLVGmN/YEciZvq6L7HomH1eX00NamZBJyBE9018cNOfD4943Lqs+LIQDDNVis+4fVoOdyVco+Q1U/bnUQcbAa1eRZ4LzAm8pDDyzdtFGFJEeHt1xsqEqyHv5As6lNMwpgRGDUFUOZClyUc/2gvPWx6GReCuwyXNUYRt99eN+p+F3mjSk5n0dzRsi32Mo550pHHJxIlbnJifq15Q4DqVMBoYGHYWFHfDdjb5G9botPa3NF/7Db/yNQQ9EZPBOIDf135lgduK53OM5spDg9b"
+    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK+IgHh5d/DYKrfzc8yGSBiNxFOg8vnTTfuykuQK3wO9F7Obzxuux/qlvHV1yPV0I9id72bduDfyfngMU5jqugY="
     ip_address: "176.53.69.14"
   starfish: 
     domain_full: starfish.dev.bitmask.net
     domain_internal: starfish.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCYdKG2P28qWIzj497n8DaC50wPUUHDGg6qvSf64+qtfKGG6n1NNL4vrtO/mvOwLVCE7EqeQGzKD3V6/RyDECvKQK3bspMLE6E5MuH5cMKzlSKDZETtCMI/23UTRe8HXoQSZbwxtSFEA+p38M0yqqwysk5tna+Fo9ZatDgwRqOln1m9ny6ckxXMhpuc0s/7nbqLtHvhm22i70ghU5Hrjgz+/xI5IoL5e3vkDbAih1Jub+TdpmxnTKw53oWL2vzDxKstsmNm7GOeujPr5SDdVpxhzxfg/9JBtT59yiGm4C3sNC7LsceME2V77qSx9RIqVeWv/hvHjRqEFErIAMCl6UoB"
+    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBH7hjD8SIQshnCrMkin4MY6ff1QAJRusnMMsitiTc3+rpn5cCVW+ZB6+nwSKUyiXbD8l6wcL0CTxEZJGhYyfKc0="
     ip_address: "176.53.69.23"
   thrips: 
     domain_full: thrips.demo.bitmask.net
@@ -269,7 +266,7 @@ hosts:
   urchin: 
     domain_full: urchin.dev.bitmask.net
     domain_internal: urchin.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfU1/BwcAUPRHNffdxePpL15ME0shqsINsbyTbE3pcxwB+oUk0BO8Hk2rVU9WAvUXBRzKjjTNVbXz3lFv1cDsIIRmSewN5G2qR3KO2MAlEaOPZa9oy6vzoJ3i8r8SlESDFUZLkzWfTDtnvb7DlkYAZwaJ1LMhO7Ou3PDdxyWixmpE5cblCExoO55fmJMP9FmD6viqc2rfRKiNkb9W8uqiEBXEGG96QBnAwXGPD3THlfe7SWJeGGuvWsH9kUJIDAABb8GHdzquOYr2xvwyBnQNgWCbyI60umlNLFNlOuX3Q8s8bGcEcKtwb5mJIztBgITsyuzm7H+z/e+EGOU1G2I0r"
+    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKuJ+QA8GaXfxxERGFQSznpqJNmIk4gNFp3UvqYvL9PLeFUP4DwwsyCWg24x1R7RkFE3P75Jcck6Q8JW8d9iQWo="
     ip_address: "176.53.69.21"
   wallaby: 
     domain_full: wallaby.demo.bitmask.net
@@ -286,11 +283,6 @@ mail:
   smarthost: 
     - octopus.unstable.bitmask.net
 nagios: 
-  domains_internal: 
-    - cdev.bitmask.i
-    - demo.bitmask.i
-    - dev.bitmask.i
-    - unstable.bitmask.i
   hosts: 
     ant: 
       domain_full_suffix: demo.bitmask.net
@@ -311,8 +303,8 @@ nagios:
       domain_internal: chameleon.unstable.bitmask.i
       ip_address: "199.119.112.10"
       services: 
-        - monitor
         - webapp
+        - monitor
       ssh_port: 4422
     chipmonk: 
       domain_full_suffix: cdev.bitmask.net
@@ -473,13 +465,10 @@ nickserver:
     username: nickserver
   domain: nicknym.unstable.bitmask.net
   port: 6425
-platform: 
-  major_version: "0.6"
-  version: "0.6"
 service_type: public_service
 services: 
-  - monitor
   - webapp
+  - monitor
 ssh: 
   authorized_keys: 
     azul: 
@@ -527,30 +516,26 @@ ssh:
     ports: "60000:61000"
   port: 4422
 stunnel: 
-  clients: 
-    couch_client: 
-      panda_5984: 
-        accept_port: 4000
-        connect: panda.unstable.bitmask.i
-        connect_port: 15984
-        original_port: 5984
-  servers: {}
+  couch_client: 
+    panda_5984: 
+      accept_port: 4000
+      connect: panda.unstable.bitmask.i
+      connect_port: 15984
 tags: 
+  - unstable
   - dc
   - sandbox-braintree
-  - unstable
 webapp: 
   admins: 
-    - azul
     - elijah
+    - varac
+    - micah
     - kwadronaut
     - mcnair
     - meanderingcode
-    - micah
-    - varac
+    - azul
   allow_anonymous_certs: false
   allow_limited_certs: false
-  allow_registration: true
   allow_unlimited_certs: true
   api_version: 1
   billing: 
@@ -572,29 +557,16 @@ webapp:
     password: enfhmsmcLc3Az3GF6TFKwRk99Iqjm2ew
     salt: 478bf7e8ca879a9711b279055f00153e
     username: webapp
-  customization_dir: /srv/leap/files/webapp/
+  customization_dir: /etc/leap/files/webapp/
   default_service_level: 1
   domain: unstable.bitmask.net
-  engines: 
-    - support
-  forbidden_usernames: 
-    - admin
-    - administrator
-    - arin-admin
-    - certmaster
-    - contact
-    - info
-    - maildrop
-    - postmaster
-    - ssladmin
-    - www-data
   git: 
     revision: origin/version/0.6
     source: "https://leap.se/git/leap_web"
   modules: 
+    - user
     - billing
     - help
-    - user
   nagios_test_user: 
     password: SvVjM5NCe2RF6XwTtZ7dGxAZ7E7KeSNS
     username: nagios_test
@@ -908,4 +880,3 @@ x509:
       MXxW/683yhX/wP2WfhDpam3gZjAOmRUXjb4OmevRF2jlwLOJssykv7A=
       -----END RSA PRIVATE KEY-----
   use: true
-  use_commercial: true