From a6d6a0db88908d2accb514afc11e9675817aafde Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 24 May 2017 13:11:09 +0200 Subject: [demovpm] New Cert, pin platform to version/0.9.x --- files/cert/demo.bitmask.net.crt | 20 ++-- files/nodes/leech/leech.crt | 64 ++++++------- files/nodes/leech/leech.key | 98 +++++++++---------- hiera/ant.yaml | 11 +-- hiera/leech.yaml | 205 +++++++++++++++++++++------------------- hiera/millipede.yaml | 11 +-- hiera/otter.yaml | 12 +-- provider.demovpn.json | 3 + 8 files changed, 215 insertions(+), 209 deletions(-) diff --git a/files/cert/demo.bitmask.net.crt b/files/cert/demo.bitmask.net.crt index affd3db..a237126 100644 --- a/files/cert/demo.bitmask.net.crt +++ b/files/cert/demo.bitmask.net.crt @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE----- -MIIGBDCCBOygAwIBAgISA9tR2uVBHodlJfkP809l7hf8MA0GCSqGSIb3DQEBCwUA +MIIGBDCCBOygAwIBAgISBNlwJWcEpuRPR4P6f/sGz6psMA0GCSqGSIb3DQEBCwUA MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD -ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA0MjcxODM0MDBaFw0x -NzA3MjYxODM0MDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G +ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA1MjQxMDAzMDBaFw0x +NzA4MjIxMDAzMDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCtPNOYXF7Gse1oYyj7CKkEEO9Br/3a qpfxscTwzgDlufrfGOfLFVQrE6YlcZOJw2ADB1RE/b4vOYKvQ/HpbzdnfSZpJtAT ngEHQIwmvHIdHmpxFHChyUwbdVtxH4Zb539JF2CyYsw9kp81uocFpduLxANwMhfV @@ -25,13 +25,13 @@ BggrBgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwgasGCCsGAQUF BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j -cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAI0M1wPJ0DGi -D9/URLMCZmFpQfyvjXK051DAN5VVmbaQPFgYNFOvzooOGmUkPHQWDLM5kQ4Ot2i7 -t9f6yHJhSKgxdn3ZEORmu5psh54+nwBD074k4qCQ03YTqoyfTaj3MQA10CPgCzK+ -fYc1lpAo4oZPP/dw3NvdIvM2ZYZGsNdfwIdV79DziNsyP87IFzjodiBF/Z9wxiT9 -Ti9QvGSMdhhAl/O8lnwlN2Vl9l3S6LCe5bDVXcx8voxH4AzJFhX1i5c37HfQ76n4 -objIk88beopgnRkNHRsum8BmYnz6m0nAbi3VdnlJdArzdzQSPPnqVMKu3pN1uz4H -9w44V/dyQXY= +cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAEJKdEknJtiF +f1sDcSvsmkhpOEMLw+GELTFQ7+3oJpYEPZsgKUX4+9dUNivJwy1j1cui3q1hm77B +5Tq5RShcOZalmRVCgCHZwiq/BBvCsWNuXyMRyvEq/9SElaeEUuQL76SCNL4R4qvw +Q/AX61uWE/oBwRrXMXGipsiMGlmGcd4xBNuhXT+Ky4BgqlnlSJKh+tC1sW40DBQN +gC/JsY2s41i9zpXTWqH3W2AacEbeyjUYitCzW2FzGqLlRX8fQxN4g97IOYg15eEg +ANB0g3G17KDyJqo1ElXSpTAuQWuZf7hkfP/hAoHppr21gM3FXEMPfgsO5hSBrJwM +kx/ADq9125Y= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ diff --git a/files/nodes/leech/leech.crt b/files/nodes/leech/leech.crt index 1d104ff..dbcbe59 100644 --- a/files/nodes/leech/leech.crt +++ b/files/nodes/leech/leech.crt @@ -1,34 +1,34 @@ -----BEGIN CERTIFICATE----- -MIIF8jCCA9qgAwIBAgIRAJZiBHgdRvXfc1LP2Kvfbn8wDQYJKoZIhvcNAQELBQAw -SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww -GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE2MDcyMTAwMDAwMFoXDTE3 -MDcyMTAwMDAwMFowITEfMB0GA1UEAwwWbGVlY2guZGVtby5iaXRtYXNrLm5ldDCC -AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALzb/JZGbi4esdTNwzYlVr/M -UPDNKhs8GAlWzo50ZC2hQA0nkSN9gwDRs7BtU5LjmMIthJtmZaeT88rhaDkh3zg9 -GvZT2tj0GpMvqzdtcR1yOjb/6/dG3idzsK+UXTBXsAHo3ZyxizH73oXrxIDX9dbU -VxReT3gVtQTRD0IU/PSwwbRUpYm/RyMzSHYn58uJbOWLd/hh/wGSZnryh8+2qf6y -H1u9pzHD6b70ZIQb8wgHWZOmXxfsRWnZgTwv8fXTPrcBRg1QN08zY3/v4oSkd6fF -0JTQkJiOJ+Cb8vzwbhqY01QCIhuWcxqVa8Bf2muhhYWzwtsUZ8+wWoapUgAoYUsz -Bt3Itx/EyYgF+bt7cXC3CGeV7I0kdmd3vMU0db10hxsT9Tbc1BcEyqXc7laIaGFU -aYxTbwtMOv0ivvPZdhM9ywO5XV1Nki1M73LX+5fSdicrqeZY/p1Ms8xlI8/NUc0n -t5TGwL0pN8DM3cPPOiZk1IYFKmSxQI7SHUVcEnb3lx9CsoEvqYAfX65J5FSCrc2A -dH/poM2dzkd8eWyxdTUTFn2zwa3m0X3+6tY3EBkvngjcy1sCuIcZAETrDXq1iyJS -S6ACEGnNe4BUtW6rldzvGHLXwI7AnMMS6WKaPsHuU/IM0ujnDUXlxFgR+qtG7/8p -tOXxVk2Ft2ACBRmEPbb5AgMBAAGjgfswgfgwHQYDVR0OBBYEFH3W6Z0ZL64UApQ4 -vcRCSLtg4JxUMH8GA1UdEQR4MHaCFGFwaS5kZW1vLmJpdG1hc2submV0ghBkZW1v -LmJpdG1hc2submV0ghRsZWVjaC5kZW1vLmJpdG1hc2suaYIWbGVlY2guZGVtby5i -aXRtYXNrLm5ldIIYbmlja255bS5kZW1vLmJpdG1hc2submV0hwTG/JlVMAsGA1Ud -DwQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIw -ADAfBgNVHSMEGDAWgBS5gYMsvayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0BAQsF -AAOCAgEAmr75ICYJTUDDfEL89ma67trktP17hHDR5RWlQfzoedxCdXoyFV4Oxb+b -aMxv9E4du2ZAP71cajE0fiPlLaZCsHvUlizMSDzOUUWiMBS1gtSodoKKmT+BEv5q -/sCVlZUAD/FUgkFuvltQD3f5IcGzYak/skdEuPZWOHlvwVMR24OViBM6mdMvmnVb -fbC2oWJvJwnFg/aWlj5f1aDWKmoPfUKo91hmPaG6gnZXzAZvr/+BxC2WliL132mq -eI1CcrelX4fcRUl5++rlthONeqzbMqn0iqFXrZIkxvr6h7KN3AHAtHGkmgpuVY8K -QDfkiez4qXOPFPjjtsBFz4GOcwzLN10JCkiorw/DdmaKXtJs8FHvHIiNUOGnm9JN -c1sM8N2vCBvCO5/WGJ4uOZBtsJu9EPRTtbmL3FWe17ajpFJpF1kjqiRw+zEQvmVz -x26m1O7M0EVwlldLgtxKhkcgcgTTqmSSdeieUFUGFEViG/Ok1bzQSYErM+K9B/Xb -I5Ij2iiafdA9VuFk/T41efek14z50zliTtO9n7qiLkdgvnHhaeAjIxcBQsQoRD+S -tqa14tW83CkdQTd8YftpY2MIgl9Ir7X3NiJ9QVCrclxVvy8lNMgeqMXlelKgbjWD -NIVZjXODolGfIoqJUdcCOzwh59I0XoRJYgT8u4opgGkTYtZVZuI= +MIIF8TCCA9mgAwIBAgIQCryyHqj6dOe/6h9ZPsY81TANBgkqhkiG9w0BAQsFADBK +MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa +BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTcwNTI0MDAwMDAwWhcNMTgw +NTI0MDAwMDAwWjAhMR8wHQYDVQQDDBZsZWVjaC5kZW1vLmJpdG1hc2submV0MIIC +IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAw5neD7ErtwqN8GGCR516Q/RO +jDg0uIZOHCtGi/1vuaTAEa5K+wt1SXguSmwLUjnDLPin9AsqwNyas3BjgNzie3ha +NgIidPWEfTYz9F0LjG0JpmScXRFlOQn069Jsvct4M5QrT9My3N3Jxo0hvYA/whiQ +B3p+sEvFNQDS72GINw5BObWfLt7lhVJcj4G6UVUAMTUfnpQwY3zD477GAL7EMDcM +B0FrfexX2zYex4h5Dpv5TWfQaYni1PjXw5itf53Vhet8+r1paUx7Z0sErlUSf8cJ +Q+rBxrJnnjhtyuEZAjJkCDYvgZUikh8onYBiFcy1WVqUAt/UWGyxAu6I9MtPsWe1 +lMW1bEUga0+Pp9u7QiZoam3Hlef4D2yzfMTmiYHXxcS34+NNve7KZVQ2oRKaEyuY +smQm2sVqAGrxcyZmrNe9T6Y45D0kjZmbZ7TDPYcjqtow0tOEQ23/oTJURhUo4kzD +o+NbnQ+9Wjjpz8BJYSaqtTeZa2vLGM/ia3e2fjKE67ftpSalsPE+rC9mP2+gICcg ++mC7lblk4er6NWJTZNEOOV571dHzjeT+6q7eY+qNdcyo2le+er5eIk5YY262E2in +Uzr5tIhvqsjMFX6TqV0b8WNjPtWIAxc4VgSxejSuR0CE4xGrB3AVNGhrBV7azXJP +jCwz9xandCNitOo1le8CAwEAAaOB+zCB+DAdBgNVHQ4EFgQUHYNO5BMCEKYXr4kQ +iThOKRi9sKUwfwYDVR0RBHgwdoIUYXBpLmRlbW8uYml0bWFzay5uZXSCEGRlbW8u +Yml0bWFzay5uZXSCFGxlZWNoLmRlbW8uYml0bWFzay5pghZsZWVjaC5kZW1vLmJp +dG1hc2submV0ghhuaWNrbnltLmRlbW8uYml0bWFzay5uZXSHBMb8mVUwCwYDVR0P +BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRMEAjAA +MB8GA1UdIwQYMBaAFLmBgyy9rLMJ2KRx7z66LdSVPg+PMA0GCSqGSIb3DQEBCwUA +A4ICAQCl6Apv4WhR95v6qFzVfmgGyRJpsyaQ/AMp7ntb1CxTtZKDY25fK4MLZPAH +Shk0oH68+Dp5eKgcPvAsyC5ucjljg5bkr4Tf8TWZlxaJXRaUjx0wmgSu7CRJAc/0 +ic6h+u7h15R8jwKDRP9NdKC8tvKgylNbQFU5xUzmHkAvLAxqdCVebDpnE6S8xbuc +f5sYzUf8LzN5G4TCTbNRdEMJ+KQc75GvLJt0ruB0wd4RYhSsDHj8QWQ+x0kUKuh3 +PejGjXz5sQ2mC7/p1x5KnnN+KD6EcbrjoHkrFE4L7VzULLOryQ+ConB0VuqNy34Q +0lGxPZQCV+ZuZqlSwDNGdEWEnuVo1H3G2gi5y7f9mb0VNhySXjux3Dh0JYl6JqEf +VQfV/Vtwct0XBo/yD3iCt3nGCN0PKY35FrEa7fQ0TBnIrk+zLaI3PtU+UBctL4td +IpST7X1p9Dq7+o1/N9eSpOj4q0Mpre/yH3Lmafww5TDrDXmAN6Ll48LD9rQuksye +2caAlqjrFFSJBySLDKQaBdGMspMSnpC6zI6pw5jS0tx41gmOJ656HyymTbmX23e5 +jrAOO6lWhTvAZB1B+/0kBHTYXr7MJK6m2b8mWj55TZc+aW57bLjnOTu4lizJ7as6 +/IPaH4A1h4pOY3tJMsB2zQx6em/NPa0JsUoVqTTkniA3LXdcsQ== -----END CERTIFICATE----- diff --git a/files/nodes/leech/leech.key b/files/nodes/leech/leech.key index 21c8890..56c593e 100644 --- a/files/nodes/leech/leech.key +++ b/files/nodes/leech/leech.key @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -MIIJKgIBAAKCAgEAvNv8lkZuLh6x1M3DNiVWv8xQ8M0qGzwYCVbOjnRkLaFADSeR -I32DANGzsG1TkuOYwi2Em2Zlp5PzyuFoOSHfOD0a9lPa2PQaky+rN21xHXI6Nv/r -90beJ3Owr5RdMFewAejdnLGLMfvehevEgNf11tRXFF5PeBW1BNEPQhT89LDBtFSl -ib9HIzNIdifny4ls5Yt3+GH/AZJmevKHz7ap/rIfW72nMcPpvvRkhBvzCAdZk6Zf -F+xFadmBPC/x9dM+twFGDVA3TzNjf+/ihKR3p8XQlNCQmI4n4Jvy/PBuGpjTVAIi -G5ZzGpVrwF/aa6GFhbPC2xRnz7BahqlSAChhSzMG3ci3H8TJiAX5u3txcLcIZ5Xs -jSR2Z3e8xTR1vXSHGxP1NtzUFwTKpdzuVohoYVRpjFNvC0w6/SK+89l2Ez3LA7ld -XU2SLUzvctf7l9J2Jyup5lj+nUyzzGUjz81RzSe3lMbAvSk3wMzdw886JmTUhgUq -ZLFAjtIdRVwSdveXH0KygS+pgB9frknkVIKtzYB0f+mgzZ3OR3x5bLF1NRMWfbPB -rebRff7q1jcQGS+eCNzLWwK4hxkAROsNerWLIlJLoAIQac17gFS1bquV3O8YctfA -jsCcwxLpYpo+we5T8gzS6OcNReXEWBH6q0bv/ym05fFWTYW3YAIFGYQ9tvkCAwEA -AQKCAgAt8Xo9+H4/O/pY4YF2v5id6g9atR5kJ7dVNkfjgc8JBqw1RwXY02S2I02K -Qt5M4o871aTnxP4/yQ9KsJERLPtHjB3uBLI9iwyX98W4IyicWDhvPszhh9ztTgiS -fg45f2ty23pl7w8EptgYTiWsjlzg2SEh9FtyxB0YQd9rXP24bPOCcgEfRGgC2Svs -ioKqEhFqugYCZ5yIflvt1uhREIfETQKx564vvhA0AvIc7UuvDVKuR4/kmva77Eyz -HprHCY+9J1MqU/RQkRjIe8voJrZxGv9F5IL4icSLsIRpIfg3AiyOyEIR4gS4V9cx -ol/ZRR7dSsDBWPJ0JNuw3Kn1Hd2k6TouEpwhRm1bSNWxr4hciMMdBjDLNBecClG+ -9U0U3P0qXHlbf9fJiwCFZKxSpsYwl94hBu5r4No8CVUp5GFI4QxscXRnEdBHEVGi -F2Xzq1JhaqRxMnPnYaAU9IPGUwC+WHGBt7OE1pU/jra+iybPtIwzBocqfitTmsB6 -PPwkV3bOUKS2Ea2eeOyWNLDC2lMnQnBR7vYBJS4Qo3QO7e9mkQCwoyeLPYhO8THC -ffocHikz+8LGI4CGYm0Wbbdk9oA/FSLjZLG7eIrAkspX8WZY5Zcb+kjw5hzkgiI2 -EM+/nP8XJXnpyzB1PZmLEYR0yq5EisucpGwraH5kPrgK4tf3AQKCAQEA7rP23lyx -JDmfBJEMw2440UjgDH1fWDcBvAJ3AxLO5wm/aVlWxXfbWswq/IjNHrmQ1bSJANtQ -jsvAnazNZzcAVBZheCO5CNPNlJ/Zonw06Ac6L5zPz1BrAhDmRAf3huLFeUcfcNnO -w4phrPJ41seaoO+ZhuDYclb+ReT+DCkQiYIzw5JezwDvA1eSBJpB0ug/7WejBSjm -eOzPv0ZVJJGlqCF45hnEtwfe5KqYzM2mGaBDrnbXRCb6k5wigHP/032jVxQf/bKD -6wUWEjpW9l49jb8+ZPsPCkuTEMgPT7mQ17XfGFiDZ4DP8e1BaJJk+3CxvoXzmyr3 -dI9ThrwzTx0UmQKCAQEAyotnCgwCtr45Sdfi5qyOedVWq36agcb/lBodRA9yo1vv -+gAOgmi4KK8zAFriuK/WEN086zWrXmwXSkQmEXd+psIdLLTfTrGLzbAYfnHdedr+ -sf9gtS2ERWkJF6Os4EbVTpSFLkDHWCv23amI0xOeOajHxl1xP4qfPSME3CpQbAIK -SX55mBOumQ1XzmscKLLJ8KNs33WjG1LFMND58ONLlfAowgcPPbNLWyzMtrr5MPpx -ryD9Ga66ByhrhysLMNeRCh5MPUFkz/olgpUgKHiiKL8otEUmk+jvJyFnBmiaZUU6 -LHPbW0Fe0CogKqjNs/8hVzSsCaCrPWWyUZBDiKjRYQKCAQEAr2hhrc9RgLwzBWkN -hwMVD33M3oC2sp1hUeZBzGliz1ZTaTf0UpGcCKHlqMNicASO0OukjZOcJALIHVXh -bsp1HFWB9IXTsA/sjx3UENnTCvpcoKZL8x02NUNz4mQ0WdOEp3VDPmtfzEOBOVTI -xZPSJhdLq1jI1WTl3zjCEu+OLm4WWc3Si6009jDApU8xtaljaLJykhUXH59tnjIx -2PiKUf2e2P/wlUtcWI6gUEeCmmwxsB+2WmeGVTg0Bk63nJNDl3a7d3NaCzcmm+hx -BQQFmYcCc7QlvjwA6yEIV16WeF02fq50iXeX10Cwgwao3DhY9Rd8BvdQ9j9ocqcT -0TweaQKCAQEAiphbWJ+hV8TQ1Lu6Utgu4iVemhkWxskR6Bj6f7EGY8wsaOiTBR99 -LLG993c5fuErXPzWi6h87C6QvUvmtLsM2jUn24ik6WdKX+QozpVB1PlKoSg7154e -zZQzGY7xY8J0gcHVZDIFdksXMNSqgK0C7zeUBCO6s506m44T7Ee0IkQ/H81AjRSi -u65KsD/Q0/SLhHN/s2T+yFqZ/m5xKSmPdjkQ2rwT7Md8QBZmun80txQYqJqtNl6+ -gtlgwuxsSu6nG8JhruTJhBsKgdFjYO4zICi2RKyw2jNhOmh75AG97KAzT2mz5zzT -ESRSQH6jy5BAEzlCo4/ivS+Slodd/uxt4QKCAQEA4g39gYDMg3c1/QI/Sf2AZS+a -HO2xY7/yQdNnE7ci8u8s0FLews121jGQ4bY3psGe2LZLo+9DTHAPgVtwSOZdLa5t -EkQVKjQ+dMOfBpaXQP16f8VBLHOJACc4iWmh5YFCN8zj2uu/lxzbv/DVlIwoeadH -dYbaPD8evtUjvMirtslAnvb/rIhY0kPk4Ye54seeygeAuMMRVjeqW4Vit0CGIwuj -YCgQ94txxzFSPuJNPC+lWd0i9eOA1xv4bXDFaqg1X84y5kD+ywySJT6kT1tHFjGb -5n3s7X/psG/SpDwUiO1x5mA4UmR6z9jRmax1PLLEL9k23qZAo07MSG7HEl7cAg== +MIIJKgIBAAKCAgEAw5neD7ErtwqN8GGCR516Q/ROjDg0uIZOHCtGi/1vuaTAEa5K ++wt1SXguSmwLUjnDLPin9AsqwNyas3BjgNzie3haNgIidPWEfTYz9F0LjG0JpmSc +XRFlOQn069Jsvct4M5QrT9My3N3Jxo0hvYA/whiQB3p+sEvFNQDS72GINw5BObWf +Lt7lhVJcj4G6UVUAMTUfnpQwY3zD477GAL7EMDcMB0FrfexX2zYex4h5Dpv5TWfQ +aYni1PjXw5itf53Vhet8+r1paUx7Z0sErlUSf8cJQ+rBxrJnnjhtyuEZAjJkCDYv +gZUikh8onYBiFcy1WVqUAt/UWGyxAu6I9MtPsWe1lMW1bEUga0+Pp9u7QiZoam3H +lef4D2yzfMTmiYHXxcS34+NNve7KZVQ2oRKaEyuYsmQm2sVqAGrxcyZmrNe9T6Y4 +5D0kjZmbZ7TDPYcjqtow0tOEQ23/oTJURhUo4kzDo+NbnQ+9Wjjpz8BJYSaqtTeZ +a2vLGM/ia3e2fjKE67ftpSalsPE+rC9mP2+gICcg+mC7lblk4er6NWJTZNEOOV57 +1dHzjeT+6q7eY+qNdcyo2le+er5eIk5YY262E2inUzr5tIhvqsjMFX6TqV0b8WNj +PtWIAxc4VgSxejSuR0CE4xGrB3AVNGhrBV7azXJPjCwz9xandCNitOo1le8CAwEA +AQKCAgAIQ6sHPLQdIrwGiQgpIHU3A86BzComFb6dIBL1/TpIPLbEyHlwi/ZjqUlD +abc8vSYK82KdRA+FYIzEwh3iJvMGxnoBSCvOh0UWyUB+taO0RjMfLacRo5eERnBr +ulNP3ZXxj/QYhlLi1BgfZH0ldZK8D6+eMUXDCyCE8cj3xkYsFVUaLBtSrqZB8M3q +Xk/R+eZtLdJtL9OvkGjyaXASPf0qEFlYwSHaiy7XGz1HrvN2c46f/5/lpabI2s66 +++twtel8pAt+yJv4j/uyzI+hEgUbEvzIOtX/IDCSlc3Fwab92cUyN5/gOL3iMKDV +rsP2KdULtnEEghKFvenots1gkmqGgHE8hJsvT41nggSi7YHCgYsIV7smj5I5k6mn +WQdfKcNzjJS7ztYQZAohdyEMzd3FP/Teo3xc4gsksEC/3gbmSLbBK7lOw4XwE+1d +DqAESyRHgbl8aE4ssFshwRya1LDm+2Q6oWQb5Qe4geE6eGS5VX+h1XRteoebkb4b +0CUuNedR6Vp374rxBe7Shrj0xVq/EvAOIL0W+zJ/a7NkuobnxlrbVkzoopY7F6dO +2lwBs5BgMW627PAxjLx0cGK37iwhOjdhLBYNs0pcQbgfPGFf8dSfkoQY8tC7jXGZ +7wBPPz7ZgJ3KNJS5VUXvRw5CU12tq/Lt/nTpBqh+AO0PzLj84QKCAQEA5qIsbOm4 +886yOF9aLuEBb+DZ7MXb7dkiA4Yn7+hjt6SJQrsHFMfAeUyxhPAlxoHPlsDR4uPx +7XWTH+STxtT2aFv70qcqRXwYzc50e77XFBABBy1Lpe446wQ4aO18PtykRZxe61jQ +4NQgKiZzG1m4L2zodjuiIXVzNv7LvGSJ9+WG0MAvpaNnc8WSHIP2PU4eiPXzgF8f +ZifyvoUJ+DlqRM8PG5rcSOl7z36Tvw2aaGuZLligJwA8PPr2oU608x0/DkR+cfwu +gj5/SToTlVmc6zlKPDF2qcoS52xMm2MFKRNAFO8sX/plixKetLFyztvAyFfIczLJ +NiaX20TyJKpAkQKCAQEA2R1NvDWQ23gVx/GgOML0Ina/rSc8LOWX5ysE4+dLUBtD +KUzMNIKMYWF1Mg8b5PUfForm2ew/bwTofshyZJVKHe0gMaQr+f82lpmMUxT051Qi +kQDtW2N4Y2FICUC0FV/2/14vF78A9edT+zANofWx0hQqZr0z++1aCAvhuBW8Gk7L +ABrBxqMCUEc6SgiD96ho0tqWYZbTTjOKGuix8I+MyHeW4MOsYmgfxxCcTn/iyZc0 +vjfJbk4lpG0jpbgzt2hwqFwL1/JbR4zU9KwVR5BeblHV68c77dQXvWtjrnAt5ff3 +ObP2RFNbKz+8t75Al5O1hBlsIoBZRuR2dAZlUo2ufwKCAQEAsszXlDg+YwXDtWB3 +EhDuhEXVrXJXZrYHYKQJIj0P0beFkm5ctweFeIS0u1NSder9fOpPzY7aaDXWscsL +pgJEZfOp704Zv3TN5gBA3g69v5gIs/+xvhpJlinXccFrqXB1CmKIU/yvMx5BMWxN +oM6VtG7Caachsr7Ta7dtS8jGDaGsOvpD9i4QbfilpeXIaQ6/LX9AIC2eshwWXQ3X +BNG+SUoddFFCpmQc0GhZMqzhIEMKppuezZ2pFb2apsPWFQR/dhgzzzqq895v391e +gVLQDKyFmNTgIhG/Rhr36R+DSKzb6V7jECWXw5HT6FIJp8VGWAt2I5kj1Q9me1+g +OjyjgQKCAQEA1apxBffxRws25D52X2X8vK4AlHc4UTbh9y3u8hp9k6hAwDREAqk3 +Xd57Z3hXC0vv/E9WQMCu7KL36014xmPlPO5P8IqQfMcdAbi60Eife8jg+7Ld5EJQ +B/2E1xZGI4L9oPMfhU8DsvylOV5hDDKvfP87e0BYGGXNZH3M9UzugTVpsgCjEsj5 +TefLBXC77s5d2qQjuoakDSHLmA/IjeW3ttF6OlhXHcE7BLzkFpzko1+bGFfudA+U +G+0MV9qfiq/NruJnBW4NRqziJqfziSoaxJbk39SCtds0QcWdo93iTZ9qPe9NPJCL ++FQRdQJWrtU+nXInaQzGz22m5SgmLsggIQKCAQEAoXl+oSstIIOWDL+S7aPFG0Oo +JMpBe4q9nzHNNa/Kx1ctje5l0tg067CEJ2uOZcQc64NM6dNTVh98PzfWek6D52qK +riNRmzJ1JR0rl2YG3SCSEEtWCsubi7xCcdL6BVhs729d5EGTiFILLxYuI1+9GmX6 +qdO8RoOVEClCI7vVhTZUPTgaV2oCd6DBzdmDNvaIwSSWF3lJqlw3e/MwsdJjpOdD +JnFFx7GI7D4GX2SqDQBRpQgHKvyS+hK5obxbuiEf0Af4BsmgW7n0nQ++2u1C8aNA +VNoesC4L32SbtrAcK+lzIPn/B/qUh7yxw67HgNtqljeKFXpg3kBhrOGtHQYjSg== -----END RSA PRIVATE KEY----- diff --git a/hiera/ant.yaml b/hiera/ant.yaml index 92d033a..1803d38 100644 --- a/hiera/ant.yaml +++ b/hiera/ant.yaml @@ -71,8 +71,8 @@ mail: smarthost: [] name: ant platform: - major_version: "0.10" - version: "0.10" + major_version: "0.9" + version: "0.9" service_type: internal_service services: - couchdb @@ -86,19 +86,18 @@ sources: revision: latest type: apt nickserver: - revision: origin/master + revision: origin/version/0.9 source: "https://leap.se/git/nickserver" type: git platform: apt: - basic: "http://deb.leap.se/platform" - component: snapshots + basic: "http://deb.leap.se/0.9" soledad: package: soledad-server revision: latest type: apt webapp: - revision: origin/master + revision: origin/version/0.8 source: "https://leap.se/git/leap_web" type: git ssh: diff --git a/hiera/leech.yaml b/hiera/leech.yaml index 8de83bf..3f9d269 100644 --- a/hiera/leech.yaml +++ b/hiera/leech.yaml @@ -173,6 +173,16 @@ firewall: - 6425 - 80 to: "198.252.153.85" +haproxy: + couch: + listen_port: 4096 + servers: + ant: + backup: false + host: localhost + port: 4000 + weight: 100 + writable: true hosts: ant: domain_full: ant.demo.bitmask.net @@ -197,8 +207,8 @@ nickserver: domain: nicknym.demo.bitmask.net port: 6425 platform: - major_version: "0.10" - version: "0.10" + major_version: "0.9" + version: "0.9" service_type: public_service services: - webapp @@ -212,19 +222,18 @@ sources: revision: latest type: apt nickserver: - revision: origin/master + revision: origin/version/0.9 source: "https://leap.se/git/nickserver" type: git platform: apt: - basic: "http://deb.leap.se/platform" - component: snapshots + basic: "http://deb.leap.se/0.9" soledad: package: soledad-server revision: latest type: apt webapp: - revision: origin/master + revision: origin/version/0.8 source: "https://leap.se/git/leap_web" type: git ssh: @@ -328,7 +337,6 @@ webapp: password: PPWxBEwVQTvruUKKwWsdnuwxWrYD2uDP salt: 85b233308446aaf350893a26731c3af4 username: admin - couchdb_port: 4000 couchdb_webapp_user: password: EuxvQQJpHdKNzugx9qR9QCsRgZnYfJE2 salt: 296e9cb713018afb02273d68213ec8f5 @@ -390,7 +398,6 @@ webapp: nagios_test_user: password: asDCV5RKzagaU2SHjXV8FtMbSwbYWxDe username: nagios_test - secret_key_base: qsBHRsyny8jNv7j4Kq8cEQP75H85H4Dk secret_token: EIzVM3Y5K4bzeKRf75ebeR7q9ndRKWVD secure: true service_levels: @@ -435,38 +442,38 @@ x509: -----END CERTIFICATE----- cert: | -----BEGIN CERTIFICATE----- - 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 -----END CERTIFICATE----- client_ca_cert: | -----BEGIN CERTIFICATE----- @@ -557,10 +564,10 @@ x509: commercial_ca_cert: ~ commercial_cert: | -----BEGIN CERTIFICATE----- - MIIGBDCCBOygAwIBAgISA9tR2uVBHodlJfkP809l7hf8MA0GCSqGSIb3DQEBCwUA + MIIGBDCCBOygAwIBAgISBNlwJWcEpuRPR4P6f/sGz6psMA0GCSqGSIb3DQEBCwUA MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD - ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA0MjcxODM0MDBaFw0x - NzA3MjYxODM0MDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G + ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA1MjQxMDAzMDBaFw0x + NzA4MjIxMDAzMDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCtPNOYXF7Gse1oYyj7CKkEEO9Br/3a qpfxscTwzgDlufrfGOfLFVQrE6YlcZOJw2ADB1RE/b4vOYKvQ/HpbzdnfSZpJtAT ngEHQIwmvHIdHmpxFHChyUwbdVtxH4Zb539JF2CyYsw9kp81uocFpduLxANwMhfV @@ -583,13 +590,13 @@ x509: BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j - cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAI0M1wPJ0DGi - D9/URLMCZmFpQfyvjXK051DAN5VVmbaQPFgYNFOvzooOGmUkPHQWDLM5kQ4Ot2i7 - t9f6yHJhSKgxdn3ZEORmu5psh54+nwBD074k4qCQ03YTqoyfTaj3MQA10CPgCzK+ - fYc1lpAo4oZPP/dw3NvdIvM2ZYZGsNdfwIdV79DziNsyP87IFzjodiBF/Z9wxiT9 - Ti9QvGSMdhhAl/O8lnwlN2Vl9l3S6LCe5bDVXcx8voxH4AzJFhX1i5c37HfQ76n4 - objIk88beopgnRkNHRsum8BmYnz6m0nAbi3VdnlJdArzdzQSPPnqVMKu3pN1uz4H - 9w44V/dyQXY= + cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAEJKdEknJtiF + f1sDcSvsmkhpOEMLw+GELTFQ7+3oJpYEPZsgKUX4+9dUNivJwy1j1cui3q1hm77B + 5Tq5RShcOZalmRVCgCHZwiq/BBvCsWNuXyMRyvEq/9SElaeEUuQL76SCNL4R4qvw + Q/AX61uWE/oBwRrXMXGipsiMGlmGcd4xBNuhXT+Ky4BgqlnlSJKh+tC1sW40DBQN + gC/JsY2s41i9zpXTWqH3W2AacEbeyjUYitCzW2FzGqLlRX8fQxN4g97IOYg15eEg + ANB0g3G17KDyJqo1ElXSpTAuQWuZf7hkfP/hAoHppr21gM3FXEMPfgsO5hSBrJwM + kx/ADq9125Y= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ @@ -672,55 +679,55 @@ 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/millipede.yaml b/hiera/millipede.yaml index 1c14967..528ccb8 100644 --- a/hiera/millipede.yaml +++ b/hiera/millipede.yaml @@ -64,8 +64,8 @@ openvpn: unlimited_prefix: UNLIMITED user_ips: false platform: - major_version: "0.10" - version: "0.10" + major_version: "0.9" + version: "0.9" service_type: user_service services: - openvpn @@ -79,19 +79,18 @@ sources: revision: latest type: apt nickserver: - revision: origin/master + revision: origin/version/0.9 source: "https://leap.se/git/nickserver" type: git platform: apt: - basic: "http://deb.leap.se/platform" - component: snapshots + basic: "http://deb.leap.se/0.9" soledad: package: soledad-server revision: latest type: apt webapp: - revision: origin/master + revision: origin/version/0.8 source: "https://leap.se/git/leap_web" type: git ssh: diff --git a/hiera/otter.yaml b/hiera/otter.yaml index 6c0dd4e..9c150dc 100644 --- a/hiera/otter.yaml +++ b/hiera/otter.yaml @@ -64,8 +64,8 @@ openvpn: unlimited_prefix: UNLIMITED user_ips: false platform: - major_version: "0.10" - version: "0.10" + major_version: "0.9" + version: "0.9" service_type: user_service services: - openvpn @@ -80,19 +80,18 @@ sources: revision: latest type: apt nickserver: - revision: origin/master + revision: origin/version/0.9 source: "https://leap.se/git/nickserver" type: git platform: apt: - basic: "http://deb.leap.se/platform" - component: snapshots + basic: "http://deb.leap.se/0.9" soledad: package: soledad-server revision: latest type: apt webapp: - revision: origin/master + revision: origin/version/0.8 source: "https://leap.se/git/leap_web" type: git ssh: @@ -166,7 +165,6 @@ tor: key_type: RSA private_key: ~ public_key: ~ - single_hop: false nickname: otterdVuPt9yFz8SpKm x509: ca_cert: | diff --git a/provider.demovpn.json b/provider.demovpn.json index 5418b4c..9bbf327 100644 --- a/provider.demovpn.json +++ b/provider.demovpn.json @@ -18,5 +18,8 @@ "client_version": { "max": null, "min": "0.9" + }, + "platform": { + "branch": "version/0.9.x" } } -- cgit v1.2.3