diff options
Diffstat (limited to 'hiera')
-rw-r--r-- | hiera/ant.yaml | 55 | ||||
-rw-r--r-- | hiera/canvasback.yaml | 256 | ||||
-rw-r--r-- | hiera/chameleon.yaml | 5 | ||||
-rw-r--r-- | hiera/chipmonk.yaml | 186 | ||||
-rw-r--r-- | hiera/clam.yaml | 3 | ||||
-rw-r--r-- | hiera/couch1.yaml | 55 | ||||
-rw-r--r-- | hiera/couch2.yaml | 55 | ||||
-rw-r--r-- | hiera/deer.yaml | 3 | ||||
-rw-r--r-- | hiera/demodex.yaml | 3 | ||||
-rw-r--r-- | hiera/elephant.yaml | 5 | ||||
-rw-r--r-- | hiera/elk.yaml | 3 | ||||
-rw-r--r-- | hiera/frog.yaml | 26 | ||||
-rw-r--r-- | hiera/gadwall.yaml | 37 | ||||
-rw-r--r-- | hiera/hippo.yaml | 21 | ||||
-rw-r--r-- | hiera/ladybug.yaml | 3 | ||||
-rw-r--r-- | hiera/leech.yaml | 104 | ||||
-rw-r--r-- | hiera/millipede.yaml | 17 | ||||
-rw-r--r-- | hiera/monitor1.yaml | 12 | ||||
-rw-r--r-- | hiera/mx1.yaml | 104 | ||||
-rw-r--r-- | hiera/octopus.yaml | 3 | ||||
-rw-r--r-- | hiera/panda.yaml | 3 | ||||
-rw-r--r-- | hiera/plain1.yaml | 12 | ||||
-rw-r--r-- | hiera/seahorse.yaml | 3 | ||||
-rw-r--r-- | hiera/single.yaml | 564 | ||||
-rw-r--r-- | hiera/snail.yaml | 3 | ||||
-rw-r--r-- | hiera/starfish.yaml | 3 | ||||
-rw-r--r-- | hiera/thrips.yaml | 55 | ||||
-rw-r--r-- | hiera/tor1.yaml | 14 | ||||
-rw-r--r-- | hiera/urchin.yaml | 3 | ||||
-rw-r--r-- | hiera/vpn1.yaml | 17 | ||||
-rw-r--r-- | hiera/wallaby.yaml | 172 | ||||
-rw-r--r-- | hiera/web1.yaml | 174 |
32 files changed, 1409 insertions, 570 deletions
diff --git a/hiera/ant.yaml b/hiera/ant.yaml index 59e9afd..dbfbebf 100644 --- a/hiera/ant.yaml +++ b/hiera/ant.yaml @@ -8,6 +8,8 @@ couch: epmd_port: 4369 neighbors: - thrips.demo.bitmask.net + master: false + mode: multimaster port: 5984 users: admin: @@ -22,6 +24,10 @@ couch: password: CyhRSafC4SUGQ9F762Qfv3TPQDqTjn2G salt: e3ee9259723d0cbd8b3265dbe8b4e21e username: nickserver + replication: + password: gPFMMKdZaTHF24nQGYQTDHkAduQcarBm + salt: 215a1f508e2b564978f98e43231e1506 + username: replication soledad: password: cGqWZqTdFc_fuSZvfPtUTL_7uMA6d5YC salt: 514355e86f1d3fa4de42b677de21281d @@ -74,6 +80,9 @@ mail: smarthost: - leech.demo.bitmask.net name: ant +platform: + major_version: "0.6" + version: "0.6" service_type: internal_service services: - couchdb @@ -114,25 +123,29 @@ ssh: ports: "60000:61000" port: 4422 stunnel: - couch_server: - accept: 15984 - connect: "127.0.0.1:5984" - ednp_clients: - thrips_9002: - accept_port: 4001 - connect: thrips.demo.bitmask.i - connect_port: 19002 - ednp_server: - accept: 19002 - connect: "127.0.0.1:9002" - epmd_clients: - thrips_4369: - accept_port: 4000 - connect: thrips.demo.bitmask.i - connect_port: 14369 - epmd_server: - accept: 14369 - connect: "127.0.0.1:4369" + clients: + ednp_clients: + thrips_9002: + accept_port: 4001 + connect: thrips.demo.bitmask.i + connect_port: 19002 + original_port: 9002 + epmd_clients: + thrips_4369: + accept_port: 4000 + connect: thrips.demo.bitmask.i + connect_port: 14369 + original_port: 4369 + servers: + couch_server: + accept_port: 15984 + connect_port: 5984 + ednp_server: + accept_port: 19002 + connect_port: 9002 + epmd_server: + accept_port: 14369 + connect_port: 4369 tags: - demo - seattle @@ -198,6 +211,9 @@ x509: BQxrMTmmPg9p/pQgsRd0zrMBAHVVOWIUdEvMe9d6JMsHabOsDG+nySGrDAgTuBf3 Eqk8NgcHUMUFnnESUmcKjsMsn/fSQceYG06R8nNBsq1vpH9Vv+7kvgJx4WQCjg== -----END CERTIFICATE----- + commercial_ca_cert: ~ + commercial_cert: ~ + commercial_key: ~ key: | -----BEGIN RSA PRIVATE KEY----- MIIEpQIBAAKCAQEAms2pFpXAyOqZ54YccmnQBFYTXQAdqCs5mpr0xSOPwI9J25nn @@ -227,3 +243,4 @@ x509: /DVs7/l3QcdZumI+MVs1fSMQWAvad7PSC5GOr7s1KcMxi0nHkFZ1de0= -----END RSA PRIVATE KEY----- use: true + use_commercial: false diff --git a/hiera/canvasback.yaml b/hiera/canvasback.yaml index 3b5932d..8c5dd5b 100644 --- a/hiera/canvasback.yaml +++ b/hiera/canvasback.yaml @@ -40,7 +40,7 @@ definition_files: "en": "Bitmask" }, "service": { - "allow_anonymous": true, + "allow_anonymous": false, "allow_free": true, "allow_limited_bandwidth": false, "allow_paid": false, @@ -105,9 +105,9 @@ development: site_config: true dns: aliases: + - api.cdev.bitmask.net - canvasback.cdev.bitmask.net - cdev.bitmask.net - - api.cdev.bitmask.net - nicknym.cdev.bitmask.net public: true domain: @@ -119,12 +119,15 @@ domain: enabled: true environment: clientdev haproxy: - servers: - gadwall: - backup: false - host: localhost - port: 4000 - weight: 100 + couch: + listen_port: 4096 + servers: + gadwall: + backup: false + host: localhost + port: 4000 + weight: 100 + writable: true hosts: chipmonk: domain_full: chipmonk.cdev.bitmask.net @@ -153,6 +156,9 @@ nickserver: username: nickserver domain: nicknym.cdev.bitmask.net port: 6425 +platform: + major_version: "0.6" + version: "0.6" service_type: public_service services: - webapp @@ -193,25 +199,29 @@ ssh: ports: "60000:61000" port: 22 stunnel: - couch_client: - gadwall_5984: - accept_port: 4000 - connect: gadwall.cdev.bitmask.i - connect_port: 15984 + clients: + couch_client: + gadwall_5984: + accept_port: 4000 + connect: gadwall.cdev.bitmask.i + connect_port: 15984 + original_port: 5984 + servers: {} tags: - clientdev - dc webapp: admins: + - azul - elijah - - varac - - micah - kwadronaut - mcnair - meanderingcode - - azul - allow_anonymous_certs: true + - micah + - varac + allow_anonymous_certs: false allow_limited_certs: false + allow_registration: true allow_unlimited_certs: true api_version: 1 client_certificates: @@ -227,16 +237,18 @@ webapp: password: _CatyL3Ienc4wRrfPubrhyfYCFmCyt9t salt: 1c1dd6eb78f027414f1638bd6c902a5a username: webapp - customization_dir: /etc/leap/files/webapp/ + customization_dir: /srv/leap/files/files/webapp/ default_service_level: 1 domain: cdev.bitmask.net + engines: + - support git: revision: origin/master source: "https://leap.se/git/leap_web" modules: - - user - billing - help + - user nagios_test_user: password: HpR8dKsLPnYXjQaHXfC3rP_dM3CpXKIL username: nagios_test @@ -283,34 +295,33 @@ x509: -----END CERTIFICATE----- cert: | -----BEGIN CERTIFICATE----- - MIIFIjCCAwqgAwIBAgIQe73BrJntgoNhY+SyXzRp7jANBgkqhkiG9w0BAQsFADBK + MIIFBTCCAu2gAwIBAgIQXzRkgwd9nMeddMdNpMxp0TANBgkqhkiG9w0BAQsFADBK MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa - BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQwNDA4MDAwMDAwWhcNMTUw - NDA4MDAwMDAwWjAmMSQwIgYDVQQDDBtjYW52YXNiYWNrLmNkZXYuYml0bWFzay5u - ZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAoFyA6v4tRLuOKelr - R0DB9hYehKAmkMZZCoHI5JNVECNZ9StoiQFB+YCPQL+ayIPRms2Ib63lg5sqphY6 - Kt/U58HAAl+Z8j5QYOn129CUY02/laVIRoS3TF/ha8b/Bs2mun6LmIu/o8LYfoPc - yZRn0zoVIFOP/KNwPIdZhSkeSkeQUztxoHfNLtGla4fXuy7xcR2t545ZGGQT1C+9 - EO8YgRVQLjbOJUMJkuNf2LnAUIC0+VZCSS32GkMAQei4PpMENN83kbST4h32e6re - PxXt0T3VEZAzCdnqH3D0+cB2xgnJRX9LLAY89jk9j9UMs+AYm25pOSSeAH1GobX3 - YySdAgMBAAGjggEmMIIBIjAdBgNVHQ4EFgQUz+5FRWthqmdELvJeFsbkpJCiEHEw - gagGA1UdEQSBoDCBnYIZY2FudmFzYmFjay5jZGV2LmJpdG1hc2suaYIbY2FudmFz - YmFjay5jZGV2LmJpdG1hc2submV0ghBjZGV2LmJpdG1hc2submV0ghtjYW52YXNi - YWNrLmNkZXYuYml0bWFzay5uZXSCFGFwaS5jZGV2LmJpdG1hc2submV0ghhuaWNr - bnltLmNkZXYuYml0bWFzay5uZXSHBMd3cAQwCwYDVR0PBAQDAgWgMB0GA1UdJQQW - MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFLmB - gyy9rLMJ2KRx7z66LdSVPg+PMA0GCSqGSIb3DQEBCwUAA4ICAQBesOL3vbgZUHfT - vzDCscFtgxqTVxUGYbXq8HBA7239iGgbD0oltJOduvmBXoCUISpHBIZdZG8HfrMW - BsPLt1XI13KXTSTSmP7OKWZpGmUNMPCUJnRc7p/DCFOnPrCuDWe5YqkbkEfNj3wM - yrlDcQnO2kf/F8CgV8Fni8yXPqMV32kE9oWUeR78F2UVzkRMkkXHiJrXLrdMqCA0 - sR/Ut9zv2WprI40/8vj4/BH/MfzuAs65nHl6d1Mn5Yww3mOuJShAofgQO9O9qNAE - Om6a2KCHdH5XE/gZ21IgDqm+LfU8J1ZHtz8dNmQjUxP6XcCquPgm7ya2lxwwlUs+ - dvfBvzptFl9l26QzEt1XZet1KY9IALufeOAWqDrupa9dKexS7FdBxncBBbe0wflR - j/3o05L0fW0aBYbl31EN9oUKXaxWaVbDbTm54f/D3EoA9eEQzxUsIy4XrDwbwV+G - KNSurN8XFRBNFghjBHURpI2duSm0ffApKEgwHPhYSV0Ho0SkGkL5GFrdk2T+fLzX - gAVDa1r2UhGwXMpxHbyCm9T1DI0Wi3uLpI6BO8viKdQo3JCaiFCKDXgLvGxo6GNu - HZ2ghLla5i+uDLafNKqdZTtLV2JC0lptiPKjNeYq5xxgYHAhcMPYfXMy89bUiZZw - B1Jesddx39No/Xj2BFzAEMSq6YCjUg== + BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQxMDAyMDAwMDAwWhcNMTUx + MDAyMDAwMDAwWjAmMSQwIgYDVQQDDBtjYW52YXNiYWNrLmNkZXYuYml0bWFzay5u + ZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzy2p83xKOE32uQg5v + YI5YvASsmDy6Of3sQK+Nd/rJQ8OTM9hjF+RT7xn8GpBN2hFREzU+EH1147WXcAEH + fCpvpBOsy0eg2gNidCWd9dYpZLP9P+wOpcdp2jtqlXWYSzID2Pyo+9WSSIxbLe5h + Ht7XvW7xCZfaRJS2O+W6yKbTsZ9B1lmJvtXldY9Snu/M5PtWq2eWV/9qc+ZrSw1l + 176H/C4tRYJDB73VfZXEx37KoiT0hACTNyHji1zyiyV3DGW8UvbgjPBhuHWWRdfv + 6lRU/vOge5v/M3eoRRqOmEQuvMXDKAVkQVRZ6SYjeGolzC8P8PWvKRMq7v9FiBva + yUQ/AgMBAAGjggEJMIIBBTAdBgNVHQ4EFgQUz2uhqnq5OnpVfcvLdMdU4z4CGF8w + gYsGA1UdEQSBgzCBgIIUYXBpLmNkZXYuYml0bWFzay5uZXSCGWNhbnZhc2JhY2su + Y2Rldi5iaXRtYXNrLmmCG2NhbnZhc2JhY2suY2Rldi5iaXRtYXNrLm5ldIIQY2Rl + di5iaXRtYXNrLm5ldIIYbmlja255bS5jZGV2LmJpdG1hc2submV0hwTHd3AEMAsG + A1UdDwQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0T + BAIwADAfBgNVHSMEGDAWgBS5gYMsvayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0B + AQsFAAOCAgEAr2Dp6ymH67KqkBKhZ+4m6HjwtsiqgUkbsD7rZW0RjK076yub2gUa + 0MNsxm3pDwUycCCHfVdu0ukRvuXJT7xaNrOh3Lg9uyV/p2A4IlKEI7Ox+IDIzNTl + zOqFsPVywttXX9u06zK32l8HBvSL/GJXvtIxK48HfFclMHop3d+78imU7SPxiarR + 3qeMyRsNYOCGe6p8Ri5tnxxbzyxI8vkkzH3RkXrazk1bloEHr7dsHBNw/wolGkfS + eCDWGfYWM/oJ+oOnPI/cnbnPnrMc/bxi3ptJgr/K7YgW1ombBNa/4qtbuP+nGLXM + z5qFKAIpquOLGTgmOCzKhpz2pL7Ha8j5jgRcfzQgqVxPpJ+uyRdAKZfnI41p/omj + elEvoL/FZFIHVfjeFxRanWgBIcV5tXMBZzbzPkJ+MULTSEg4PE2DxE+nj1vHbN92 + o7cVQ67BmlgtHU5PPUVJjLG0H+SVlZcys1p6qN+di0i2u9BZ4n+LxSWvgiOAzBtj + uBUWW6m4j9NSUKI4d8CRParGdUw1wPMnIoHdtI5N37iQEqRghy7Aw8Lx5dXObyLS + XYcCBngUNQboYvDRPkrnAgkdpmArSmRIKxRMecndywsTXqjjopwWAI0hJCAXUJjX + 2YaT12qUtbi23cL++Aw5B0/asM1JVmwypMRHb7YhEFW7lMTy0jUjfiQ= -----END CERTIFICATE----- client_ca_cert: | -----BEGIN CERTIFICATE----- @@ -468,89 +479,86 @@ x509: -----END CERTIFICATE----- commercial_cert: | -----BEGIN CERTIFICATE----- - MIIFDjCCAvagAwIBAgIDDsl6MA0GCSqGSIb3DQEBDQUAMHkxEDAOBgNVBAoTB1Jv - b3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAGA1UEAxMZ - Q0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSc3VwcG9y - dEBjYWNlcnQub3JnMB4XDTE0MDQwODE1MzQzNloXDTE0MTAwNTE1MzQzNlowGzEZ - MBcGA1UEAxMQY2Rldi5iaXRtYXNrLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP - ADCCAQoCggEBAKjKBkcB9eip1gJt+er7WY8Qc7/Mh5+kUMIHkxa9Q03NWwxGuKYo - YXJOSGmLfZ6J7O4tIXvSFq9VY4kH3vLZDH/zJq4sDlrl2kUgus5NGWc3v+5wu6si - xLXoTPtjk+q8nBByDOyiTga+34zWxpxTpJLJj+RUws8T4x2p66Leojh1WljE6iXG - sHw7H5PFKBBIr/sBedS31NUek2gbYM20SeFxyWHWy0J1SAXIRLfGje0WcI7hR/c1 - t2oLO57KKJ9DooZvARf6foLLScaqhHeO6opeVhQeQjO5jX97NEzxifMGqfmk7krD - 1nikbu38oIK4N+ySEXE1rcLeBoJ31S2KHjMCAwEAAaOB/DCB+TAMBgNVHRMBAf8E - AjAAMA4GA1UdDwEB/wQEAwIDqDA0BgNVHSUELTArBggrBgEFBQcDAgYIKwYBBQUH - AwEGCWCGSAGG+EIEAQYKKwYBBAGCNwoDAzAzBggrBgEFBQcBAQQnMCUwIwYIKwYB - BQUHMAGGF2h0dHA6Ly9vY3NwLmNhY2VydC5vcmcvMDEGA1UdHwQqMCgwJqAkoCKG - IGh0dHA6Ly9jcmwuY2FjZXJ0Lm9yZy9yZXZva2UuY3JsMDsGA1UdEQQ0MDKCEGNk - ZXYuYml0bWFzay5uZXSgHgYIKwYBBQUHCAWgEgwQY2Rldi5iaXRtYXNrLm5ldDAN - BgkqhkiG9w0BAQ0FAAOCAgEAO6QC5hsJiHQjXJmNOGOPqmEGnI/7yuQ26QOqwiEm - ooDNx7ziVk/73oG8Z+cfw3TPJ+mCu4i+dMzMrir+D4HNBepD9mWChu54gJboIVnb - dW9mvxpYHAhwempcw8QXVdI0jxzZXxWdEFd9alhQmJVEppfscz87dtT5sf/u0o4t - cDm2ME0PyenpeiVix7YtpcCnqFTnWtNYBwR6kCHlDr/V8wlp1EOgvOBFHUIpiRwi - bJ5BER4YLN4iWIKGTBF+lqPFsmEM/hkbk7OUjwv1uX/LeD3x+iUNvfRgkbKJMUUl - ddOdaeKhm5N216tpFo4hehGM1KW9/PHMW/GoIpm6eVkjeV51dD8g5ICPPwig1QUj - 0rGiq4m+PFgg71oTXBU6eZSH7ZBca7fyOZYyESZHb1xa4HZgKLDeldt0VhApODbx - TmW3vDAo7iBElUcOvdxRRZzSSVOcslDbypnnECLJDoBrnaIAVj1eeMTYa2ETbVmF - nTVi7c2gixjXka7k4OtmKfeg+cQZvtNxfb9owE1wcFnCv3Bbz42HLcqxHvnGKpIp - Ig2JBgTqu7hQGhRnKYFSxq6DIxVXPmnN3O8PfrRx2rX+0AyXHaJlN1oiBAmChxC2 - GazD5oO2EWIJMbo8bPpLy6oE7ZHl74hAyDsTRIAemh5cwGAVeSjiQj4DRqbSXSJ5 - oCo= + MIIEcDCCAligAwIBAgIQZapGmb3M2eXlfyXvmTnKwDANBgkqhkiG9w0BAQsFADBK + MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa + BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQxMDAyMDAwMDAwWhcNMTUx + MDAyMDAwMDAwWjAtMRAwDgYDVQQKDAdCaXRtYXNrMRkwFwYDVQQDDBBjZGV2LmJp + dG1hc2submV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvtDUNqCS + W8Gd3rdxG4fG+LGABxrD+A2CbwNJNZ1kte6t4h8h6bVAjIoVUzwt3fHbtoDGJAwi + IACZ5NQSBfAL0mZPu9EPhgBZNd5G/uzsYPAEOFlHuKRhlFsVJqApvlChkJpGFNoH + oDUGVWs4bmGq9e+Dc/6eouFGz8sqQfHWfKhnuX1T84oJGAzEm5pKIKkdUDMk9xIM + 4SV+fKC5qrcmVDxpIgnJHI42sINSKS0xj9bhioGw5wFkstnxtpGNB3VDpaZ4pK/o + kw7NI9tHeguIxiMf1S9O4JeTyquShT6OXZrf1wR9nRS882cFnwruM9jsXbMILCeO + Y3Y7ZJ8c3jhtCQIDAQABo28wbTAdBgNVHQ4EFgQUkMbMHgml/FP5noJVRJ9C+oVs + lBEwCwYDVR0PBAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAkGA1UdEwQCMAAw + HwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48wDQYJKoZIhvcNAQELBQAD + ggIBAKNKgOnxYYiRSTNUYbAzfr5g6RmBndpc8vsFtcKcVtbIAm2HseiQLGqTbmIa + jbtbqd3138WG8wLDuiEVHeE8rzF1FMyncvJXFpee0X7BLWW+pm3qG4o+q49gxmZi + qN3+nUxMJWgw0ooK2nyzgp/AJ2iX8+b0oZTLCaG1SUAC8zoxbBlEmKldkpJSTVqE + gNBycX4+KQ9MrwsIqrDKCiKn2+IqmDThuaVmtkzXggLp6CsqJoedOiV3IAtxbl64 + 6GFAgT7OZVrnlSpylk53u8fthLCoM+0vuF0+9wWkxERxwywsgxRI5U5JibIzOuy3 + Jce4Bs/n9h0ZWrZQBjyIptaGPpAJFpxFhhZm2yNGt6So2HctR5B9mSSedZg9a8XQ + bdV6ZNQEgBEY7tPPpmAMBGTEzynD3ivN/MFgB2BadT2V04dGQy5f2RzoT56iwRly + wPSHllPxt8gm8d9VswSZKD9IaUi6exM2x4yiu9qZWD8+PDR9OP9QmEio7TVuxXJ5 + /vYkq1++ig5GxJDDdfuV2BY5vTOm9qkpIAw/usu9ZIETyQkzy1mc4Yt7hxjPq+Xr + 7CENhUxhDJt45cs8kSk4OEtlivDHabt5wEDtcxXkDFdudseVf6iT4TfkcHyQDsRj + hgknwqmkAIwfmJjWWLNkQoTuxXRKm0ZmtWXIYlpk/d323Dau -----END CERTIFICATE----- commercial_key: | -----BEGIN RSA PRIVATE KEY----- - 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 -----END RSA PRIVATE KEY----- key: | -----BEGIN RSA PRIVATE KEY----- - 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 -----END RSA PRIVATE KEY----- use: true + use_commercial: true diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml index dee97da..f867577 100644 --- a/hiera/chameleon.yaml +++ b/hiera/chameleon.yaml @@ -473,6 +473,9 @@ nickserver: username: nickserver domain: nicknym.unstable.bitmask.net port: 6425 +platform: + major_version: "0.6" + version: "0.6" service_type: public_service services: - monitor @@ -569,7 +572,7 @@ webapp: password: enfhmsmcLc3Az3GF6TFKwRk99Iqjm2ew salt: 478bf7e8ca879a9711b279055f00153e username: webapp - customization_dir: /etc/leap/files/webapp/ + customization_dir: /srv/leap/files/files/webapp/ default_service_level: 1 domain: unstable.bitmask.net engines: diff --git a/hiera/chipmonk.yaml b/hiera/chipmonk.yaml index 1cff21a..b2220e3 100644 --- a/hiera/chipmonk.yaml +++ b/hiera/chipmonk.yaml @@ -18,12 +18,15 @@ domain: enabled: true environment: clientdev haproxy: - servers: - gadwall: - backup: false - host: localhost - port: 4000 - weight: 100 + couch: + listen_port: 4096 + servers: + gadwall: + backup: false + host: localhost + port: 4000 + weight: 100 + writable: true hosts: chipmonk: domain_full: chipmonk.cdev.bitmask.net @@ -44,39 +47,42 @@ location: mail: smarthost: [] mynetworks: - - "199.119.112.5" - - "192.168.5.5" - - "199.119.112.9" - - "192.168.5.9" - - "202.85.227.204" - - "199.119.112.10" - - "192.168.5.10" + - "176.53.69.127" + - "176.53.69.13" + - "176.53.69.14" - "176.53.69.21" - - "204.13.164.162" - - "198.252.153.85" - - "85.17.92.143" - - "204.13.164.171" - - "199.119.112.4" + - "176.53.69.22" + - "176.53.69.23" + - "192.168.5.10" + - "192.168.5.12" + - "192.168.5.16" + - "192.168.5.19" + - "192.168.5.23" - "192.168.5.4" + - "192.168.5.5" + - "192.168.5.8" + - "192.168.5.9" + - "198.252.153.82" - "198.252.153.83" + - "198.252.153.85" + - "199.119.112.10" + - "199.119.112.12" + - "199.119.112.16" + - "199.119.112.19" - "199.119.112.23" - - "192.168.5.23" - - "176.53.69.14" + - "199.119.112.4" + - "199.119.112.5" - "199.119.112.8" - - "192.168.5.8" - - "176.53.69.22" - - "199.119.112.19" - - "192.168.5.19" - - "176.53.69.127" + - "199.119.112.9" + - "202.85.227.195" + - "204.13.164.162" + - "204.13.164.171" - "204.13.164.57" - - "176.53.69.13" - - "199.119.112.12" - - "192.168.5.12" - - "199.119.112.16" - - "192.168.5.16" - - "176.53.69.23" - - "198.252.153.82" + - "85.17.92.143" name: chipmonk +platform: + major_version: "0.6" + version: "0.6" service_type: user_service services: - mx @@ -117,11 +123,14 @@ ssh: ports: "60000:61000" port: 22 stunnel: - couch_client: - gadwall_5984: - accept_port: 4000 - connect: gadwall.cdev.bitmask.i - connect_port: 15984 + clients: + couch_client: + gadwall_5984: + accept_port: 4000 + connect: gadwall.cdev.bitmask.i + connect_port: 15984 + original_port: 5984 + servers: {} tags: - clientdev - dc @@ -344,62 +353,58 @@ x509: -----END CERTIFICATE----- commercial_cert: | -----BEGIN CERTIFICATE----- - MIIFDjCCAvagAwIBAgIDDsl6MA0GCSqGSIb3DQEBDQUAMHkxEDAOBgNVBAoTB1Jv - b3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAGA1UEAxMZ - Q0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSc3VwcG9y - dEBjYWNlcnQub3JnMB4XDTE0MDQwODE1MzQzNloXDTE0MTAwNTE1MzQzNlowGzEZ - MBcGA1UEAxMQY2Rldi5iaXRtYXNrLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP - ADCCAQoCggEBAKjKBkcB9eip1gJt+er7WY8Qc7/Mh5+kUMIHkxa9Q03NWwxGuKYo - YXJOSGmLfZ6J7O4tIXvSFq9VY4kH3vLZDH/zJq4sDlrl2kUgus5NGWc3v+5wu6si - xLXoTPtjk+q8nBByDOyiTga+34zWxpxTpJLJj+RUws8T4x2p66Leojh1WljE6iXG - sHw7H5PFKBBIr/sBedS31NUek2gbYM20SeFxyWHWy0J1SAXIRLfGje0WcI7hR/c1 - t2oLO57KKJ9DooZvARf6foLLScaqhHeO6opeVhQeQjO5jX97NEzxifMGqfmk7krD - 1nikbu38oIK4N+ySEXE1rcLeBoJ31S2KHjMCAwEAAaOB/DCB+TAMBgNVHRMBAf8E - AjAAMA4GA1UdDwEB/wQEAwIDqDA0BgNVHSUELTArBggrBgEFBQcDAgYIKwYBBQUH - AwEGCWCGSAGG+EIEAQYKKwYBBAGCNwoDAzAzBggrBgEFBQcBAQQnMCUwIwYIKwYB - BQUHMAGGF2h0dHA6Ly9vY3NwLmNhY2VydC5vcmcvMDEGA1UdHwQqMCgwJqAkoCKG - IGh0dHA6Ly9jcmwuY2FjZXJ0Lm9yZy9yZXZva2UuY3JsMDsGA1UdEQQ0MDKCEGNk - ZXYuYml0bWFzay5uZXSgHgYIKwYBBQUHCAWgEgwQY2Rldi5iaXRtYXNrLm5ldDAN - BgkqhkiG9w0BAQ0FAAOCAgEAO6QC5hsJiHQjXJmNOGOPqmEGnI/7yuQ26QOqwiEm - ooDNx7ziVk/73oG8Z+cfw3TPJ+mCu4i+dMzMrir+D4HNBepD9mWChu54gJboIVnb - dW9mvxpYHAhwempcw8QXVdI0jxzZXxWdEFd9alhQmJVEppfscz87dtT5sf/u0o4t - cDm2ME0PyenpeiVix7YtpcCnqFTnWtNYBwR6kCHlDr/V8wlp1EOgvOBFHUIpiRwi - bJ5BER4YLN4iWIKGTBF+lqPFsmEM/hkbk7OUjwv1uX/LeD3x+iUNvfRgkbKJMUUl - ddOdaeKhm5N216tpFo4hehGM1KW9/PHMW/GoIpm6eVkjeV51dD8g5ICPPwig1QUj - 0rGiq4m+PFgg71oTXBU6eZSH7ZBca7fyOZYyESZHb1xa4HZgKLDeldt0VhApODbx - TmW3vDAo7iBElUcOvdxRRZzSSVOcslDbypnnECLJDoBrnaIAVj1eeMTYa2ETbVmF - nTVi7c2gixjXka7k4OtmKfeg+cQZvtNxfb9owE1wcFnCv3Bbz42HLcqxHvnGKpIp - Ig2JBgTqu7hQGhRnKYFSxq6DIxVXPmnN3O8PfrRx2rX+0AyXHaJlN1oiBAmChxC2 - GazD5oO2EWIJMbo8bPpLy6oE7ZHl74hAyDsTRIAemh5cwGAVeSjiQj4DRqbSXSJ5 - oCo= + MIIEcDCCAligAwIBAgIQZapGmb3M2eXlfyXvmTnKwDANBgkqhkiG9w0BAQsFADBK + MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa + BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQxMDAyMDAwMDAwWhcNMTUx + MDAyMDAwMDAwWjAtMRAwDgYDVQQKDAdCaXRtYXNrMRkwFwYDVQQDDBBjZGV2LmJp + dG1hc2submV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvtDUNqCS + W8Gd3rdxG4fG+LGABxrD+A2CbwNJNZ1kte6t4h8h6bVAjIoVUzwt3fHbtoDGJAwi + IACZ5NQSBfAL0mZPu9EPhgBZNd5G/uzsYPAEOFlHuKRhlFsVJqApvlChkJpGFNoH + oDUGVWs4bmGq9e+Dc/6eouFGz8sqQfHWfKhnuX1T84oJGAzEm5pKIKkdUDMk9xIM + 4SV+fKC5qrcmVDxpIgnJHI42sINSKS0xj9bhioGw5wFkstnxtpGNB3VDpaZ4pK/o + kw7NI9tHeguIxiMf1S9O4JeTyquShT6OXZrf1wR9nRS882cFnwruM9jsXbMILCeO + Y3Y7ZJ8c3jhtCQIDAQABo28wbTAdBgNVHQ4EFgQUkMbMHgml/FP5noJVRJ9C+oVs + lBEwCwYDVR0PBAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAkGA1UdEwQCMAAw + HwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48wDQYJKoZIhvcNAQELBQAD + ggIBAKNKgOnxYYiRSTNUYbAzfr5g6RmBndpc8vsFtcKcVtbIAm2HseiQLGqTbmIa + jbtbqd3138WG8wLDuiEVHeE8rzF1FMyncvJXFpee0X7BLWW+pm3qG4o+q49gxmZi + qN3+nUxMJWgw0ooK2nyzgp/AJ2iX8+b0oZTLCaG1SUAC8zoxbBlEmKldkpJSTVqE + gNBycX4+KQ9MrwsIqrDKCiKn2+IqmDThuaVmtkzXggLp6CsqJoedOiV3IAtxbl64 + 6GFAgT7OZVrnlSpylk53u8fthLCoM+0vuF0+9wWkxERxwywsgxRI5U5JibIzOuy3 + Jce4Bs/n9h0ZWrZQBjyIptaGPpAJFpxFhhZm2yNGt6So2HctR5B9mSSedZg9a8XQ + bdV6ZNQEgBEY7tPPpmAMBGTEzynD3ivN/MFgB2BadT2V04dGQy5f2RzoT56iwRly + wPSHllPxt8gm8d9VswSZKD9IaUi6exM2x4yiu9qZWD8+PDR9OP9QmEio7TVuxXJ5 + /vYkq1++ig5GxJDDdfuV2BY5vTOm9qkpIAw/usu9ZIETyQkzy1mc4Yt7hxjPq+Xr + 7CENhUxhDJt45cs8kSk4OEtlivDHabt5wEDtcxXkDFdudseVf6iT4TfkcHyQDsRj + hgknwqmkAIwfmJjWWLNkQoTuxXRKm0ZmtWXIYlpk/d323Dau -----END CERTIFICATE----- commercial_key: | -----BEGIN RSA PRIVATE KEY----- - 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 -----END RSA PRIVATE KEY----- key: | -----BEGIN RSA PRIVATE KEY----- @@ -430,3 +435,4 @@ x509: c9OAySi7JcI0Pl9/ilUtc53EpsalTEaN3uuFlQoL8A8OKxabskS9bw== -----END RSA PRIVATE KEY----- use: true + use_commercial: true diff --git a/hiera/clam.yaml b/hiera/clam.yaml index a458f42..b702729 100644 --- a/hiera/clam.yaml +++ b/hiera/clam.yaml @@ -86,6 +86,9 @@ mail: smarthost: - starfish.dev.bitmask.net name: clam +platform: + major_version: "0.6" + version: "0.6" service_type: public_service services: - couchdb diff --git a/hiera/couch1.yaml b/hiera/couch1.yaml index 0aef52d..f0de356 100644 --- a/hiera/couch1.yaml +++ b/hiera/couch1.yaml @@ -8,6 +8,8 @@ couch: epmd_port: 4369 neighbors: - couch2.bitmask.net + master: false + mode: multimaster port: 5984 users: admin: @@ -22,6 +24,10 @@ couch: password: bJFrsP5dXGuegQIT5jZXMYMITpT5w5YR salt: 73567fc12c27a79152620084e97b4fba username: nickserver + replication: + password: fbZMru8SZ9UhaHXYRW2f9RVCjJmBwBuJ + salt: b2716ac90f4e9dd7b2a088d2765ae374 + username: replication soledad: password: E9at8FUjuxTEJEPEvACk9DWjWnR5rbKp salt: e2b6fa1a29b1afbe1ea4a3f7ec5bacc7 @@ -67,6 +73,9 @@ mail: smarthost: - mx1.bitmask.net name: couch1 +platform: + major_version: "0.6" + version: "0.6" service_type: public_service services: - couchdb @@ -116,25 +125,29 @@ ssh: ports: "60000:61000" port: 22 stunnel: - couch_server: - accept: 15984 - connect: "127.0.0.1:5984" - ednp_clients: - couch2_9002: - accept_port: 4001 - connect: couch2.bitmask.i - connect_port: 19002 - ednp_server: - accept: 19002 - connect: "127.0.0.1:9002" - epmd_clients: - couch2_4369: - accept_port: 4000 - connect: couch2.bitmask.i - connect_port: 14369 - epmd_server: - accept: 14369 - connect: "127.0.0.1:4369" + clients: + ednp_clients: + couch2_9002: + accept_port: 4001 + connect: couch2.bitmask.i + connect_port: 19002 + original_port: 9002 + epmd_clients: + couch2_4369: + accept_port: 4000 + connect: couch2.bitmask.i + connect_port: 14369 + original_port: 4369 + servers: + couch_server: + accept_port: 15984 + connect_port: 5984 + ednp_server: + accept_port: 19002 + connect_port: 9002 + epmd_server: + accept_port: 14369 + connect_port: 4369 tags: - local x509: @@ -199,6 +212,9 @@ x509: 7AQ/LsmCL5K6F5OqPAUMwc7w1Jp2CSq0sqBSuyjq5Xaom2eQcRD02c1pcLfJwWRS iEbJwlSbPVGpScfRfoaOlyiH96btwnWvaIBgf3Ii7dLTSc2EIO5s -----END CERTIFICATE----- + commercial_ca_cert: ~ + commercial_cert: ~ + commercial_key: ~ key: | -----BEGIN RSA PRIVATE KEY----- MIIEowIBAAKCAQEAzGNOpJbUz6hQrWmBUgfJPzYfVZhDeEJAalXuuXxlVU1wlsSG @@ -228,3 +244,4 @@ x509: SeSdWAYGKZZAMSQInihge20dMu1TgS7R0ijeAf4LaoMEq3AOkXMf -----END RSA PRIVATE KEY----- use: true + use_commercial: false diff --git a/hiera/couch2.yaml b/hiera/couch2.yaml index 5b84310..c08b592 100644 --- a/hiera/couch2.yaml +++ b/hiera/couch2.yaml @@ -8,6 +8,8 @@ couch: epmd_port: 4369 neighbors: - couch1.bitmask.net + master: false + mode: multimaster port: 5984 users: admin: @@ -22,6 +24,10 @@ couch: password: bJFrsP5dXGuegQIT5jZXMYMITpT5w5YR salt: 73567fc12c27a79152620084e97b4fba username: nickserver + replication: + password: fbZMru8SZ9UhaHXYRW2f9RVCjJmBwBuJ + salt: b2716ac90f4e9dd7b2a088d2765ae374 + username: replication soledad: password: E9at8FUjuxTEJEPEvACk9DWjWnR5rbKp salt: e2b6fa1a29b1afbe1ea4a3f7ec5bacc7 @@ -67,6 +73,9 @@ mail: smarthost: - mx1.bitmask.net name: couch2 +platform: + major_version: "0.6" + version: "0.6" service_type: public_service services: - couchdb @@ -116,25 +125,29 @@ ssh: ports: "60000:61000" port: 22 stunnel: - couch_server: - accept: 15984 - connect: "127.0.0.1:5984" - ednp_clients: - couch1_9002: - accept_port: 4001 - connect: couch1.bitmask.i - connect_port: 19002 - ednp_server: - accept: 19002 - connect: "127.0.0.1:9002" - epmd_clients: - couch1_4369: - accept_port: 4000 - connect: couch1.bitmask.i - connect_port: 14369 - epmd_server: - accept: 14369 - connect: "127.0.0.1:4369" + clients: + ednp_clients: + couch1_9002: + accept_port: 4001 + connect: couch1.bitmask.i + connect_port: 19002 + original_port: 9002 + epmd_clients: + couch1_4369: + accept_port: 4000 + connect: couch1.bitmask.i + connect_port: 14369 + original_port: 4369 + servers: + couch_server: + accept_port: 15984 + connect_port: 5984 + ednp_server: + accept_port: 19002 + connect_port: 9002 + epmd_server: + accept_port: 14369 + connect_port: 4369 tags: - local x509: @@ -199,6 +212,9 @@ x509: zXhBGqCxzoUZSCaxmCIeRBe18GoWRM0JZnpBbi4K3r3ZOIjzoEUK3L6e0tRkJCNc GXE33HbYQAtwidqDCHrb0LLWJjLeI/10avzPtGr/rqVKYufTRq1b -----END CERTIFICATE----- + commercial_ca_cert: ~ + commercial_cert: ~ + commercial_key: ~ key: | -----BEGIN RSA PRIVATE KEY----- MIIEpQIBAAKCAQEAse0pV7xCoGB/dvqmIlc8nY+9/TaKtp/2qfCWAE4fa49vP3NU @@ -228,3 +244,4 @@ x509: balQCbIbD77nO3413Tdg3G0mj6826wrJI4j0jvHk1HU53C7bkaL1dxo= -----END RSA PRIVATE KEY----- use: true + use_commercial: false diff --git a/hiera/deer.yaml b/hiera/deer.yaml index 840c3cf..3d5b0b6 100644 --- a/hiera/deer.yaml +++ b/hiera/deer.yaml @@ -24,6 +24,9 @@ mail: smarthost: - starfish.dev.bitmask.net name: deer +platform: + major_version: "0.6" + version: "0.6" service_type: internal_service services: - tor diff --git a/hiera/demodex.yaml b/hiera/demodex.yaml index 96526f8..cac0cfe 100644 --- a/hiera/demodex.yaml +++ b/hiera/demodex.yaml @@ -24,6 +24,9 @@ mail: smarthost: - starfish.dev.bitmask.net name: demodex +platform: + major_version: "0.6" + version: "0.6" service_type: internal_service services: - backup diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml index 02b8fbd..afa5f19 100644 --- a/hiera/elephant.yaml +++ b/hiera/elephant.yaml @@ -216,6 +216,9 @@ nickserver: username: nickserver domain: nicknym.dev.bitmask.net port: 6425 +platform: + major_version: "0.6" + version: "0.6" service_type: public_service services: - webapp @@ -311,7 +314,7 @@ webapp: password: PvRAdP9JrjS8qRsNCpyQ_KVDBTgTNGkY salt: 86497f034c8ef09b097f5c757ab038b7 username: webapp - customization_dir: /etc/leap/files/webapp/ + customization_dir: /srv/leap/files/files/webapp/ default_service_level: 1 domain: dev.bitmask.net engines: diff --git a/hiera/elk.yaml b/hiera/elk.yaml index e515286..3901682 100644 --- a/hiera/elk.yaml +++ b/hiera/elk.yaml @@ -86,6 +86,9 @@ mail: smarthost: - starfish.dev.bitmask.net name: elk +platform: + major_version: "0.6" + version: "0.6" service_type: internal_service services: - couchdb diff --git a/hiera/frog.yaml b/hiera/frog.yaml index 60f942c..3c880d9 100644 --- a/hiera/frog.yaml +++ b/hiera/frog.yaml @@ -13,12 +13,15 @@ domain: name: frog.bitmask.net enabled: true environment: production -hosts: ~ +hosts: {} ip_address: "199.119.112.23" location: ~ mail: smarthost: [] name: frog +platform: + major_version: "0.6" + version: "0.6" service_type: public_service services: - static @@ -59,6 +62,13 @@ ssh: ports: "60000:61000" port: 22 static: + bootstrap_files: + client_version: + max: ~ + min: "0.5" + domain: bitmask.net + enabled: true + provider_json: ~ domains: bitmask.net: ca_cert: | @@ -311,19 +321,15 @@ static: format: amber path: / source: - repo: "https://leap.se/git/bitmask_net" - revision: origin/master - type: git - help: - format: amber - path: /help - source: repo: "https://leap.se/git/bitmask_help" revision: origin/master type: git tls_only: true formats: - amber +stunnel: + clients: {} + servers: {} tags: - production x509: @@ -388,6 +394,9 @@ x509: do1tnppn3G1Y2EW18zztBS+pykt5+kFJdDAfC5tL3SNh2er+croopzn/pg7NMaS8 7ri/3hdHttbqDQjAxbQPl1CkpyxgKbQQyPVXAMfm1xUVtw== -----END CERTIFICATE----- + commercial_ca_cert: ~ + commercial_cert: ~ + commercial_key: ~ key: | -----BEGIN RSA PRIVATE KEY----- MIIEpQIBAAKCAQEAw7CiUKaxU165suQ0h2/r3qWePJ6M7AE2rVNgQSi3w0EmYlKi @@ -417,3 +426,4 @@ x509: F0ZIjOlu8zvQIl+L9tpmtEELTG+8LMyycvh0bPq9baY/LhTvnFKzMHE= -----END RSA PRIVATE KEY----- use: true + use_commercial: false diff --git a/hiera/gadwall.yaml b/hiera/gadwall.yaml index 096acff..9c8ad77 100644 --- a/hiera/gadwall.yaml +++ b/hiera/gadwall.yaml @@ -7,6 +7,8 @@ couch: ednp_port: 9002 epmd_port: 4369 neighbors: [] + master: false + mode: multimaster port: 5984 users: admin: @@ -21,6 +23,10 @@ couch: password: vjJAZqxPL4BeGKAEUVuBVK5MIba_aIY5 salt: eab38a050b5eb2569549f8e50cab9034 username: nickserver + replication: + password: gxbjRLwwDW5bQQx9MpbjNaqF_KdMbCng + salt: 751525d259cb7ec8e536b7caa21bb23c + username: replication soledad: password: MrUyYGnT_44NUyBAm46L3GCLPHKVZ_De salt: ac15331e0c098126e04ecf7a21045079 @@ -68,6 +74,9 @@ mail: smarthost: - chipmonk.cdev.bitmask.net name: gadwall +platform: + major_version: "0.6" + version: "0.6" service_type: public_service services: - couchdb @@ -116,17 +125,19 @@ ssh: ports: "60000:61000" port: 22 stunnel: - couch_server: - accept: 15984 - connect: "127.0.0.1:5984" - ednp_clients: {} - ednp_server: - accept: 19002 - connect: "127.0.0.1:9002" - epmd_clients: {} - epmd_server: - accept: 14369 - connect: "127.0.0.1:4369" + clients: + ednp_clients: {} + epmd_clients: {} + servers: + couch_server: + accept_port: 15984 + connect_port: 5984 + ednp_server: + accept_port: 19002 + connect_port: 9002 + epmd_server: + accept_port: 14369 + connect_port: 4369 tags: - clientdev - dc @@ -193,6 +204,9 @@ x509: jAR3FCr8Vvm4UoDbxvF4jeg+6Bd1D1Pz5lsMd5q/LHSk8nuTB+y2B6x96Q9/VkNc 14teuyf5AarZxA== -----END CERTIFICATE----- + commercial_ca_cert: ~ + commercial_cert: ~ + commercial_key: ~ key: | -----BEGIN RSA PRIVATE KEY----- MIIEowIBAAKCAQEA0Jt1sr/RTOJ8ue70yqv2qLeo4mAVPaZsGgtkh6l5eMrTGCOH @@ -222,3 +236,4 @@ x509: C917/dIQt48xJFBcX1oRHcFoakIVB4+h41Bc8mS09cR29Og8+JPP -----END RSA PRIVATE KEY----- use: true + use_commercial: false diff --git a/hiera/hippo.yaml b/hiera/hippo.yaml index 5803686..77df114 100644 --- a/hiera/hippo.yaml +++ b/hiera/hippo.yaml @@ -13,7 +13,7 @@ domain: name: hippo.demo.bitmask.net enabled: true environment: demo -hosts: ~ +hosts: {} ip_address: "85.17.92.143" location: country_code: NL @@ -24,6 +24,11 @@ mail: smarthost: - leech.demo.bitmask.net name: hippo +obfsproxy: + gateway_address: "85.17.92.167" + scramblesuit: + password: ONLW2MTQJJ4HUU3WGNVEC42JIF4XEWDS + port: 18943 openvpn: adblock: false allow_limited: false @@ -46,6 +51,9 @@ openvpn: second_gateway_address: ~ unlimited_prefix: UNLIMITED user_ips: false +platform: + major_version: "0.6" + version: "0.6" service_type: user_service services: - openvpn @@ -86,14 +94,17 @@ ssh: enabled: true ports: "60000:61000" port: 4422 +stunnel: + clients: {} + servers: {} tags: - - demo - amsterdam + - demo tor: bandwidth_rate: 100 contacts: - sysdev@leap.se - family: "hippobagtc8Z3KPmfnT,rhinouSaR9IekHdQGUG" + family: "deeruSaR9IekHdQGUGI,hippobagtc8Z3KPmfnT" nickname: hippobagtc8Z3KPmfnT x509: ca_cert: | @@ -192,6 +203,9 @@ x509: xIAokTRYLx/6lq8bwelCPGVjy7EsGXt9aN+gMb4R3L9vA/NQrXu+dmCJKPE1vUHF gkVBxxt/s0R2aKM= -----END CERTIFICATE----- + commercial_ca_cert: ~ + commercial_cert: ~ + commercial_key: ~ dh: | -----BEGIN DH PARAMETERS----- MIIBngKCAZcAsTaQV6TwbN9PpD6dYdXz0lA0drrXLRvS8rNoMTaDnIv134RwKwsb @@ -233,3 +247,4 @@ x509: Dqxr7d6Ded5Witr98xqbbXZLkwf/iUHAwT9xTnFD+2mfRIwN3ifYSA== -----END RSA PRIVATE KEY----- use: true + use_commercial: false diff --git a/hiera/ladybug.yaml b/hiera/ladybug.yaml index 6f13709..2efe90a 100644 --- a/hiera/ladybug.yaml +++ b/hiera/ladybug.yaml @@ -24,6 +24,9 @@ mail: smarthost: - starfish.dev.bitmask.net name: ladybug +platform: + major_version: "0.6" + version: "0.6" service_type: internal_service services: - backup diff --git a/hiera/leech.yaml b/hiera/leech.yaml index 0b9f270..a058197 100644 --- a/hiera/leech.yaml +++ b/hiera/leech.yaml @@ -18,17 +18,21 @@ domain: enabled: true environment: demo haproxy: - servers: - ant: - backup: false - host: localhost - port: 4001 - weight: 100 - thrips: - backup: false - host: localhost - port: 4000 - weight: 100 + couch: + listen_port: 4096 + servers: + ant: + backup: false + host: localhost + port: 4000 + weight: 100 + writable: true + thrips: + backup: false + host: localhost + port: 4001 + weight: 100 + writable: true hosts: ant: domain_full: ant.demo.bitmask.net @@ -54,39 +58,42 @@ location: mail: smarthost: [] mynetworks: - - "199.119.112.5" - - "192.168.5.5" - - "199.119.112.9" - - "192.168.5.9" - - "202.85.227.204" - - "199.119.112.10" - - "192.168.5.10" + - "176.53.69.127" + - "176.53.69.13" + - "176.53.69.14" - "176.53.69.21" - - "204.13.164.162" - - "198.252.153.85" - - "85.17.92.143" - - "204.13.164.171" - - "199.119.112.4" + - "176.53.69.22" + - "176.53.69.23" + - "192.168.5.10" + - "192.168.5.12" + - "192.168.5.16" + - "192.168.5.19" + - "192.168.5.23" - "192.168.5.4" + - "192.168.5.5" + - "192.168.5.8" + - "192.168.5.9" + - "198.252.153.82" - "198.252.153.83" + - "198.252.153.85" + - "199.119.112.10" + - "199.119.112.12" + - "199.119.112.16" + - "199.119.112.19" - "199.119.112.23" - - "192.168.5.23" - - "176.53.69.14" + - "199.119.112.4" + - "199.119.112.5" - "199.119.112.8" - - "192.168.5.8" - - "176.53.69.22" - - "199.119.112.19" - - "192.168.5.19" - - "176.53.69.127" + - "199.119.112.9" + - "202.85.227.195" + - "204.13.164.162" + - "204.13.164.171" - "204.13.164.57" - - "176.53.69.13" - - "199.119.112.12" - - "192.168.5.12" - - "199.119.112.16" - - "192.168.5.16" - - "176.53.69.23" - - "198.252.153.82" + - "85.17.92.143" name: leech +platform: + major_version: "0.6" + version: "0.6" service_type: user_service services: - mx @@ -127,15 +134,19 @@ ssh: ports: "60000:61000" port: 4422 stunnel: - couch_client: - ant_5984: - accept_port: 4001 - connect: ant.demo.bitmask.i - connect_port: 15984 - thrips_5984: - accept_port: 4000 - connect: thrips.demo.bitmask.i - connect_port: 15984 + clients: + couch_client: + ant_5984: + accept_port: 4000 + connect: ant.demo.bitmask.i + connect_port: 15984 + original_port: 5984 + thrips_5984: + accept_port: 4001 + connect: thrips.demo.bitmask.i + connect_port: 15984 + original_port: 5984 + servers: {} tags: - demo - seattle @@ -562,3 +573,4 @@ x509: aqXFA4DlcGkygA40hl2lB5NJbQVSHXXjgpAb395dasMyH8cblC34Lw== -----END RSA PRIVATE KEY----- use: true + use_commercial: true diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml index 3a5b0bf..3ca1ee0 100644 --- a/hiera/millipede.yaml +++ b/hiera/millipede.yaml @@ -13,7 +13,7 @@ domain: name: millipede.demo.bitmask.net enabled: true environment: demo -hosts: ~ +hosts: {} ip_address: "198.252.153.83" location: country_code: US @@ -24,6 +24,11 @@ mail: smarthost: - leech.demo.bitmask.net name: millipede +obfsproxy: + gateway_address: "198.252.153.84" + scramblesuit: + password: JFEV6NCYIV3FMV2CIZBVMNDCPJDUGUKE + port: 19538 openvpn: adblock: false allow_limited: false @@ -46,6 +51,9 @@ openvpn: second_gateway_address: ~ unlimited_prefix: UNLIMITED user_ips: false +platform: + major_version: "0.6" + version: "0.6" service_type: user_service services: - openvpn @@ -85,6 +93,9 @@ ssh: enabled: true ports: "60000:61000" port: 4422 +stunnel: + clients: {} + servers: {} tags: - demo - seattle @@ -185,6 +196,9 @@ x509: xIAokTRYLx/6lq8bwelCPGVjy7EsGXt9aN+gMb4R3L9vA/NQrXu+dmCJKPE1vUHF gkVBxxt/s0R2aKM= -----END CERTIFICATE----- + commercial_ca_cert: ~ + commercial_cert: ~ + commercial_key: ~ dh: | -----BEGIN DH PARAMETERS----- MIIBngKCAZcAsTaQV6TwbN9PpD6dYdXz0lA0drrXLRvS8rNoMTaDnIv134RwKwsb @@ -226,3 +240,4 @@ x509: WVHhd08IF7vrVOiHIn3TeXsSRV+RR079ikzCTc7ueaZhHMlg/p0= -----END RSA PRIVATE KEY----- use: true + use_commercial: false diff --git a/hiera/monitor1.yaml b/hiera/monitor1.yaml index 3893d12..9071644 100644 --- a/hiera/monitor1.yaml +++ b/hiera/monitor1.yaml @@ -52,6 +52,11 @@ mail: smarthost: - mx1.bitmask.net nagios: + domains_internal: + - cdev.bitmask.i + - demo.bitmask.i + - dev.bitmask.i + - unstable.bitmask.i hosts: couch1: domain_full_suffix: bitmask.net @@ -113,6 +118,9 @@ nagios: ssh_port: 22 nagiosadmin_pw: Y_uRtQby7LtwXxFRhIv_qVVrwWHzYrQq name: monitor1 +platform: + major_version: "0.6" + version: "0.6" service_type: internal_service services: - monitor @@ -163,6 +171,9 @@ ssh: enabled: true ports: "60000:61000" port: 22 +stunnel: + clients: {} + servers: {} tags: - local x509: @@ -587,3 +598,4 @@ x509: exVX87n7WqrJ9tG9aM0KVRNONhucBKICpzmPCCeFWsehWImIlsfn4nda -----END RSA PRIVATE KEY----- use: true + use_commercial: true diff --git a/hiera/mx1.yaml b/hiera/mx1.yaml index f80d598..9bf16bc 100644 --- a/hiera/mx1.yaml +++ b/hiera/mx1.yaml @@ -18,17 +18,21 @@ domain: enabled: true environment: local haproxy: - servers: - couch1: - backup: false - host: localhost - port: 4000 - weight: 10 - couch2: - backup: false - host: localhost - port: 4001 - weight: 10 + couch: + listen_port: 4096 + servers: + couch1: + backup: false + host: localhost + port: 4000 + weight: 10 + writable: true + couch2: + backup: false + host: localhost + port: 4001 + weight: 10 + writable: true hosts: couch1: domain_full: couch1.bitmask.net @@ -47,39 +51,42 @@ location: ~ mail: smarthost: [] mynetworks: - - "199.119.112.5" - - "192.168.5.5" - - "199.119.112.9" - - "192.168.5.9" - - "202.85.227.204" - - "199.119.112.10" - - "192.168.5.10" + - "176.53.69.127" + - "176.53.69.13" + - "176.53.69.14" - "176.53.69.21" - - "204.13.164.162" - - "198.252.153.85" - - "85.17.92.143" - - "204.13.164.171" - - "199.119.112.4" + - "176.53.69.22" + - "176.53.69.23" + - "192.168.5.10" + - "192.168.5.12" + - "192.168.5.16" + - "192.168.5.19" + - "192.168.5.23" - "192.168.5.4" + - "192.168.5.5" + - "192.168.5.8" + - "192.168.5.9" + - "198.252.153.82" - "198.252.153.83" + - "198.252.153.85" + - "199.119.112.10" + - "199.119.112.12" + - "199.119.112.16" + - "199.119.112.19" - "199.119.112.23" - - "192.168.5.23" - - "176.53.69.14" + - "199.119.112.4" + - "199.119.112.5" - "199.119.112.8" - - "192.168.5.8" - - "176.53.69.22" - - "199.119.112.19" - - "192.168.5.19" - - "176.53.69.127" + - "199.119.112.9" + - "202.85.227.195" + - "204.13.164.162" + - "204.13.164.171" - "204.13.164.57" - - "176.53.69.13" - - "199.119.112.12" - - "192.168.5.12" - - "199.119.112.16" - - "192.168.5.16" - - "176.53.69.23" - - "198.252.153.82" + - "85.17.92.143" name: mx1 +platform: + major_version: "0.6" + version: "0.6" service_type: user_service services: - mx @@ -121,15 +128,19 @@ ssh: ports: "60000:61000" port: 22 stunnel: - couch_client: - couch1_5984: - accept_port: 4000 - connect: couch1.bitmask.i - connect_port: 15984 - couch2_5984: - accept_port: 4001 - connect: couch2.bitmask.i - connect_port: 15984 + clients: + couch_client: + couch1_5984: + accept_port: 4000 + connect: couch1.bitmask.i + connect_port: 15984 + original_port: 5984 + couch2_5984: + accept_port: 4001 + connect: couch2.bitmask.i + connect_port: 15984 + original_port: 5984 + servers: {} tags: - local x509: @@ -554,3 +565,4 @@ x509: ZxgCM4SPY7CPwZOXfXvV3suBehvJ1FJIWGz45wJAeBvH+sHIlTi4cw== -----END RSA PRIVATE KEY----- use: true + use_commercial: true diff --git a/hiera/octopus.yaml b/hiera/octopus.yaml index 98348bd..6feb02a 100644 --- a/hiera/octopus.yaml +++ b/hiera/octopus.yaml @@ -80,6 +80,9 @@ mynetworks: - "204.13.164.57" - "85.17.92.143" name: octopus +platform: + major_version: "0.6" + version: "0.6" service_type: user_service services: - mx diff --git a/hiera/panda.yaml b/hiera/panda.yaml index fd6ec6d..2a04d39 100644 --- a/hiera/panda.yaml +++ b/hiera/panda.yaml @@ -74,6 +74,9 @@ mail: smarthost: - octopus.unstable.bitmask.net name: panda +platform: + major_version: "0.6" + version: "0.6" service_type: public_service services: - couchdb diff --git a/hiera/plain1.yaml b/hiera/plain1.yaml index f9dd40f..0803790 100644 --- a/hiera/plain1.yaml +++ b/hiera/plain1.yaml @@ -13,13 +13,16 @@ domain: name: plain1.bitmask.i enabled: true environment: local -hosts: ~ +hosts: {} ip_address: "10.5.5.53" location: ~ mail: smarthost: - mx1.bitmask.net name: plain1 +platform: + major_version: "0.6" + version: "0.6" service_type: internal_service services: [] squid_deb_proxy_client: true @@ -59,6 +62,9 @@ ssh: enabled: true ports: "60000:61000" port: 22 +stunnel: + clients: {} + servers: {} tags: - local x509: @@ -123,6 +129,9 @@ x509: eETeBOj/+0v63CmHRfJ6Z98xO/MJSZFFjGS2//qTIK5xzgv/KGsCc6kAG1hraxQD Kr4RCrkqLyEJCJE59qGTrFnOgSL5Eg/RoCH/VEWLi/ExnlcAjaOlqA== -----END CERTIFICATE----- + commercial_ca_cert: ~ + commercial_cert: ~ + commercial_key: ~ key: | -----BEGIN RSA PRIVATE KEY----- MIIEowIBAAKCAQEA1ziNA/5axlzBHy237cP9U1Fw9flwUp1cxQ5e5lfYHY3qKAvZ @@ -152,3 +161,4 @@ x509: HOV/+qIAtUvR2IkgKg1W26N61zzagmn0aBP+c7EBxEtSOh2+2VHm -----END RSA PRIVATE KEY----- use: true + use_commercial: false diff --git a/hiera/seahorse.yaml b/hiera/seahorse.yaml index bc7b855..eb31efe 100644 --- a/hiera/seahorse.yaml +++ b/hiera/seahorse.yaml @@ -51,6 +51,9 @@ openvpn: second_gateway_address: ~ unlimited_prefix: UNLIMITED user_ips: false +platform: + major_version: "0.6" + version: "0.6" service_type: user_service services: - openvpn diff --git a/hiera/single.yaml b/hiera/single.yaml new file mode 100644 index 0000000..d2603ed --- /dev/null +++ b/hiera/single.yaml @@ -0,0 +1,564 @@ +--- +api: + domain: api.bitmask.local + port: 4430 +contacts: + - sysdev@leap.se +couch: + bigcouch: + cookie: QnBSJJBxjqAz6KDnGMsQyW844XrIJBY7 + ednp_port: 9002 + epmd_port: 4369 + neighbors: [] + master: false + mode: multimaster + port: 5984 + users: + admin: + password: _Bn6AqU54shspQxbnsQTpRySjLQKTjBh + salt: 3195fb6efdbf4b4825026116d5aaabfe + username: admin + leap_mx: + password: Fc3qYjjVuwWAEyGDYPGYqUYUqeqJIfba + salt: 071d214afa9e7cfb9cba66575817f6fe + username: leap_mx + nickserver: + password: bJFrsP5dXGuegQIT5jZXMYMITpT5w5YR + salt: 73567fc12c27a79152620084e97b4fba + username: nickserver + replication: + password: s5Jn4AVnDgzu5sFzUR74akrB_yyqdNGc + salt: 63967ed2cd906c68917ea565b38b08df + username: replication + soledad: + password: E9at8FUjuxTEJEPEvACk9DWjWnR5rbKp + salt: e2b6fa1a29b1afbe1ea4a3f7ec5bacc7 + username: soledad + tapicero: + password: fCffkJygcPHSRmTePxXeAMSP6uQSQKnR + salt: 81bf56d4a7aab971412407d3a0c06462 + username: tapicero + webapp: + password: pg9XGGdt4Dr3WcM9PYDqMmxxKHTpvsc9 + salt: 7e8868f8c4775290fd37d2f520d13672 + username: webapp + webapp: + nagios_test_pw: uI_cYvPGNDZrcXTVLH_x88QFWjJ2yCZT +couchdb_leap_mx_user: + password: Fc3qYjjVuwWAEyGDYPGYqUYUqeqJIfba + salt: 071d214afa9e7cfb9cba66575817f6fe + username: leap_mx +definition_files: + eip_service: |- + { + "gateways": [ + + ], + "locations": { + + }, + "openvpn_configuration": null, + "serial": 1, + "version": 1 + } + provider: |- + { + "api_uri": "https://api.bitmask.local:4430", + "api_version": "1", + "ca_cert_fingerprint": "SHA256: a1bec1699d1a57ce37ad48ffc30a6ebb21a0d233b5a9250753d345a7bf40844d", + "ca_cert_uri": "https://bitmask.local/ca.crt", + "default_language": "en", + "description": { + "el": "Bitmask είναι ένα έργο του LEAP με σκοπό τον έλεγχο της απόδοσης και της αξιοπιστίας του λογισμικού LEAP. Bitmask τρέχει για τις τελευταίες αιμορραγία άκρο του κώδικα LEAP, και θα έχει πιθανότατα περισσότερες δυνατότητες και λιγότερα αξιοπιστία από άλλους φορείς παροχής υπηρεσιών.", + "en": "Bitmask is a project of LEAP with the purpose to test the performance and reliability of the LEAP software. Bitmask runs on the latest bleeding edge of the LEAP code, and will likely have more features and less reliability than other service providers.", + "es": "Bitmask es un proyecto de LEAP con el propósito de probar el rendimiento y la fiabilidad del software LEAP. Bitmask corre la última versión del código LEAP, y es de esperar que tenga más funciones y menos fiabilidad que los proveedores de servicios." + }, + "domain": "bitmask.local", + "enrollment_policy": "open", + "languages": [ + "el", + "en", + "es" + ], + "name": { + "en": "Bitmask" + }, + "service": { + "allow_anonymous": true, + "allow_free": true, + "allow_limited_bandwidth": false, + "allow_paid": false, + "allow_registration": true, + "allow_unlimited_bandwidth": true, + "bandwidth_limit": 102400, + "default_service_level": 1, + "levels": { + "1": { + "description": "Please donate.", + "name": "free" + } + } + }, + "services": [ + "mx" + ] + } + smtp_service: | + { + "hosts": { + "single": { + "hostname": "single.bitmask.local", + "ip_address": "10.5.5.62", + "port": 465 + } + }, + "locations": { + + }, + "serial": 1, + "version": 1 + } + soledad_service: |- + { + "hosts": { + "single": { + "hostname": "single.bitmask.local", + "ip_address": "10.5.5.62", + "port": 2323 + } + }, + "locations": { + + }, + "serial": 1, + "version": 1 + } +development: + site_config: true +dns: + aliases: + - api.bitmask.local + - bitmask.local + - nicknym.bitmask.local + - single.bitmask.local + public: true +domain: + full: single.bitmask.local + full_suffix: bitmask.local + internal: single.bitmask.i + internal_suffix: bitmask.i + name: single.bitmask.local +enabled: true +environment: local +haproxy: + couch: + listen_port: 4096 + servers: + single: + backup: false + host: localhost + port: 5984 + weight: 10 + writable: true +hosts: + single: + domain_full: single.bitmask.local + domain_internal: single.bitmask.i + host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMb8quTUv+6HgRT50xFYcyCC6BwqdZiTQvjms9Xqy9lyfDQHg18Uuw6VoPIcH2Sr3qaJffL9j4sEigiFTuYzGrk=" + ip_address: "10.5.5.62" +ip_address: "10.5.5.62" +location: ~ +mail: + smarthost: [] +mynetworks: [] +name: single +nickserver: + couchdb_nickserver_user: + password: bJFrsP5dXGuegQIT5jZXMYMITpT5w5YR + salt: 73567fc12c27a79152620084e97b4fba + username: nickserver + domain: nicknym.bitmask.local + port: 6425 +openvpn: + allow_free: true + filter_dns: true + free_gateway_address: "10.5.5.64" + gateway_address: "10.5.5.63" +service_type: user_service +services: + - couchdb + - mx + - soledad + - webapp +soledad: + couchdb_soledad_user: + password: E9at8FUjuxTEJEPEvACk9DWjWnR5rbKp + salt: e2b6fa1a29b1afbe1ea4a3f7ec5bacc7 + username: soledad + port: 2323 + require_couchdb: true +ssh: + authorized_keys: + azul: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEA2rpPukC7v43Q9RvYgxAx1aDsem7+eZvvSKR+Uvkb0yRvI4h56eds1Cj0pOFOCinjIMyw+LkrhcubWDtFYzC1yTHUUcjSoIi2M+TurQZdTkMnsg2u34U61+EjOPb2jYdxBwUu9e/wDRGqih7FjFYCsHFMPH1ENVS+LZeerXn1F344HIP8VhLpWSjLAKgfMUCuvoTEqNaR4I90w1PAG0uRslYouTuxOA3VOCnf75FW7b4ZuBw1y2rmWcz9Rm5M4tz3EQCeX8v+AIKd6QQU0gFSytcelQtBVqu0YjnnL5Lp+fcKw3BJO+QQXk+OyYqGuP9WQfPPki2tEDHJ9rHcPD3l+w== + type: ssh-rsa + chiiph: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDAotYxNrKKXihZrDd39iKrXZSm3r8L9SNzhe9JG6cPaLTYuxhrS9QejYih9noboWfsVFmNPFYH42u3/vMyJEtf1WEUqQ84Qh2oQaC3orGMdpo3fXlCwlcp9q55gZTbSkpKwjn4pmg++wdTNjMmldi1ifPDl2uVt7dUkjQk8hy7CTJofkTxrXIzGZx+OI0knuos+lNV1uU3nJ6upbBwkvxwy3S9nfZ9kq7y5PBo0wK9YkOrKIAZtCnb0nobOiFMPeQDJdBWIo0btv5tCtzqe/b28TYz6DrMWrLIEJ+t8PH6QxaB0oLtlx5fImRxykLVHEe9AO1WcV0aXW4+6ZsHRG4X + type: ssh-rsa + db: + key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCZoVRqaxZL4Btmt7Nfcj0jNbM5UhBSFl37MWApS9qUlx1zJeH7Vw1ZRzUT8zLtdpOyL4JrF1jJ+D25/dqdTEv5dc7I/IcUz16uVD3REi9wk9uRo05DmG1PXQ0Pp3kRGhNFTh5e1ZeGbPlxZkHyUirWGz8A6hrPTUA/k+KRsQg4nH+3UTPzZcy3jvw6YvdATFNkZ5dhKyae9T41McBEdh5yPArfuVTL/ssckTxyISF5ObsvbzuuarTeNQQO5VpFvK9luKzXpta9IRHMeAHpu88MCiMcWiZUZlaVlD9tC6OcMNxCBWWMlNwtowgBmoIZnjo7NrMsJ1ksUT4eDsvf6huu9nX3KIigSUeuWPtaPMHCghhLXLQSuIOhQWXjFzl+KzgiOZ4ahmNMqiCaRFHAHw6BRuZRxphiMq2gjvKRg6a4giDIf9gkEQ6v+tiUQoGYXuwfb0sGVJfrnZVifUz+I1j0wWCBWaY7+/LtfaNIl1byyPzG+qRhHMUlj/IALnT4DuHM+VkXNyQ0fucGcyhFxabqfdxRUT0EQok8ib06f16JBCoqdd6bn64v1M29QGFeSF0t4zjqqDik7VQvOMph2WAZv9FwhvPrmbSSs3MIe7wVBaFC8zeavrZ8oCO1U40q2UcntO6Z0NpIhnGZC7zVxguEux1moAtWIE0+JIsrbu41gQ== + type: ssh-rsa + elijah: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== + type: ssh-rsa + jessie: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw== + type: ssh-rsa + kali: + key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDOrTTNY60n/eMKFG4twVfInoO54HEqK2wlETb+Pe91W4sOSPaBtsP4xvk1hj/7WVg1fUN7B2MhYHZRmppyS2eMQGlaBbziFzlm3+rqn997l4CZxxkFsCINFvik60vQjdWn1Qh5gtaTWPLp8igjF43+3FdZZk8arS2AQgHixQdZ0XfjpBvvxpP3DI/VEOgOaCEI8XkDj8WTAkeQxrFmX3/TxbvGARdfYvJwYEC2qE3WABbI+DVOJfLsFmv8RW62ax8ErA63Yy3RWsgnv2Nzxwi6o6MmWcr14f1gpPybPK8KrZNJoJkDVceDTVwdTxwUfjOrI8df8NiFLVR3/lEGX+Cnd0UeKzk5Tqy84g1+MDGWkRDVyplB24fFxi/ujInlasew3uTYS2waZkNrroU2B8VO36xj8C8bn2sf3818hvjS4XD+lvpwKrKaWwWFTM89Xvu/K9KHFn3+58EbcyE88MAzuqrgDarkeXCdVT9Re0OUchmul3JOz9OnV1Osv0yi9pRCaAGTKAivnbN8DwmALz8d9FBTMxbcBgEqqGvyNe7muYTQtvTvfcKHdtF/MlTibte8YIbj7UX+c19A1VxX1eFU7mbfSxW1zXok1D0o+cUfcyUFauq6YMNDK1+FrMID+Mrm86woKB5gOmQRLJ9BARcKl9GZY2YnQAat9hRHQR8O2Q== + type: ssh-rsa + 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 + micah: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEA1lHzO6il/4+V+KSiJZy34mxBKJNrn9Ah7VBxa3ss4AnahDgVwYqGlLk8xe45CShLRlu3nP4ccX06LUCJOBuLI2QZccR6+h2jfIEjXIaNC8lp12thIriEPUWZaKwV04fnhOnpA/VzNCRri8DOCuNvA8pfjg51DUtvhEuIV9UNxHCsLFSNg8RPngqNxrDgZJvjIMFFdTyOl0OdE1sN1zG2A6UPTlqO7Tmt6+/AByAS/C519nL0MIDix1S93sqaxaIE4kZSmVVx7Ft/albzWSIhIF/UbLxqfkc6L0HV0OpvBPMMuYUZkLC3DfAMggkxJsTTHkcR2Z1fIQ3P9am75WSwGw== + type: ssh-rsa + monitor: + key: AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFqCXlaYmqZqbefpMBaMPqzjhYNaxejlOX/x8YCXsDN2HMfeb/E/FYfpEPCuLVJ5Z0aDkp76JL9i1CX/9Rcbq4DEQEc6vkEv79MOI2jfUCVVeWRcybvRK0YAT9eQK59+FgNDbEo2NCUWBRvKd+8TjzZ7GtCLDnGd6+gkr6orkiA3uus/A== + type: ecdsa-sha2-nistp521 + varac: + key: AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8= + type: ssh-rsa + mosh: + enabled: true + ports: "60000:61000" + port: 22 +stunnel: + clients: + couch_client: {} + ednp_clients: {} + epmd_clients: {} + servers: + couch_server: + accept_port: 15984 + connect_port: 5984 + ednp_server: + accept_port: 19002 + connect_port: 9002 + epmd_server: + accept_port: 14369 + connect_port: 4369 +tags: + - local +webapp: + admins: + - elijah + - etest1 + - kwadronaut + - mcnair + - meanderingcode + - micah + - varac + allow_anonymous_certs: true + allow_limited_certs: false + allow_registration: true + allow_unlimited_certs: true + api_version: 1 + client_certificates: + bit_size: 2048 + digest: SHA256 + life_span: 2m + limited_prefix: LIMITED + unlimited_prefix: UNLIMITED + client_version: + max: ~ + min: "0.5" + couchdb_webapp_user: + password: pg9XGGdt4Dr3WcM9PYDqMmxxKHTpvsc9 + salt: 7e8868f8c4775290fd37d2f520d13672 + username: webapp + customization_dir: /etc/leap/files/webapp/ + default_service_level: 1 + domain: bitmask.local + engines: + - support + git: + revision: origin/master + source: "https://leap.se/git/leap_web" + modules: + - billing + - help + - user + nagios_test_user: + password: uI_cYvPGNDZrcXTVLH_x88QFWjJ2yCZT + username: nagios_test + secret_token: btsFN6UD9nfP4SAWDYMmuMkgRTL5WW7E + secure: false + service_levels: + ? "1" + : + description: "Please donate." + name: free +x509: + ca_cert: | + -----BEGIN CERTIFICATE----- + MIIFczCCA1ugAwIBAgIBATANBgkqhkiG9w0BAQ0FADBMMRAwDgYDVQQKDAdCaXRt + YXNrMR4wHAYDVQQLDBVodHRwczovL2JpdG1hc2subG9jYWwxGDAWBgNVBAMMD0Jp + dG1hc2sgUm9vdCBDQTAeFw0xNDA4MjcwMDAwMDBaFw0yNDA4MjcwMDAwMDBaMEwx + EDAOBgNVBAoMB0JpdG1hc2sxHjAcBgNVBAsMFWh0dHBzOi8vYml0bWFzay5sb2Nh + bDEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOC + Ag8AMIICCgKCAgEAzuIeBC8NWSTZF7j3WJTiH532vZ0Xn9zZ0+ge4Va3vKt/8H3u + xrWdjIdBF86D+e5FlObF9rqmN0AfGUv9K/ex2BAa09BzK+P5dmBoUhHUMNJPXUKy + 0oCNM6KXZkSD3SsGO1jCyolvtY/RR8t95yALy0bs8dDqA+wzM5UvQIoDWBeJaoVV + UQkbsO42HxF6c+IBe4I8o0RM1mbNC3cKOs4QnYxSMqv17MnomWZZu7ZguNH95TxU + RAR0Fw+A68OSEBev+t9NJ3dly5H0pp1pNeqKzIu8F9P+0c/PWG2ZV3TePgZt+JuF + SiIWjTbF58wbOszfqlsKRI3qBuFXgti5eCGQjSsJQOm2oaqTUaSSa3iFmC0al75k + AAgVB0iS6BJoDYoUfgeQoP1jCV5glGZbVc/WZOJx/m14pB8SV5KQ5OHM1pM+kZcC + yJi+9QrjdwsnPoAA+erQpXERufv6ce2E7YknusHV5U/ULJ32NFnvWFs4Gy0adjYz + XleEl83OBN+8f4ETQK6e17oxVkgFZ1ajwaKxhI9wgYwQ4mYJ/pOp93YgDJ7o2St4 + h7dbfABxb7Nteug1bMxotbHWz92otspafeP9+4Cu/d8Q1XbV9wlNy/OFHBcHp7AV + cwjV3cBMg9gABXcKITwxvED1G9zoEWFS0MNk3Gc6RfJZefA+wCLRgz1pb00CAwEA + AaNgMF4wHQYDVR0OBBYEFOS3wnWViCsm2V7AN9zNGeaQPtejMA4GA1UdDwEB/wQE + AwICBDAMBgNVHRMEBTADAQH/MB8GA1UdIwQYMBaAFOS3wnWViCsm2V7AN9zNGeaQ + PtejMA0GCSqGSIb3DQEBDQUAA4ICAQAo56u3499+60Q34+p4N0Xa/WP1ucLM23/7 + ZItAQfBgKP9nCCepTpZrE1h+pHYuAbZTR7muJ5tBgLWAH6XXNXHGe+BL8V+DlUdC + TnDnhIemc+OSoIc+AM7efgBEX7ART2saMIedCkHqB3x596EEByuwekTsDhpG+eq4 + 4HWW6YNQIIPhjUthi+Z/fKpAqhXtkbisQ0zyDCjQc5EsdZdg1dRS6c46q5CFXnZI + iWaBwMdzvg1uNF+euai+2XMbtdhAZWTF2fC4zCkJ7TOJLu+w87YmaV6mhnbmZX2G + eUOWhlzwBUoxZWMLHQ5YjV+FEqO3Zbs08ph6l4PJkwPNnc3oUYyFUNDT+cF723Uh + mg9MIY/fLxNfuZIt++q1gDJgi64hL2+I9aEzMVmjZ0hCnre061cX60TU20oSJRJJ + z7D9JQA4Nq7XxkrSBA3/UhVCH5crF2NwTzJx3fwW4FMnDA4W3DsHOSUpgq6WBrMa + GGPH6sbq21EZXkzpi3XtrQokNQL50lULvJqZID0KGlBmwpcXwBaP7H/0FxVNDvCZ + cSxp7nUenwZ6VnSKASIhveEoL7FkTuJRHlEfr1V9NzUdvFqq/51gm+g34HcdxtcW + r5BsKNPa4cNsGFfLV7XRMnz146pswhKJ5+QzUKGoospnyybez7lWw8K2w7wlIPHb + D2FUi3Y39Q== + -----END CERTIFICATE----- + cert: | + -----BEGIN CERTIFICATE----- + MIIE4DCCAsigAwIBAgIQHOYg9efmaHPDsJiUt11PzjANBgkqhkiG9w0BAQsFADBK + MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa + BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQwODI3MDAwMDAwWhcNMTUw + ODI3MDAwMDAwWjAfMR0wGwYDVQQDDBRzaW5nbGUuYml0bWFzay5sb2NhbDCCASIw + DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALNd2wmCASd0w6aZlXZJv/t1HcvH + Jiyob8J+DZ0gyv8izRz7foigZAKWpi8H4vFf04yWI13hZNBp+DJsM7imDdcXCzI4 + vy8NYsXVPBNqiy9uZldKblls3ui/qh+cyLwQ4y4usLmGy/hxvVspo9ECyNGdw5KK + AzDYfhgGgDLyTIUE3rBWCyM9w+F8qdB5tBc/6vDk2I3IJIkNhwdBmcq9BTbIvjCn + PWG763uNV/DC0FCGog+1RIoZBMLzb2bZUkJ1C4x/oAtL/rAOzKERL3nKLDyUcbNi + TICFyzbcVf+45u879qWvEjcHBUWLvEmEdqc5D3YYtZMTDFfubVQDRWthwj8CAwEA + AaOB7DCB6TAdBgNVHQ4EFgQUHREU/5qWnzAv37pBMmkMdBtomP8wcAYDVR0RBGkw + Z4IRYXBpLmJpdG1hc2subG9jYWyCDWJpdG1hc2subG9jYWyCFW5pY2tueW0uYml0 + bWFzay5sb2NhbIIQc2luZ2xlLmJpdG1hc2suaYIUc2luZ2xlLmJpdG1hc2subG9j + YWyHBAoFBT4wCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF + BQcDAjAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFLmBgyy9rLMJ2KRx7z66LdSVPg+P + MA0GCSqGSIb3DQEBCwUAA4ICAQBeGvIr2k08H+jcjL8KwZeXlCdfp1mG+cHXk8j/ + eIuWcWXW4umiCDLoDPRikjuPcuTbK2Ca+M+MoVegH6W368iRn6a/vMJvSrqLEz3e + AaVH9+NxAoa6+TzvcEcDJ8cotVJS3ou90hFACQserzXl8LqwIgVqVkPHWXNkz/gv + J1h1Cn6siYkzDHeBrq1Uqp4Ma0sFMmvu91MrxY4u1Tctw4pjQPzIVhXIRjsmSXYc + tIQQ3aJnt17oEQRHbMAY6YZ1kn6KXB8Cb5xSlj03nlZxfVn8eVc6MHkCIwwWuas0 + 9XicB6rKOkAJ1Kd0kzyGA+tO3qUM9vsbQL8N/FH0h10gwkakEX3RwzHeGgmhBwwT + CX7zYL4z5MfhBvR0DajTm1sxALJYqrWLmj0w/p7PF5wlO37WKTGud+zKtAG6BEj2 + 0/blwqiZv/6JPeYUuKJZBjoQs7AeyVa1mnmbakKRPhn1sBBXnb/ROGQKmpdYNPTF + mlxgWDQ2Sq+FRXCJX+ADy5UOsF/MkKZ9go7LjKTXfUndwXeEaNZ2WlR0UlPX7OXM + n15hPtcJ9hNufNbEDmzHvJWwU/1r7g5HmCvAg6CTzD6/67Ni3g6viKPh3b8oiQAI + aBV6p/F5kJcNHog3siMPKoUn/uQcSSpSQzPAE/nL4eMaBLqIAhxORQWzM3S8LwtU + hUwrQg== + -----END CERTIFICATE----- + client_ca_cert: | + -----BEGIN CERTIFICATE----- + MIIFqzCCA5OgAwIBAgIBATANBgkqhkiG9w0BAQ0FADBoMRAwDgYDVQQKDAdCaXRt + YXNrMR4wHAYDVQQLDBVodHRwczovL2JpdG1hc2subG9jYWwxNDAyBgNVBAMMK0Jp + dG1hc2sgUm9vdCBDQSAoY2xpZW50IGNlcnRpZmljYXRlcyBvbmx5ISkwHhcNMTQw + ODI3MDAwMDAwWhcNMjQwODI3MDAwMDAwWjBoMRAwDgYDVQQKDAdCaXRtYXNrMR4w + HAYDVQQLDBVodHRwczovL2JpdG1hc2subG9jYWwxNDAyBgNVBAMMK0JpdG1hc2sg + Um9vdCBDQSAoY2xpZW50IGNlcnRpZmljYXRlcyBvbmx5ISkwggIiMA0GCSqGSIb3 + DQEBAQUAA4ICDwAwggIKAoICAQCs8hK5EjnDjJVOKc4ZbDYFmM9PcilYtw3lb9yt + DcT8EY5qzfU4SkuV+I8UGSx4s2YC3oro4nDKNPm75RTpml5BOXKAGUp7/1+wBKoO + +pGeS52BsuNsrQKUbP/x+6XpuhSp3IVsVKcKJmDyOaJOJRj2DfaoqcpKM55gr/ot + meq+gJwL2wpD8015jkVERWg3l2I0Dj92cW4Qs4dJ+7JjI5idN5ShXXVmwvPQDa8H + c6SHd0j0BK92FB1O3GyPr244i6e0qdPGZhK0KC9pUru1ZYCWj7Jjr8RYCmK+jw0k + pc8TKph5tjLl5VEuDO8ZTtG+1Z0Vx2uSyCsAjH/PhzheqdfbNPAde/D8AKyLlDwm + U4h3R73GKAJcVS1A0DR1kqZ2spBz4HmmmcXcoQ++KdAmLOPBsIWhwhRGuzGdwQgR + eslm8oNkpToU3J/pMbpiBHEUSv5MKZJF7GTKRN8c69XIK2OebEZ8+DYuvi4uBjeZ + 9eydmT9VVN4h8R2E2572c36e/uWUhYdZrlienBBwNDe4Vuqmc+M0EwQQnQLl9XID + dQSN66Ao7zLQOenYrwM4/w3d7rhPXlD7DpYJHWCR4eP73jR7DOV2u3aX90B580MW + 8NjdyJS3gnjPKTCCq8vIolkHCGPqmpDzbajwqQvVsMnCaTV77zZtyLvodc5G/7gB + jZnreQIDAQABo2AwXjAdBgNVHQ4EFgQUD8GCfb8mWh3JNXAnvu2ObnPo/mwwDgYD + VR0PAQH/BAQDAgIEMAwGA1UdEwQFMAMBAf8wHwYDVR0jBBgwFoAUD8GCfb8mWh3J + NXAnvu2ObnPo/mwwDQYJKoZIhvcNAQENBQADggIBAIFO6f9ZUa6221jMGRMROe8X + XnQLoIX9AGkLG9Rpu/9PVnN/NoK1/MWoA7+qix1Pdaj1Skpz+yUmKGSGo6Oq4XRf + K2DNoy+BYjRauZVreLkE1QUuxzP1DQg0ej3hRl31c/Kv+KaMJy1ptrhFEbhP1yYk + b9Fayu6kuc96Xd8o0ARh6NAA4HysW119awDUsMANVm1VGuPTojdV3/Yn3bywCwG8 + B6Fqx2EfI6YptsNhzzm+o9v1VjXE+BQ4zbfmgY7uORqVY7b+5gK2+D5FAN4hsGbn + jiPo8G7Azv4VtmBcKROXbCf6B8tQA/Z3uFgfTHxM8iEaGsgnh8IUB1idnNmeUxqL + QcH5TRf8RAMr8xgYueyiWPR0NEAahrojvoNQGYPW5EdqJd4JzfqYNRnccTXAIF9F + VSCBPPtg4Ifc3Bfs9PObG2/2WJGkwJLevpdj00SO5otc+wWl/MG3eQlksceWtXJC + Laoxpno11oA6fwqxxIsqjCCCzwE+WL9xtEgaNoJ+bvB1DuzCoZ/MF0Q4nmQw5o0o + E8ODAhuMkfSz6Mwk+56iNTRV0hpKhADtVWuVsXd6Vmcyu4fX5IJ6vPzyCkal63L0 + K7TGCQJQeQnI52RkX3zpLIWA8SYp28qC+81dBdKEXPOs0MDHn5zWpnR8xHjs5jki + WOtY6TTfYq8pBdwToAQu + -----END CERTIFICATE----- + client_ca_key: | + -----BEGIN RSA PRIVATE KEY----- + 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 + -----END RSA PRIVATE KEY----- + commercial_ca_cert: | + -----BEGIN CERTIFICATE----- + MIIEozCCA4ugAwIBAgIQWrYdrB5NogYUx1U9Pamy3DANBgkqhkiG9w0BAQUFADCB + lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug + Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho + dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt + SGFyZHdhcmUwHhcNMDgxMDIzMDAwMDAwWhcNMjAwNTMwMTA0ODM4WjBBMQswCQYD + VQQGEwJGUjESMBAGA1UEChMJR0FOREkgU0FTMR4wHAYDVQQDExVHYW5kaSBTdGFu + ZGFyZCBTU0wgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2VD2l + 2w0ieFBqWiOJP5eh1AcaqVgIm6AVwzK2t/HouaVvrTf2bnEbtHUtSF6fxhWqge/l + xIiVijpsd8y1zWXkZ+VzyVBSlMEnST6ga0EWQbaUmUGuPsviBkYJ6U2+yUxVqRh+ + pt9u/UqyzGxO2chQFZOz8unjwmqtOtX7w3lQnyV5KbJHZHwgPuIITZMpFLY0bs9x + Rn52EPT9bKoB0sIG3pKDzFiQLpLeHmW3Yy89sutwjEzgvhWd3sFNVvgLxo4HuV3f + lfB7QB8aLNecK0t29Fn1Q8EsZhCenmaWYJ0cdBtOGFwIsG5symkaAum7ynjvZi7j + Mv1BXJV0gU302v5LAgMBAAGjggE+MIIBOjAfBgNVHSMEGDAWgBShcl8mGyiYQ5Vd + BzfVhZadS9LDRTAdBgNVHQ4EFgQUtqj/oqgv0KbNS7Fo8+dQEDGneSEwDgYDVR0P + AQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwGAYDVR0gBBEwDzANBgsrBgEE + AbIxAQICGjBEBgNVHR8EPTA7MDmgN6A1hjNodHRwOi8vY3JsLnVzZXJ0cnVzdC5j + b20vVVROLVVTRVJGaXJzdC1IYXJkd2FyZS5jcmwwdAYIKwYBBQUHAQEEaDBmMD0G + CCsGAQUFBzAChjFodHRwOi8vY3J0LnVzZXJ0cnVzdC5jb20vVVROQWRkVHJ1c3RT + ZXJ2ZXJfQ0EuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51c2VydHJ1c3Qu + Y29tMA0GCSqGSIb3DQEBBQUAA4IBAQAZU78DPZvia1r9ukkfT+zhxoI5PNIDBA+r + ez6CqYUQH/TeMq9YP/9w8zAdly1MmuLsDD4ULS+YSJ2uFmqsLUKqtWSkcLvrc5R7 + RkznehR2W0wdhKEgdB8uS1xwiNy99xk97VkN4j8m4pyspDyVHPi+jAOu8OWcTbzH + m1gAv6+t+jducW0YNA7B6mr4Dd9pVFYV8iiz/qRj7MUEZGC7/irw9IehsK69quQv + 4wMLL2ZfhaQye0btJQzn8bfnGf1gul+Hd96YB5bkXupjfajeVdphXDyQg0MEBzzd + 8/ifBlIK3se2e4/hEfcEejX/arxbx1BJCHBvlEPNnsdw8dvQbdqP + -----END CERTIFICATE----- + commercial_cert: | + -----BEGIN CERTIFICATE----- + MIIEcDCCAligAwIBAgIRAMqxAnEi09LnUmxHz34zaygwDQYJKoZIhvcNAQELBQAw + TDEQMA4GA1UECgwHQml0bWFzazEeMBwGA1UECwwVaHR0cHM6Ly9iaXRtYXNrLmxv + Y2FsMRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0EwHhcNMTQwODI3MDAwMDAwWhcN + MTUwODI3MDAwMDAwWjAqMRAwDgYDVQQKDAdCaXRtYXNrMRYwFAYDVQQDDA1iaXRt + YXNrLmxvY2FsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2flsifSE + SbAZ4GZE3594alIx0Y4wH+zPlpffAyAuH0/woIfbU0niYpjCMp2IukAkcMfwsvAy + j3I2EKimkxWBDvmaDH5fY2SB6Mk6jun4TbYNbzZxPjN5ZG1arOl9Z+nXy8rR18jJ + nXwR/QT7GeEsCUbT+GN0TamFzGqaKP5QyOhVEorzcKnxuRTFoc6N1e3kB1kq2bDK + npX376mKTFWW7OLeXH2+Eh8A2X+w8zqQTpRta6631DyynO7MLAsihiAmDlOVpIsA + hYF/jDblpqCsh7es/78Rf09I4/pqwDByU+4wcuQ2CihdMqu8qZYY0iZFSelpikhp + mjvuVug0J91CVQIDAQABo28wbTAdBgNVHQ4EFgQU6/xkpENCcBkmnS+8pjjIKFOZ + ndUwCwYDVR0PBAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAkGA1UdEwQCMAAw + HwYDVR0jBBgwFoAU5LfCdZWIKybZXsA33M0Z5pA+16MwDQYJKoZIhvcNAQELBQAD + ggIBAARhtd1EdoHrHL3HCeqo5WplQnW0bd6M+KdFTlp2o84sRwDDsRhTQ64xeZC3 + kK7h+R54cm2xzrqHs70t5UYNoYXh0DRYqCsEu9ZMfnxtye4sofGo53s5LWtkAguE + sTcpijbj95RodvGZnal+V7Z+B8yt0u0HcfFSrWv7956i3+Zcxdt+/9+FLYOzbOVj + sUnqKob3J8++PURJlPvnsgrrPPMxrRL7WfRn5njwrYNWrpOljh2G6PLcUmEHFQ/m + op8xbFwbb6mmkuyZqiQfcSci1Z/562kMR341Ba1plIvr3MPNShSzaIxyPNJrBATP + D1PUK4AORbpolhxJPjx8qfGyCKUBQKKACBRO3pBUlnHIiC21bjYJu9hev1qv9Vd0 + VPeJRHC3Y/1Bv4ptMvwIXjh3uy16TYHA7V1cUIQmKk8HzBByHTek+xupdFERyFx3 + 0LDXPu7ry3bWHKoojsgNqWRXaTVuMZilgTGmwF24gCdjMrXgWANnxhFG2UVPa7sg + 5OreMhK/jBLeXFrfTjXZtIDRdZmsgSkleUQuAlMG1yCZZud0cMebjBmCkcaada7e + 4C0WFjpZHq/4PNcoO9aFTlNzzWlTm57Otvfc+kfItEt0Tx2YrOFKuHTofGptYtFm + OsUsS1uOeX1yFG4h3y6OT1gQJaNIep6N4/Qps8l4NK/0Wn9+ + -----END CERTIFICATE----- + commercial_key: | + -----BEGIN RSA PRIVATE KEY----- + MIIEowIBAAKCAQEA2flsifSESbAZ4GZE3594alIx0Y4wH+zPlpffAyAuH0/woIfb + U0niYpjCMp2IukAkcMfwsvAyj3I2EKimkxWBDvmaDH5fY2SB6Mk6jun4TbYNbzZx + PjN5ZG1arOl9Z+nXy8rR18jJnXwR/QT7GeEsCUbT+GN0TamFzGqaKP5QyOhVEorz + cKnxuRTFoc6N1e3kB1kq2bDKnpX376mKTFWW7OLeXH2+Eh8A2X+w8zqQTpRta663 + 1DyynO7MLAsihiAmDlOVpIsAhYF/jDblpqCsh7es/78Rf09I4/pqwDByU+4wcuQ2 + CihdMqu8qZYY0iZFSelpikhpmjvuVug0J91CVQIDAQABAoIBAGyn/igCwJLu+uc2 + c6y5lNADKxxX8btoU86w5BVtzDAFrGCJeJZbJUOa/Gs4xjh50vB5ao34WGvTNgo1 + 19tIA+6QE++YazpjlrKQ5OTq0sECOE4w6GBmTmP2cxXwynerRMwszU/wojgj6d+j + xPwQl+AD85RFF2vDTpQoq7I1m9WZt1awszigmG8VDBwa/LFKfrz/HACH0lmQ6wQ1 + h+dYcKjS7K68rEhZ29cjkO7k6Il44B4/6nfPSFCXCcypZD3uNXwGGDGR9QGcBzCY + HLCveb+v3rKnIjMpAX8xi1R6LVaxX+/wRCoaMRRhWqH3mBijVV/SKDvo+AOATECM + UNDYOaECgYEA9yNhwS2zL1lZhqqejG9CPL5GaxB+Rl6cFDP2U8xUVVYZjbvjnJBb + mU0/c+zGWFlHvqgBOCW5pCFOJx7eFvpp10zVJgqH6Nbdsz/nE0+kx2PwVT+miyBT + 1CdtB8UQt4FDllYo3BToeqLlICBwuTe77UILWMjx4WPSQB/mJOlfHD0CgYEA4cpU + ogjCG4dU6W66RL4y+eP63VDBtz6kUmMHiX5xXEjn6UdYYp4TBL3VxonkMbOzHtAX + B95klqs2vl1arQf3glrv9PfVWyexWy+U/0YkibS8OGDJJUVLLRS7gZrEMGPbeKY5 + SSeEDOtkmrUW6EmrCAmwaVW24uObAtzJJH6bp/kCgYEAs3bfGvA7yauBppgp8GMu + 33txGXhtql4zyzv8qdeceie/ALyrSdtOmSGObXlIg4m53sqTsBk9GOISpbf1oQwR + ZgZmVmyZS00Uy4EhJVXVm/GH6fAB2dAM7+f9dgH15Lwav4Yrv73zIHNAHbdRBD9j + 2aP3J28srvbVDDnd33oU1iUCgYBNrD3bE+o6cB68wtOfLFL69ftpwQsyz4DVuq1w + FihHF+l3rYxxOHHQcsGkr/DpTCk1U15o3Y966WFGsXStC42QsVnUyqEB37C6bq7x + 9h5BpQQO3PS1NpY65uPuHOCayO9KHNyeFtLtYtjUA7HirN0CQdsHEW59tNCxdmRX + gppneQKBgAS27C022cGm0Qa0/X1a55G8D8MTXWe+fV6kNWJmfNca2YnWGIPJb+Ec + ISk5wkWOga3Cs9UcaJKnIbAiqaUU0VdyL0aZRaXyO6SlzgQLwpYUQ6zNzEhdgEhi + vd4rafhTMnvMUaDLjO5AVRnZ1eG+/5Gm/Y5XAvCPDqBEUlgvIRVn + -----END RSA PRIVATE KEY----- + key: | + -----BEGIN RSA PRIVATE KEY----- + MIIEowIBAAKCAQEAs13bCYIBJ3TDppmVdkm/+3Udy8cmLKhvwn4NnSDK/yLNHPt+ + iKBkApamLwfi8V/TjJYjXeFk0Gn4MmwzuKYN1xcLMji/Lw1ixdU8E2qLL25mV0pu + WWze6L+qH5zIvBDjLi6wuYbL+HG9Wymj0QLI0Z3DkooDMNh+GAaAMvJMhQTesFYL + Iz3D4Xyp0Hm0Fz/q8OTYjcgkiQ2HB0GZyr0FNsi+MKc9Ybvre41X8MLQUIaiD7VE + ihkEwvNvZtlSQnULjH+gC0v+sA7MoREvecosPJRxs2JMgIXLNtxV/7jm7zv2pa8S + NwcFRYu8SYR2pzkPdhi1kxMMV+5tVANFa2HCPwIDAQABAoIBAEYza7ES8sSwjIq9 + /aNoRf1y3xCMh0JfQi6LC2T+GrU0t7aqL+HldH8W2z/5BDeYW8HgWUM7Hiv77ao+ + cxfH1g7i8/zZ/Om7gXcQeAzZXFRaDzAG752MYMoTidAJmv8QVPoUSBK00UwRqBzv + 9S+uuU5hQtQttAYAFYntsWs/Lfe5QkDklfZ4EhVRm6R9dDbBNuraeOVkkSCJxL/Y + ei5+MLpdysKUbKb5NkVI1Olh23w0D1qJcWVv3WtO+V4i184ewT8Vb8GFK0bOGRxd + pLpVDpojH44av+HJGGbWFruBlcXzic6JJU5JWf0tu8xFpyURPAFcIW0M7T9UXwWV + LJ5c1rECgYEA4a0XAYfeyCNlVOzub5CR9DHhwt5FCPHxmdGA+pw8a2FpRq6iU7pN + r9yM2hrVmTOsM+/Zq28BAngtP0PXn9rancFx7/1FsHgp3xiz7LYAFNJoKImH6ipd + xdCkwA9yoO/owBWBc+dHK77Z1uvLgpnlfct/9DL0SfcrZr3Ngmbkzh0CgYEAy3fK + TAbSIgirJzyt0CvXub6ecZt/IV4w+P2mVTdmuCD1yC/EmyIm+shj2wLzdFUgvL6z + GQwSDVGd63/sTJ0nLii5Q6MQdS636qdWFXk3m7RUtb044TQSuIe08fZ/yc335NeR + uXbTlqGqPbvDqIMsJ79Qm8HTZ0sWhOaH+qxn0wsCgYEAyRfRrj2CGNjhjKFrfeJX + DD/+qgQhg+0DmksDIU1i0VSF2MP4RZ93ZkOjBx5uQwu2YLlTPt21CpxHxV4Qn5MG + xxf/DRikprEMro12lnE+9U7gHW8fu1txH7nhdHrPa/Ubcz42ki7+Tk7MEiUevQuh + YUyageF9qQMkm3J5078YF0kCgYBYrW3SsspUoPiPUkfiyajswGJn20CON3Iaotoi + m9G+AEd+pysF/d2FQV8b7e5TTmLFQEvoZ7Vabq7oG8nOHlQcLw2HqAMdP25S6/l9 + xGXzC6Y7yyuGI17hY+v95NQPDSC0cSuG7H4NUYpT+4ir4feVnzEvoUtU4on/BEZR + f2CEvwKBgD/I0U24VHkD2vHrkcrrSXbBRIm630xXT3Wx7Al9D/f9N5z5OJ4pmCn8 + f8nYmHwasWYUA2cMWODCQgIiblfYkewltw2K2qXByRZR98Y/OjScOWS2bwc+rMnb + cwCgFA2WXzfcw4WzZoYotzPvOWkYARur/VdJvry9UMX0ljkt64d0 + -----END RSA PRIVATE KEY----- + use: true + use_commercial: true diff --git a/hiera/snail.yaml b/hiera/snail.yaml index 72670db..2413ec0 100644 --- a/hiera/snail.yaml +++ b/hiera/snail.yaml @@ -52,6 +52,9 @@ openvpn: second_gateway_address: ~ unlimited_prefix: UNLIMITED user_ips: false +platform: + major_version: "0.6" + version: "0.6" service_type: user_service services: - openvpn diff --git a/hiera/starfish.yaml b/hiera/starfish.yaml index 4f3345c..eedddc3 100644 --- a/hiera/starfish.yaml +++ b/hiera/starfish.yaml @@ -102,6 +102,9 @@ mynetworks: - "204.13.164.57" - "85.17.92.143" name: starfish +platform: + major_version: "0.6" + version: "0.6" service_type: user_service services: - mx diff --git a/hiera/thrips.yaml b/hiera/thrips.yaml index 6d916bc..ca86ee5 100644 --- a/hiera/thrips.yaml +++ b/hiera/thrips.yaml @@ -9,6 +9,8 @@ couch: epmd_port: 4369 neighbors: - ant.demo.bitmask.net + master: false + mode: multimaster port: 5984 users: admin: @@ -23,6 +25,10 @@ couch: password: CyhRSafC4SUGQ9F762Qfv3TPQDqTjn2G salt: e3ee9259723d0cbd8b3265dbe8b4e21e username: nickserver + replication: + password: gPFMMKdZaTHF24nQGYQTDHkAduQcarBm + salt: 215a1f508e2b564978f98e43231e1506 + username: replication soledad: password: cGqWZqTdFc_fuSZvfPtUTL_7uMA6d5YC salt: 514355e86f1d3fa4de42b677de21281d @@ -75,6 +81,9 @@ mail: smarthost: - leech.demo.bitmask.net name: thrips +platform: + major_version: "0.6" + version: "0.6" service_type: public_service services: - couchdb @@ -123,25 +132,29 @@ ssh: ports: "60000:61000" port: 4422 stunnel: - couch_server: - accept: 15984 - connect: "127.0.0.1:5984" - ednp_clients: - ant_9002: - accept_port: 4001 - connect: ant.demo.bitmask.i - connect_port: 19002 - ednp_server: - accept: 19002 - connect: "127.0.0.1:9002" - epmd_clients: - ant_4369: - accept_port: 4000 - connect: ant.demo.bitmask.i - connect_port: 14369 - epmd_server: - accept: 14369 - connect: "127.0.0.1:4369" + clients: + ednp_clients: + ant_9002: + accept_port: 4001 + connect: ant.demo.bitmask.i + connect_port: 19002 + original_port: 9002 + epmd_clients: + ant_4369: + accept_port: 4000 + connect: ant.demo.bitmask.i + connect_port: 14369 + original_port: 4369 + servers: + couch_server: + accept_port: 15984 + connect_port: 5984 + ednp_server: + accept_port: 19002 + connect_port: 9002 + epmd_server: + accept_port: 14369 + connect_port: 4369 tags: - demo - seattle @@ -208,6 +221,9 @@ x509: bbeVsHat97eo2210j/wOQUxoGYzUq4WVKoCbQFfAhf/ksXhNn6mBBCuhCDp/Mu09 s0n2njL9 -----END CERTIFICATE----- + commercial_ca_cert: ~ + commercial_cert: ~ + commercial_key: ~ key: | -----BEGIN RSA PRIVATE KEY----- MIIEogIBAAKCAQEA9TdRRiX7Ia4yRKvGpRuV7Ff/iS29eFdddwSYg+uPSRm4Hn4f @@ -237,3 +253,4 @@ x509: GaBuHcOkEMwibPgxyoBZLPlS4/Au7MZLRTRqGoo8N1vl0x71mhA= -----END RSA PRIVATE KEY----- use: true + use_commercial: false diff --git a/hiera/tor1.yaml b/hiera/tor1.yaml index 0a57d79..4b0a98c 100644 --- a/hiera/tor1.yaml +++ b/hiera/tor1.yaml @@ -13,13 +13,16 @@ domain: name: tor1.bitmask.i enabled: true environment: local -hosts: ~ +hosts: {} ip_address: "10.5.5.50" location: ~ mail: smarthost: - mx1.bitmask.net name: tor1 +platform: + major_version: "0.6" + version: "0.6" service_type: internal_service services: - tor @@ -60,13 +63,16 @@ ssh: enabled: true ports: "60000:61000" port: 22 +stunnel: + clients: {} + servers: {} tags: - local tor: bandwidth_rate: 6550 contacts: - sysdev@leap.se - family: "hippobagtc8Z3KPmfnT,rhinouSaR9IekHdQGUG" + family: "deeruSaR9IekHdQGUGI,hippobagtc8Z3KPmfnT" nickname: tor1pPXtPbHH5BVHVE2 x509: ca_cert: | @@ -130,6 +136,9 @@ x509: KyFwoPZJ/prUbN7soJcaXfMRwKjKBtAZcfiEIuF/Kj0q0ej3SlIRQn9qQ3kB8gCm rq5L0rF43W9j+Nk6UsuShrFnpNco1oeVupR64lMe/NeS -----END CERTIFICATE----- + commercial_ca_cert: ~ + commercial_cert: ~ + commercial_key: ~ key: | -----BEGIN RSA PRIVATE KEY----- MIIEpQIBAAKCAQEA22A15S8yonSXCU8U/5UHkTMMgsWpnEwk28+xGzwbRCX5g4dF @@ -159,3 +168,4 @@ x509: FPbeaUQIPPQfHUADhENClQ9eGyeOEj4BUwGbGxyKVBQEeJUO0VsD4eM= -----END RSA PRIVATE KEY----- use: true + use_commercial: false diff --git a/hiera/urchin.yaml b/hiera/urchin.yaml index 1c38033..d018e1c 100644 --- a/hiera/urchin.yaml +++ b/hiera/urchin.yaml @@ -87,6 +87,9 @@ mail: smarthost: - starfish.dev.bitmask.net name: urchin +platform: + major_version: "0.6" + version: "0.6" service_type: public_service services: - couchdb diff --git a/hiera/vpn1.yaml b/hiera/vpn1.yaml index 5825a5c..b3005e7 100644 --- a/hiera/vpn1.yaml +++ b/hiera/vpn1.yaml @@ -13,13 +13,18 @@ domain: name: vpn1.bitmask.net enabled: true environment: local -hosts: ~ +hosts: {} ip_address: "10.5.5.45" location: ~ mail: smarthost: - mx1.bitmask.net name: vpn1 +obfsproxy: + gateway_address: "10.5.5.46" + scramblesuit: + password: K5HEYZTLIVIDIUDZKF2EE2BZKNTGCSSF + port: 22735 openvpn: adblock: false allow_free: true @@ -44,6 +49,9 @@ openvpn: second_gateway_address: ~ unlimited_prefix: UNLIMITED user_ips: false +platform: + major_version: "0.6" + version: "0.6" service_type: user_service services: - openvpn @@ -84,6 +92,9 @@ ssh: enabled: true ports: "60000:61000" port: 22 +stunnel: + clients: {} + servers: {} tags: - local x509: @@ -182,6 +193,9 @@ x509: xIAokTRYLx/6lq8bwelCPGVjy7EsGXt9aN+gMb4R3L9vA/NQrXu+dmCJKPE1vUHF gkVBxxt/s0R2aKM= -----END CERTIFICATE----- + commercial_ca_cert: ~ + commercial_cert: ~ + commercial_key: ~ dh: | -----BEGIN DH PARAMETERS----- MIIBngKCAZcAsTaQV6TwbN9PpD6dYdXz0lA0drrXLRvS8rNoMTaDnIv134RwKwsb @@ -223,3 +237,4 @@ x509: 8hacajGZ/d17cG5lIC269f9SeCqCBkg4IjJJA8aPX65M4J1UdF+h -----END RSA PRIVATE KEY----- use: true + use_commercial: false diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml index 63ecf90..d5cb95d 100644 --- a/hiera/wallaby.yaml +++ b/hiera/wallaby.yaml @@ -161,10 +161,10 @@ development: site_config: true dns: aliases: - - wallaby.demo.bitmask.net - - demo.bitmask.net - api.demo.bitmask.net + - demo.bitmask.net - nicknym.demo.bitmask.net + - wallaby.demo.bitmask.net public: true domain: full: wallaby.demo.bitmask.net @@ -175,17 +175,21 @@ domain: enabled: true environment: demo haproxy: - servers: - ant: - backup: false - host: localhost - port: 4001 - weight: 100 - thrips: - backup: false - host: localhost - port: 4000 - weight: 100 + couch: + listen_port: 4096 + servers: + ant: + backup: false + host: localhost + port: 4000 + weight: 100 + writable: true + thrips: + backup: false + host: localhost + port: 4001 + weight: 100 + writable: true hosts: ant: domain_full: ant.demo.bitmask.net @@ -219,6 +223,9 @@ nickserver: username: nickserver domain: nicknym.demo.bitmask.net port: 6425 +platform: + major_version: "0.6" + version: "0.6" service_type: public_service services: - webapp @@ -259,29 +266,34 @@ ssh: ports: "60000:61000" port: 4422 stunnel: - couch_client: - ant_5984: - accept_port: 4001 - connect: ant.demo.bitmask.i - connect_port: 15984 - thrips_5984: - accept_port: 4000 - connect: thrips.demo.bitmask.i - connect_port: 15984 + clients: + couch_client: + ant_5984: + accept_port: 4000 + connect: ant.demo.bitmask.i + connect_port: 15984 + original_port: 5984 + thrips_5984: + accept_port: 4001 + connect: thrips.demo.bitmask.i + connect_port: 15984 + original_port: 5984 + servers: {} tags: - demo - seattle webapp: admins: + - azul - elijah - - varac - - micah - kwadronaut - mcnair - meanderingcode - - azul + - micah + - varac allow_anonymous_certs: true allow_limited_certs: false + allow_registration: true allow_unlimited_certs: true api_version: 1 client_certificates: @@ -297,16 +309,18 @@ webapp: password: LH5DH5rbLZs7zuCaIgWpDAetDpLvUAHg salt: c632af58769857bcdf108b46da9eaa44 username: webapp - customization_dir: /etc/leap/files/webapp/ + customization_dir: /srv/leap/files/files/webapp/ default_service_level: 1 domain: demo.bitmask.net + engines: + - support git: revision: origin/master source: "https://leap.se/git/leap_web" modules: - - user - billing - help + - user nagios_test_user: password: CsdFzBeYX6bepZdbzvaN6Dbu5NPz6Ycv username: nagios_test @@ -353,34 +367,33 @@ x509: -----END CERTIFICATE----- cert: | -----BEGIN CERTIFICATE----- - MIIFFjCCAv6gAwIBAgIQJFnZv7aOMD6xKQB/IO9N/TANBgkqhkiG9w0BAQsFADBK + MIIE+TCCAuGgAwIBAgIQf2VP0SlAHk2CKiWJEkUgzDANBgkqhkiG9w0BAQsFADBK MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa - BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQwNDA4MDAwMDAwWhcNMTUw - NDA4MDAwMDAwWjAjMSEwHwYDVQQDDBh3YWxsYWJ5LmRlbW8uYml0bWFzay5uZXQw - ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB+UJJ5KZ4LzG0mDOXHtLt - DOsL9zKsCEusUSAyejaBUABDIZsf7uRehDdmZ+9T7eJ4smIQPkTihhG7rSmqKD1K - mzMVZzPvvGHajOV9VoUeqHJAAapKVTD2EYwwQDHD0+2jsrd3YoF9ZC/X/Oh99MK9 - K4tH6j3GcP8ZP3300k4NTyMTbNHhbAubSUQm8zclB3Kx89fGaqUIYHwdwcJ72ilO - 4at7wXgiZNTua4Zkao29SGbgILQ5KHfX1KtgcBQpkP3p1hpXpBYHa5gNh0bFTW+T - eZ9suecFXnhjbTi5F4y/sFR/G4EPnraKqpQQjyypfQMwatu6dYVnnNCUFerYnPl7 - AgMBAAGjggEdMIIBGTAdBgNVHQ4EFgQUCMTzhaODlorLq9W6q1JwpzLAtkYwgZ8G - A1UdEQSBlzCBlIIWd2FsbGFieS5kZW1vLmJpdG1hc2suaYIYd2FsbGFieS5kZW1v - LmJpdG1hc2submV0ghBkZW1vLmJpdG1hc2submV0ghh3YWxsYWJ5LmRlbW8uYml0 - bWFzay5uZXSCFGFwaS5kZW1vLmJpdG1hc2submV0ghhuaWNrbnltLmRlbW8uYml0 - bWFzay5uZXSHBMwNpDkwCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB - BggrBgEFBQcDAjAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFLmBgyy9rLMJ2KRx7z66 - LdSVPg+PMA0GCSqGSIb3DQEBCwUAA4ICAQCTSj6dJAuSc4eZM/yIEAyp9trKuVFZ - 5oF6/zuqP4jIcbHA/W5WI4uxIx8GS9aJ8dkuvwfZRgQsn8alT8zcMmXZwrOB3J2m - jsa8FDuBz6f/+qKAtT24dZrbY6DDeGx3ChwPWxltygI1TWN36V7yFoWMIdXaVIzs - uZfIBKGajXQAWun0BP8TNgLnkrFU9uC36VWGuigIW9yf0ldyPIlf2+bktPjm84Rw - 9uZidBYMwT8oJbsf5B1k3FzY5sblVyXy1LS5gjwdqsd1gFjnepNNRT7HwpQkffk/ - 4cA+OQVD3f80kaZHhwLHY/6203qYXcj0VEfQ5Wv9BhmzFtYZ52WYvPEDfjhyntLl - 40rE7GvamJTEWYX8sNpKTE9LqSOPleYqIl5SypLrNXONMIVWPr3NGbd/WoXzD1xs - NpcCrBHoqV1KQfp/N66iRYZ9IT/6zcu5IpjZRKPDbNl7gdTgG8WBumM7R/n+7Ih2 - 8Nq2bXCLbD+TG1uGljtgwBSfmf8l8C61c3EFsEZqKgsGNi/aN/7KbdJl2Kvw2Fc2 - vPVjAIc4LrpCHj7mXRu8BuBvPG1Ac6sDyuUvfvMwZgJCk42c2tw0S5bKgTajlyyz - vorgE3EJ+03yp7IR+H8kZCjrOqE0PIdyopdkIZUQioTSX0EpvNk2rrhKolSGmwQC - +sx0F/msFOO4uQ== + BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQxMDAyMDAwMDAwWhcNMTUx + MDAyMDAwMDAwWjAjMSEwHwYDVQQDDBh3YWxsYWJ5LmRlbW8uYml0bWFzay5uZXQw + ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaHUiJ2xSUJtgskA/wOIpV + ozH409bwONt+f/7ldLzT6x6vZmwiuLFhcT7/WoD+WS/6EDETva93qYyX7N5m0eWH + NA9GCcHZjgMlOg57JxN0UXg8Vdtl2DFQxPtZL8JOxT4nvnwF+HcNXuV6V+UA4cPv + GDbXO9i8STMzNOWDhJb+uX+CYl6YJOK5xmdqLWKEx5NIQH9ItyBjzzEJJZnMP/c7 + OwUzVI9y8waZyU5XB/lLfHwf5rsTdQRQZwp2CKBWuoXFE+OgVWAMPQNsPpVN7sYs + fLWeOc1M2UnEIs8SClxRpoJ1HcJrYrlo9P1LdPgSr33ArBKLumDXIkRbO6RGmsdz + AgMBAAGjggEAMIH9MB0GA1UdDgQWBBSbB8TAs9lDKMHycs9OTbAYqglVITCBgwYD + VR0RBHwweoIUYXBpLmRlbW8uYml0bWFzay5uZXSCEGRlbW8uYml0bWFzay5uZXSC + GG5pY2tueW0uZGVtby5iaXRtYXNrLm5ldIIWd2FsbGFieS5kZW1vLmJpdG1hc2su + aYIYd2FsbGFieS5kZW1vLmJpdG1hc2submV0hwTMDaQ5MAsGA1UdDwQEAwIFoDAd + BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIwADAfBgNVHSME + GDAWgBS5gYMsvayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0BAQsFAAOCAgEARatb + HElC+JqqelaPmcVFaftBgRgeCKq2eisN1SSaX8/DNhGycDbLuyLiFHINimYM296x + l3tMNhVureGHRTlG3qciWj6B5hk7WIPPWEAFozZ0sgOR19lwh3TMxn+wPLs+HrtB + sz9YysESzBQHh70UqsINHEdIvHq0gtuin20qDt+OTm3srUg/YF2JyVyJLTGplyLt + LUv0jiobK/O3sVipC3vurOaGhyDkJHxEOIyJpE9e7hC6gHjz0wcpvPanrcPn+79y + IPRs8OSR8Viph34j6fjP62b/6NK/Uk8Ew3WAZyrhwzSDcFAXNdWDn95x9ZSSViQ+ + ZflMA781jx5TgRKd60vmeJSqBpR4a2RlfIKjWQzMMCsa15fcFiIgwQ2GmFLWuIll + qP0MsSNzlhwwN6gE+Zr8cA8TR/r3z95i1cKfpXkDL8Cl9+1qhGoq66FxUi4ukRMM + dABQ0miH0/MiF0i5RtcPjA6vHRkOqKrZNz+7iWsdEZNb+w2tmiKxrR17ggoENFeR + M6sIqTi57+vPvFdHUfRHGiIPdR83AyEBn2i2q2PNgux+Ss+J25g6y6yYRkrTLQb6 + CvXR4MxjjbVcfOf3djpy8+5nmgkv31m86tHrVsWeNnoIXcqZ6XQ3aD7N7GJGInEm + uzFIj3FWWrQiO7OkvvEgq/1ypkrjX18jDBkvTL0= -----END CERTIFICATE----- client_ca_cert: | -----BEGIN CERTIFICATE----- @@ -715,30 +728,31 @@ x509: -----END RSA PRIVATE KEY----- key: | -----BEGIN RSA PRIVATE KEY----- - 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 -----END RSA PRIVATE KEY----- use: true + use_commercial: true diff --git a/hiera/web1.yaml b/hiera/web1.yaml index bba764a..54b2f51 100644 --- a/hiera/web1.yaml +++ b/hiera/web1.yaml @@ -62,7 +62,7 @@ definition_files: "es" ], "name": { - "en": "Test Bitmask" + "en": "Bitmask" }, "service": { "allow_anonymous": false, @@ -124,10 +124,10 @@ development: site_config: true dns: aliases: - - web1.bitmask.net - - bitmask.net - api.bitmask.net + - bitmask.net - nicknym.bitmask.net + - web1.bitmask.net public: true domain: full: web1.bitmask.net @@ -138,17 +138,21 @@ domain: enabled: true environment: local haproxy: - servers: - couch1: - backup: false - host: localhost - port: 4000 - weight: 10 - couch2: - backup: false - host: localhost - port: 4001 - weight: 10 + couch: + listen_port: 4096 + servers: + couch1: + backup: false + host: localhost + port: 4000 + weight: 10 + writable: true + couch2: + backup: false + host: localhost + port: 4001 + weight: 10 + writable: true hosts: couch1: domain_full: couch1.bitmask.net @@ -175,6 +179,9 @@ nickserver: username: nickserver domain: nicknym.bitmask.net port: 6425 +platform: + major_version: "0.6" + version: "0.6" service_type: public_service services: - webapp @@ -216,28 +223,33 @@ ssh: ports: "60000:61000" port: 22 stunnel: - couch_client: - couch1_5984: - accept_port: 4000 - connect: couch1.bitmask.i - connect_port: 15984 - couch2_5984: - accept_port: 4001 - connect: couch2.bitmask.i - connect_port: 15984 + clients: + couch_client: + couch1_5984: + accept_port: 4000 + connect: couch1.bitmask.i + connect_port: 15984 + original_port: 5984 + couch2_5984: + accept_port: 4001 + connect: couch2.bitmask.i + connect_port: 15984 + original_port: 5984 + servers: {} tags: - local webapp: admins: + - azul - elijah - - varac - - micah - kwadronaut - mcnair - meanderingcode - - azul + - micah + - varac allow_anonymous_certs: false allow_limited_certs: false + allow_registration: true allow_unlimited_certs: true api_version: 1 client_certificates: @@ -253,16 +265,18 @@ webapp: password: pg9XGGdt4Dr3WcM9PYDqMmxxKHTpvsc9 salt: 7e8868f8c4775290fd37d2f520d13672 username: webapp - customization_dir: /etc/leap/files/webapp/ + customization_dir: /srv/leap/files/files/webapp/ default_service_level: 1 domain: bitmask.net + engines: + - support git: revision: origin/master source: "https://leap.se/git/leap_web" modules: - - user - billing - help + - user nagios_test_user: password: uI_cYvPGNDZrcXTVLH_x88QFWjJ2yCZT username: nagios_test @@ -309,33 +323,32 @@ x509: -----END CERTIFICATE----- cert: | -----BEGIN CERTIFICATE----- - MIIE4jCCAsqgAwIBAgIQWvEjyB3Gj+kZd6PqYRc8tTANBgkqhkiG9w0BAQsFADBK - MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa - BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQwNDA4MDAwMDAwWhcNMTUw - NDA4MDAwMDAwWjAbMRkwFwYDVQQDDBB3ZWIxLmJpdG1hc2submV0MIIBIjANBgkq - hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyvfMJUiE9DSzZIxqRMEYlcVqfSHxoN/p - Z7VUuH8nBzUnpfKS/K1hq7OcOer7+uuC8ptxQWIvedvGVziyTtq/gI+TOWNwjvZp - zLCb1bjZGVcLIWt3CIDeDZ0DjSVaJg2EQFxKd46AxDIbbTDlE+cAsSjyKv7Fa85w - a55vJPt5XjBunY7xiPSGsjZC3/I+yxbp5qhwMTB0eJSlSBUHoksaTcmVPi5fxdg4 - LlI8pcEFG2LcAQFh8lqIoq+CKfi8TNvQVWPgD3HFlVzfLUZHljyRjwPWUxskNiO4 - Yacr/mE2LOFlq2iqGEzBlUUkMp3KOgDT6htHUsojQRZVzeHwn/A33QIDAQABo4Hy - MIHvMB0GA1UdDgQWBBQXjstrt4d+nktZDAUH+IVGD+ytSjB2BgNVHREEbzBtgg53 - ZWIxLmJpdG1hc2suaYIQd2ViMS5iaXRtYXNrLm5ldIILYml0bWFzay5uZXSCEHdl - YjEuYml0bWFzay5uZXSCD2FwaS5iaXRtYXNrLm5ldIITbmlja255bS5iaXRtYXNr - Lm5ldIcECgUFLzALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG - AQUFBwMCMAkGA1UdEwQCMAAwHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+ - D48wDQYJKoZIhvcNAQELBQADggIBAD7r5xzPdT7lmnqZz4RAy14EbEWp9aZ+tWjh - Afu+uCtCW6/mpgcP1fe9IjaM4bKZ/fERPSqroz9ljn8MGz9TtkJW/JSS52GcVoZi - RN24WqlzrY3Aq0mO5165A7m/Sg/toQTtzRZVyzaVqL5HMrxHgAoiEP9dybjpPDaT - rJeJ5zPM3BnlMwDHP6O4hgoHbtv4GfFb26jVjBaGKQJ/vdtVgBzf+2Lu5Hq0TOCW - vTVf62pWavthGlpaq3n57ZHw2vimUCao5/mRJPVwk1VGXaZOTm/WqN7x9gAJoMhm - SVxNhl+ZW6N65rDFm4MzCIRHDJHAHXHm/DJ0YCiBK8JNHmF+OEyU94WPxhWpTftc - EfESEB4BfqzEWMrR8WF3O5MmEspBJIU7zg7Hg+l0qteN5TS38K/xuHufkthrndfU - OiPjd4HFJaIfs/Bprv2pNAbcwE34CdFRg9kz/frWECsB57PuGff4TigHzeOD5eP6 - u38uVj+ShgLhEZ2X7CywviJzvb7NVh3hVLVjAJ5/bu1d/IS6Lhvw7I/zs4QOT9bJ - 1iDzQa8Y3uBczxiMemCe0OPftvyHManuXu9sDgvJZsDO95dJFmUvKwTGPsIil+ez - rM+MPo/6YXL5hmBlLGxXOqdIqrPeSTiQbEehw43vdkN6I83KOWlnJ5OEI0hyyQxT - 0/nw8amp + MIIE0TCCArmgAwIBAgIRAJ3OtRC5FbPT5E/EjMpdDtwwDQYJKoZIhvcNAQELBQAw + SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww + GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE0MTAwMjAwMDAwMFoXDTE1 + MTAwMjAwMDAwMFowGzEZMBcGA1UEAwwQd2ViMS5iaXRtYXNrLm5ldDCCASIwDQYJ + KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN/4QKBE/8Mv2mTx1zNndSedAMYqASTf + wv6XNwSbupZMkPAjdnrM9fZaQ4i4MUB+MoM3KT+mZEeH3YuVNUsFpeCjaperhdvW + IWznt5NQd3zrv3Oy3JUwidYzECUkpWtu/UILlJ8EdjmT8668QgkhnUjk+2gnd6gl + agZ6YkdRBSP5NruVTDhGCSUbOKCSTxbBadcmIro2y23jHuc8iVPQGqTPfLg/4EZ3 + 39Tlqr8Ht4BZ+WDOJNAQ3rNCH9Ndr9nvpz99GM5nS4VSBIyPRnohGsBhaX8+nh2K + 38n0AWiEcRhgTMvDfOrNMRt69XbQKKAi8fLhZUS7SoSWO/HE7mKAvYsCAwEAAaOB + 4DCB3TAdBgNVHQ4EFgQUjmFGqQTALWMr25NHFJhWXsyQUFswZAYDVR0RBF0wW4IP + YXBpLmJpdG1hc2submV0ggtiaXRtYXNrLm5ldIITbmlja255bS5iaXRtYXNrLm5l + dIIOd2ViMS5iaXRtYXNrLmmCEHdlYjEuYml0bWFzay5uZXSHBAoFBS8wCwYDVR0P + BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRMEAjAA + MB8GA1UdIwQYMBaAFLmBgyy9rLMJ2KRx7z66LdSVPg+PMA0GCSqGSIb3DQEBCwUA + A4ICAQBXnrM9f+/+WtqK6QSekUu3fYXPXNTfmE4QyYeaNvoLhEAxXY+KGRJ7Kryp + UDODQ8D9ieX0f4YQ9hrm1+eg5mkxc3vyieb2E21A2Eyo7odbq+g2Bve4R4oWMEL+ + wEEwhLC307PjA3i4eyBa3ZDi6n2STS9eTIvBd7eVrgSsZluShoSpvBv2rft6jRem + NKKhhKfmDT/Vq63yEqy6K9Vhamm1zaFwdgSlyM2sNA1d0nYga9ikrTNRhIjBDRdE + gY9G2x2HszflrVpLPB2SCaAlXp3dGLWMisuXKQkMtQLQ+/UfdifAF9D3d6iCyUTG + KzmsNpZJiK0yEnz4Snd5RVlDe9TW/Qcydt2OmYUjkveutBw79m/AUi/pSC+Nr7pg + Ka6ER5DYORuqgDEZMsyO04Z0faMZDSn3iM51mqB15agpN1E5pLFQZOyHsYwZbeEM + D5VwlmFSKKCzjQr6zV4O3XJRflewlCuLrJy1WJfZlpvkd78+EyvWfafuJmSl8P/P + acsZ//8P/DIeBf7HS7qsyP6fBOLTWDogOllnBnM05GJqx2Lbks6UzBil8yqLmUap + oSyB6k3ZK8fyruETD6sBe5pYhB01VbZaeZj78SS4pgh2XJ+NVQJg4Sl4u8x/wohC + ykld76BRUwy2eUKt3pzx6CtwHCL1wsSJIoO+q8fjqSg3YgtnOA== -----END CERTIFICATE----- client_ca_cert: | -----BEGIN CERTIFICATE----- @@ -670,30 +683,31 @@ x509: -----END RSA PRIVATE KEY----- key: | -----BEGIN RSA PRIVATE KEY----- - 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 -----END RSA PRIVATE KEY----- use: true + use_commercial: true |