diff options
36 files changed, 1304 insertions, 1014 deletions
diff --git a/files/nodes/clam/clam_ssh.pub b/files/nodes/clam/clam_ssh.pub index 14eb8b7..6e7a404 100644 --- a/files/nodes/clam/clam_ssh.pub +++ b/files/nodes/clam/clam_ssh.pub @@ -1 +1 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqXPBidNRThgSRlEeKFuLxnGf/kmkaHoBimkZRrN7kxhGAwYSrf5mtUGqVFWGcWMPYhqU1uGkZnCgQWV9d60OmWNIZNqsq5Rs343PGKW9S3LrnAa0yFZKLRtESCh53taxF+uJ/vcV76oai+I7b2EZOVtUP6F+iSb3/D+piAcL+p284KkKywsj9FREoh+dpMHthSb7bQDSKqq9UZJVEDQev1tjT7FHnbIY0QJLcYBtYbj945G63UYPQbHVxkl2GCaTXLKaC5CfLRH6cHvwLS3HtyCFEgo9fw0BqztN+Q50+YiQYlKmY6DEnMxwyB7/CjzBcDPa+e0qXygV2mjaHsuN9
\ No newline at end of file +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqsU3rov6ems9MEt/dt/bU3t8lwTUoFHwcADLyXgi+SfYr7KduMY+0NweHGR2Q5A3X3y4zJmulYxliFBdq8zYOp+etwNMwuqdy0qCjcbUn7VkvGI/AY4kcqJhcQRhvRfrB0auUyEKspTCjQ27M6HQgKyAlc3GSR6iu/fMmA+lw9p1QjNsCh9HHoaRe+qlg7tmAd5xkTlvk1xZpEz0MNKeNoGbblq+vTWKYfN3GBiwhQNfJhkIaqvzNgoSiqG7P4MY2gXkKfQSQXeVd2OT6kZN41KBBZPE7mRA9pFKIaEx3YGnwjxRrhzdrCz2F5uQzBZAtqs2gcIWeXE6/uvtr9JBz
\ No newline at end of file diff --git a/files/nodes/elk/elk.crt b/files/nodes/elk/elk.crt deleted file mode 100644 index 882ff68..0000000 --- a/files/nodes/elk/elk.crt +++ /dev/null @@ -1,33 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFpzCCA4+gAwIBAgIRANxErfFIkZAEblZJT7m0UdAwDQYJKoZIhvcNAQELBQAw -SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww -GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE1MDIxMDAwMDAwMFoXDTE2 -MDIxMDAwMDAwMFowHjEcMBoGA1UEAwwTZWxrLmRldi5iaXRtYXNrLm5ldDCCAiIw -DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMYPzQoPFXl7867Qzqctqgk/iQBt -RRU1/5xkvHfK5CMpuHQb4qYaHUz4lWHEOqfMJJ2ldlPYX0jRyr6w/AphKbvyhgF5 -qNb+l/3c0LiGQa8PELcqXXIp8/xGWfgSu5MpBr0Wr1eaTak6lqHv6AB1OKT7BvRn -XLuLv+y3T76Ecnq2/09xAzMIHvmiSZFlXec67aoGlva9sydWEo16X0wg1EPOAqhK -q1eAmIC6wGJ2AOQgtuhiL3oenpqEkiJiv+xzruZiLonyJy95vs/Xp7oW5+EJFlc+ -cx91FrGD/gUNL1Flhg+vkAO8rZb/d7/1ajO+JUk6tviAQgitBDz4kwyXr28sa9Zm -vmmHRId8JxxKZ0QS/eOkUw+B+Q4grDcpwcg26/U3/CBBPqQ1gczJsO6Z4zbBbrtu -PchulceSx7N6v+S7wb/IPQUbImJkb+C1WLcOUbuchEO6OTPj+uZufrMQjr4TDxPu -Hp+Dfl915p3eNBDgU88MtAQ3D/1H4YWZDSxFGk8h9niEwkp8vDc6HrjzAMvbznoa -5l7y5cDWd6TWnurvWt5JSRT8XozJFpdNu/nNIxQTLHErvF3icFOxawoB8liWSSyo -77hQ/78PtUkuk1xR04DN5rO/igCj6tmQ00rbmGJF6sI83HiWuBlIg6ETc8pDbQ3w -ogLXWrd8FxPyDt/tAgMBAAGjgbMwgbAwHQYDVR0OBBYEFCEUf4kNW4iTuB+wvDET -RCxNsKytMDcGA1UdEQQwMC6CEWVsay5kZXYuYml0bWFzay5pghNlbGsuZGV2LmJp -dG1hc2submV0hwQB0XoWMAsGA1UdDwQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD -AQYIKwYBBQUHAwIwCQYDVR0TBAIwADAfBgNVHSMEGDAWgBS5gYMsvayzCdikce8+ -ui3UlT4PjzANBgkqhkiG9w0BAQsFAAOCAgEAgGMf6EgA4WJ7OegcgjnX4Ms+d4av -SnU8xhooCG8VG9GQjf31zTZ49+a6GnQfsqJ8PvQEeW3N4JVEBydw2cfLnRocfhP4 -fmJhC3k7mt/mfN2qjAKabis6i9kutE3Vv06V3Yq7b/yTQP6yUmUdsxUovdjq4Z35 -SU3RiHkUQodpatf/nf57rbFEaQ+XyV8cg99ZhLASSGEiib5IsUfoimWLsaBxsDtB -oBS6XXUeRj10HOZT7jMrYCjD2ZLa5YtdAw8QR8ipVC+yYWiUFvqedt/TczW15nm6 -+8s+efs3XMJ0fSt6VuSK3VKrn4vMn1dS7tndOrIaQFSFobMa8Qryn9GCXxL8TbJC -4nKFIuj+cYL2FvZPr5vne8/u+fQlmNXyJUy8xE8Q8l74c3E3xJCwErxHOyFBVoFP -XuTSbDEX7H5Paz8vTAoBXBjgb32yRqt0ws8mCM3PlfT4Yf33ef4Iz1hL8F25qGnw -0e39RaxP5Fhk7Vm2l2Yh4/vPVMPUQVdqsNca75kyjUDtsLbr9OuIp1kXdM/aA7h3 -yz38ZZqiZGVXQP1EWgD2zzS3VUbzqpT3eqceJRoSuP5aDQa5EfkRywi4ZBeN1AwW -c7o7C1MUpnkTCXZm1P/4UW7jEeEQNLfM2mV7c+xgHgbWEHmVpIQo1Bk8aXNPHW7h -PO+cnwXHBGM+bZk= ------END CERTIFICATE----- diff --git a/files/nodes/elk/elk.key b/files/nodes/elk/elk.key deleted file mode 100644 index 17206ac..0000000 --- a/files/nodes/elk/elk.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKgIBAAKCAgEAxg/NCg8VeXvzrtDOpy2qCT+JAG1FFTX/nGS8d8rkIym4dBvi -phodTPiVYcQ6p8wknaV2U9hfSNHKvrD8CmEpu/KGAXmo1v6X/dzQuIZBrw8Qtypd -cinz/EZZ+BK7kykGvRavV5pNqTqWoe/oAHU4pPsG9Gdcu4u/7LdPvoRyerb/T3ED -Mwge+aJJkWVd5zrtqgaW9r2zJ1YSjXpfTCDUQ84CqEqrV4CYgLrAYnYA5CC26GIv -eh6emoSSImK/7HOu5mIuifInL3m+z9enuhbn4QkWVz5zH3UWsYP+BQ0vUWWGD6+Q -A7ytlv93v/VqM74lSTq2+IBCCK0EPPiTDJevbyxr1ma+aYdEh3wnHEpnRBL946RT -D4H5DiCsNynByDbr9Tf8IEE+pDWBzMmw7pnjNsFuu249yG6Vx5LHs3q/5LvBv8g9 -BRsiYmRv4LVYtw5Ru5yEQ7o5M+P65m5+sxCOvhMPE+4en4N+X3Xmnd40EOBTzwy0 -BDcP/UfhhZkNLEUaTyH2eITCSny8NzoeuPMAy9vOehrmXvLlwNZ3pNae6u9a3klJ -FPxejMkWl027+c0jFBMscSu8XeJwU7FrCgHyWJZJLKjvuFD/vw+1SS6TXFHTgM3m -s7+KAKPq2ZDTStuYYkXqwjzceJa4GUiDoRNzykNtDfCiAtdat3wXE/IO3+0CAwEA -AQKCAgEApaJbL3lT1Seyr1SSLb8Dfv5yPTgkWMuyuwCHmIrFZR6j0f3r+krGjDMr -AfrPrroLOQdBwHanoMdJjVWHQcrl0vbL2Hn8l+eMBlJe/qHQVmz75qH4SdwJ3cSb -wtkvoq7hospQ0qsJHWgQxtZRp+hf+aCwvT2fkHwbggP/HW24KyXUt4PkUA4PkWaF -raEe+ZwPW2xtXWVhaJkTpNtczNZ7jUTAdisTxXaWkrka4Hyc3Cr7q7VIzRDERKZv -a3A33q8T6jjbgKNQ3+Qpjblk3DwBqPEnjMh+ECWkV8nxahoPozuK9J02i9mDNk7o -v1CmgyUWG3qNv53LG2RNsguTNim4HICgkPHkAzuDZwrngpRcwy/MB4+q8MDHugK5 -1JDIiNM3gsvWWfLJZ0oGtd1wKG57JmgNCpRxaCH15lix0bj9N3Q/Wyqcm29gqi21 -nP1nq0CkWv+/B3X/yVbu7LOUy8VlkeAzOngpaFvr2zN1g+H1c8og6rm/XAgDcJhb -lMEAcwxnTf3sK8f0bloszLdi20ekpgyXgow/KLsSTBVC4EAJOxxP76qaCbXGTiD6 -JeWYdrvFq0f8i+896SMsQH6Up2hxaeguti+/CAfFNjLIVff6wGlVaK0XxxW9uv5i -Gn7vocPX7wvo9svlM4aKUhQAjXi1h4L6DjPsgf6pkqFB6lA7ZqUCggEBAO/yWKw1 -McIGUdNknwPovuditZurSAmUpaWg7ANqci2Yu7D3ccrAiANjWZggPMu+e9+vlKKp -aqK6fAOgdIFiTPrPZoVrdhkInBWAlPiAKZFAGpSnqPftF/4zcDXo6sEWbfBEgoCm -5L13lcxDoOxK9Nd+ZdU7T0UmtbXWWbvcHDQn9y8ysXgqc2yH78DQ2yeiwaoo6ULy -obpmIUrrndjDXNMVfpxD7bakRq9i1TV7b1zhQSUYZpEq4letZgMuQgSEuhkIip6f -DFlKZ5jlj7rkqSriOUtNKsBPnHMrXKOCMKJRzCgwhdxV6DhzzenQ6Cw1TYUdM3Vv -M0zQnNXKld2vU+cCggEBANNQE3B6f8jWL20/2bDAcqlWYULp47/a9RxvXyXZqWUm -QyEVcRrUGgpcJOrY3aTHlS1VmEOXCRUevyhMa4bAHWHhR3XRIiNaRLFaM3Lftv9p -xXHh7HtGSZNyr56rtfsUHZHFsXMhIyh4XGmjB0xXz9boSXS1A6maW0mWVjGqIhjB -O0IjIHIWP4o7UZ0TgS0/ROWqq6RQ92oxRuIqPljpHmvP6Ly/oTZ0Hxn3ld8bL44U -RJ9HyCDFCeI92H54w/L66v8VOpmreJtfRm8UGnmgCmQLOfGDgGLSmYgv/iORsr3Y -/1WYtF6QWPtB9fJCaEu04phxJtZOcvLKx/vyfE3O8wsCggEBAMPyJaWj3xlybbny -zsSzecqdWm9ghXiFcmx6qKH1eH5x3ryapcuMRMZ3iH/pu5wq1yAJU5kuPs3a+lE/ -5ESQkQq0+iT0Z8HzvPr2QTFaABgEwHArJpoofVJykS0FI0hBV9BBMk17fQqYsLTZ -eX3djGq6ZtCmGYsAHJ39CNSX4FRbWsmpXTIjgJTdwdW0+XM5v2uE81BfseD1bDSx -ivqsN46NXBKiimp/ZtXtIO4G+h9gOAHiFkhwO9yb1tW8Hd9wwESXLBRzD/OPBmDe -/uwBtYA2s9EhmErp+Ho4q/M+6xZzNASR847GfNg1Aa/ykNchREfzW8WH5N3S8nDI -enBJsHsCggEBAL2KyTUOHEronDfxmvFpXjA4lBtyMmCoJU5xM7Z+y+w36uTlF8QJ -1qXOSysAhadFgrDcYyzVcEcqgirCiXygHHrsmK28flOZp54xm46BzuLBXGKvVPCq -dlq094Rq31wsie10l5v+cEvf0nzKyEQZTAun5iOyLmvWUeXq3LvFsLnlsaK8YWEU -RcBXPviXQzpz0vfzI+zK13LAaqV5YN1dlXT9U/TiKtfuRuuC4kLyXrChy3/X4lJK -i3gNI4EmEBWGLn3J6/tlDFTJnCMMtEa+YDOmwj25R9Lctuyqp9n92Ydi+n0r8TYV -YktVuieom2a1BL/aVwzJ51+Sttlug0NDy0sCggEASWhmKJn5O7sSStOC6AxJrPAJ -3woGtPxk9kEPCtLgElAHj+j5VC9CJQrLIbBosxOCexGhDecxBdmydhE6HkhEJzPl -c9gzJkiCwIjheSsc+xamXJVCedy7eFVupivgP5z5oqeHPhx4t/sHdiFL8s/Z1Wey -DfgYMyXZBZRKTR9U6cKxcwHaFAg8+D1MSytUdDb4hPofNLUaHMnUQrt6S86jUs9x -eLaxBMfYFkqJrtBwcbiZfoqzM/jv31AVh9D/O1x1sPtN/JPmMfHkD/6iWCnQGS9S -sMYcqpKr/jjKmLcPj1LRVvxF2sZ2Cz4By9wtk1Oty8/dDbaOgjUd2QlebR6/ZA== ------END RSA PRIVATE KEY----- diff --git a/files/nodes/elk/elk_ssh.pub b/files/nodes/elk/elk_ssh.pub deleted file mode 100644 index c1440e4..0000000 --- a/files/nodes/elk/elk_ssh.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrcf0LAT87yXYy8D6M2cnn88Cq+sHn+yCc5bApC8eDAsnEhU85AM23uPPlhvrGUlC2sWq5027693OOiUeoWuIv62J0ezggw4m8NLp8Y1zWsx9jS7y3wUHjGmZcB/abWUOLLT9ouQoZeGRqix0jaSkO1VnjRwKzPPhLYhbsxuVVy2hvAWDoV0ufaJi1N+wpqPzDrUa5SrlEyGbhnPiA+AlVU6GyCxB/DV+PiURf+W52dDeiFkOGlPgwu4vzMj1nes6wrQKTguINBw+6tTIF3C6hIqtbIRu+EVV4JFQ/UjuaZ57ubw616R3BC8IJdwSycZ3TFbEDLRpG9AkKS/OBI8OV
\ No newline at end of file diff --git a/files/nodes/urchin/urchin.crt b/files/nodes/urchin/urchin.crt deleted file mode 100644 index 8f88c88..0000000 --- a/files/nodes/urchin/urchin.crt +++ /dev/null @@ -1,33 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFsDCCA5igAwIBAgIRAJgayCcFu1l9kSzxeDJH6bgwDQYJKoZIhvcNAQELBQAw -SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww -GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE1MDIxMDAwMDAwMFoXDTE2 -MDIxMDAwMDAwMFowITEfMB0GA1UEAwwWdXJjaGluLmRldi5iaXRtYXNrLm5ldDCC -AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJ9uRkKjjzLO9/mN5ZpUiShN -2nUP/ZKqf3tG8vLYb6I0GhlEHDU8ldqVIwnFKn48kaRL+Psw+BXie0DR0QHKMjn9 -Qe8pfbKTopDnaJ4SFnvzlHyHJqkiGQvqGb/h5HlzWMABlM3zdeAE13VbMft/OXNN -cTqpaSDDCugwzfmFOO5nSVotFj8jEfM3U3QYbrElRWhq7WlLqK1VVSKYPHM4M9qA -FEQ9P/oVTf/cx0FY6COaWiRTMYLh4PiB8MlXOc3CF18wNOc911skAn+oPHDEApTy -pOvxRQxM9yARC4509JNbzXU7nwHx68swpkPT/atkGRQWxro0Q51LHKujd+7b0tIY -aHgZliCgjB8QAtPSvy1xfaR8JNYRRXQsb/XjnpOpv89VZ9gPzF7OXJnl09e0si+8 -rG4VXsiRS7kEncMfEN8dVdoeOevJX3JWck7+UqgI70Nw4x/hTeBvYLGOTG/XvpuY -CeDGNYrSHq2fCHUfP9CIZ+VhtjV4TOg2au5qFMst427DAWMYgUE+raE0ww1L18RT -XYsc+nrFqUjOjhGbjHNkwh+Vik9VugylBfI3PW78C3VTt7ExERuqhThUrXy3/oh9 -wDiv1JH5Hr/D/Jp9/8c+smlni50ruQzpLaNSNR1zRMTEw/7uTeNeiq47bntGQopW -dptVxDOtSyYXPuJ+F6rzAgMBAAGjgbkwgbYwHQYDVR0OBBYEFP/Oxvd4TmXsU02c -r658hL9IkUwqMD0GA1UdEQQ2MDSCFHVyY2hpbi5kZXYuYml0bWFzay5pghZ1cmNo -aW4uZGV2LmJpdG1hc2submV0hwSwNUUVMAsGA1UdDwQEAwIFoDAdBgNVHSUEFjAU -BggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIwADAfBgNVHSMEGDAWgBS5gYMs -vayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0BAQsFAAOCAgEARcE52/a5tn6Jkl7W -7AQT5XwNUPQpcHb7C4iK7nIJ0ZiAz5Mkeu+qNt+c8aIL12VdyZ26ckmEtnEq9tvC -AUtvnPb4JMikD5y5tLwXLH60bS8IqgQZfJw9Wjrxb5RG/ZOiW9K/itxCo9wVNXkM -yQ9EnV9xJRcMYhQgb+/GgT8Gs/YlMki8d9UVgKbpWol+G2buc7VSe2x9q/9Of1PT -lVmdcSYSYEiu52JRBYXh6FEKhHTD72YOT2sLZQmwD1V86An0OforHW/klgs08/mn -X6BDfnd8gFu+mhiTQi7ClZXXy5fFIhY0oAQ2v12w7ocQD4WDhqDgPqdHny7RGzf2 -u1IZGjn+uuPWM8Nqo7jrzkGqUGh06amw8NgwipAV2B0ga6BjPyzkPtGLCh5q6lEg -m1ZfUoG/lT4L3mytFlm26hoJhG+t9aHzxBfisMPD8wzGmTZR/YMwBwZVkWaziIhm -W0WRcZBiS2gJwNGCLxHuEOyzrpyES2IXx35KqFuN6nnkacSvYEds5hjAAcdV/kCJ -kyWhhTfp2j2jdHLp/zXSaTB9kTrThAVHwLxaQW/lLhmGnWnIoZJ1r6gNnviC6TJl -/gjRYuJ4GY+Qv4kVbQxJtAygvggwZa3239GSUsk5u0RAl9WXIggRz9608f00BdWf -rbX+vWsGmizCAC6WQXG1QkLa+pM= ------END CERTIFICATE----- diff --git a/files/nodes/urchin/urchin.key b/files/nodes/urchin/urchin.key deleted file mode 100644 index 4caccc5..0000000 --- a/files/nodes/urchin/urchin.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY----- diff --git a/files/nodes/urchin/urchin_ssh.pub b/files/nodes/urchin/urchin_ssh.pub deleted file mode 100644 index 7604604..0000000 --- a/files/nodes/urchin/urchin_ssh.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkcNk748DAajCK3W99eLrc15nRGFeeEH4YLbsVd4gwNLzKsmVdm2oOAXl6Qb9nW2FIwsl37LR5dB/AU7lWQVICQ4CSdy9pwoWh6rd4tbobyMaQLDtx/oUXJlYBy7KBInSMxIPs2MRe9SG3BfhWvuj1m+bBSfqRQVj3YeE1M3pTMNHrYjDcdXusGITAxqNYDtN3+d4npVClavO5MuxQ4yr/vS8ibfvO21PMp2Sa9JtTXNX2Y1fF3xq0XT5UZd8YhnN/WWIaAxtkp3WMFLTOkFYTo+T3/C0Gsx6v+xCjKyytviquOJeLVJQ5ofP2RC0cSYdJJA1gs8bgUce3Sdp1+iij
\ No newline at end of file diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts index d6dd1e1..f5a9ad1 100644 --- a/files/ssh/known_hosts +++ b/files/ssh/known_hosts @@ -7,11 +7,10 @@ armadillo,armadillo.bleeding.bitmask.i,armadillo.bleeding.bitmask.net,1.209.122. canvasback,canvasback.cdev.bitmask.i,canvasback.cdev.bitmask.net,199.119.112.4 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBH5g/h43gZ3pQsU8ohme4J2mDeZgxGnd3lfR428GRqxKH4MEDGGrimpK1oPf6scey+oD8WYvSYP3ZjPFZHxyq4A= chameleon,chameleon.unstable.bitmask.i,chameleon.unstable.bitmask.net,199.119.112.10 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCbam3MYRlMunsimA/FMoS3qH03GcSTS7PPphE5es7oucWidaBp8HUKhl9SXTXe/98wYWTTMZPdWvjJvloWHxTAH1nt/TQxcCRZLPjaInt7NUo3aV5u0ADNaBKvcI8mFZMECSOol8ss+2+HHaqN3AQXcrotClz0vDb0a/9wPBKO0/oYR9PaDBR2wqq5TpOQn7lLmvygMCxvMr9PGgn02RnVsMHQ7qBH+Dk2MDM9DqT4Nr/WW61kwQKv1G/cfAD0MFN2HHMBj6Tx4pHPgTm9GhlEGmkUzykNSrqkg5V69peqeDTkNTkWy6WIwzk0Td7ohhLypa4dMUB5miSPHObrKSDJ chipmonk,chipmonk.cdev.bitmask.i,chipmonk.cdev.bitmask.net,199.119.112.19 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDyqIb8/kigC0IUCVFlIKmhp5+C/P2W7d71jMX6ZK9XAzRzxFdMmcvn5H6ypUsLWQ7r327nD1bRupKiYdmPWrWk= -clam,clam.dev.bitmask.i,clam.dev.bitmask.net,176.53.69.22 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqXPBidNRThgSRlEeKFuLxnGf/kmkaHoBimkZRrN7kxhGAwYSrf5mtUGqVFWGcWMPYhqU1uGkZnCgQWV9d60OmWNIZNqsq5Rs343PGKW9S3LrnAa0yFZKLRtESCh53taxF+uJ/vcV76oai+I7b2EZOVtUP6F+iSb3/D+piAcL+p284KkKywsj9FREoh+dpMHthSb7bQDSKqq9UZJVEDQev1tjT7FHnbIY0QJLcYBtYbj945G63UYPQbHVxkl2GCaTXLKaC5CfLRH6cHvwLS3HtyCFEgo9fw0BqztN+Q50+YiQYlKmY6DEnMxwyB7/CjzBcDPa+e0qXygV2mjaHsuN9 +clam,clam.dev.bitmask.i,clam.dev.bitmask.net,176.53.69.22 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqsU3rov6ems9MEt/dt/bU3t8lwTUoFHwcADLyXgi+SfYr7KduMY+0NweHGR2Q5A3X3y4zJmulYxliFBdq8zYOp+etwNMwuqdy0qCjcbUn7VkvGI/AY4kcqJhcQRhvRfrB0auUyEKspTCjQ27M6HQgKyAlc3GSR6iu/fMmA+lw9p1QjNsCh9HHoaRe+qlg7tmAd5xkTlvk1xZpEz0MNKeNoGbblq+vTWKYfN3GBiwhQNfJhkIaqvzNgoSiqG7P4MY2gXkKfQSQXeVd2OT6kZN41KBBZPE7mRA9pFKIaEx3YGnwjxRrhzdrCz2F5uQzBZAtqs2gcIWeXE6/uvtr9JBz deer,deer.dev.bitmask.i,deer.dev.bitmask.net,202.85.233.34 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFAlVLkQ2644Lq7HCw6Sf7dxNNAXzkNg0owBqwAMV73OFeFZJadxQENQ/9bJKKQSst7LBXnlNNW4IDnVu1Hc9p6iWDfxFxUqzz1PJQcZy6qTOQXcMR59Wd6GEpXtjjWeKD6N+LxIJdtUYajHEbet7mF9SeZUIN/f1JJ8SetwI6GZeqLywvdeLlVl4CvRZ0EePazsYY6rkGRMaZeNYfY+bUHtY67eth/tO1gEvwnXkYCIkfVxYHruOxyGENPimI8tW9dSuTF8yxwfuyJlPldgYs0Oln4o4rE5/694UiGZK+NUbtansNgE2BrTUv9aeGjohRE9G+6Pjidsm5cxnnEwPd demodex,demodex.dev.bitmask.i,demodex.dev.bitmask.net,204.13.164.171 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2iNuS97BTd7flA/8nho/w3+THNriQPf1IpgcI/TCaTxIG5T85FRIApNAIxayJjBAt9C/MM8LMUlpRTq1Y8vlpYmfcWAJj5V8bbP03TXNIkgK8rtStjN061bhWXo4AVfD1hFyL+wUrdGRX2laaJvOgMO+UCkYb9PPqEfyKCMhcu3Da7auznYucrNxcJwCU4TpVgmQDYE0DWpYkssTbGJ7YJOZAtwNWtOrZFVRzOvMy3WvAM/s0x/ME6CQi6k6dDHlSpafhPAl/B4koTtnPksmXc7xCpmaun1j68C0yvD1l9QBPKyFwJ1KCJgx+9++CqnSFbIbX3ebb0FGtMHrak2xL elephant,elephant.dev.bitmask.i,elephant.dev.bitmask.net,176.53.69.13 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7XlP9uTmyHhP8x3ZqKZZfAiUtrVueWm+5yYJ1hJYHv9+o3WLN3AAv8q+ISd5AHE8XyHgXUZHfYZ8kOtF4DqPAXshhXxvmoRu5bSl+H36q0wFDUkM5z97IM46/ryDaQD0JlgNkZPARlHqZbKOf8ge4uVRxgV18bw9+E8aoNkjnMnC6TZBjXmpwa1tnIrfRN0NEEBYUyN8Hz8zZ0FA6o3q6FvWq1UzCntU4lhzvFV83PzU7r1tnUr8qWiVw708oPTduK9Lvzx7jgpNJYDKlCUJscXfwL4CYtn9AzaCTS1LsbH0apr7ccGatFwZ+6SRZQ9wUCsd6vP2reM93MTyYVg7N -elk,elk.dev.bitmask.i,elk.dev.bitmask.net,1.209.122.21 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrcf0LAT87yXYy8D6M2cnn88Cq+sHn+yCc5bApC8eDAsnEhU85AM23uPPlhvrGUlC2sWq5027693OOiUeoWuIv62J0ezggw4m8NLp8Y1zWsx9jS7y3wUHjGmZcB/abWUOLLT9ouQoZeGRqix0jaSkO1VnjRwKzPPhLYhbsxuVVy2hvAWDoV0ufaJi1N+wpqPzDrUa5SrlEyGbhnPiA+AlVU6GyCxB/DV+PiURf+W52dDeiFkOGlPgwu4vzMj1nes6wrQKTguINBw+6tTIF3C6hIqtbIRu+EVV4JFQ/UjuaZ57ubw616R3BC8IJdwSycZ3TFbEDLRpG9AkKS/OBI8OV frog,frog.bitmask.i,frog.bitmask.net,199.119.112.23 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNurBzA0Yk4smJr9x+EttnpdaZg9FNnWTl+JKwmYBMXxaoh+W0fOCkooA5DuQq/e6V/BmJC5WoerFWhV2oxSs5w= gadwall,gadwall.cdev.bitmask.i,gadwall.cdev.bitmask.net,199.119.112.5 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC4ycn7GabjeeewBmzTUbH+rZjRQV9seFmqbW2o5cE4jLsbPIMcMRRwLhA7TfIRLL7bLyuRNUWXwOqKZb/Psiog= gorilla,gorilla.bleeding.bitmask.i,gorilla.bleeding.bitmask.net,1.209.122.26 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAvgagCu3wyJizByW+JMLGn0CcMIDSxBU0QdBqcu65DDKOyJvVWL2fSHEOu0xdVmQow7ecoirrJZqL6VzrFVp8ur1Rn7+IR2RdtADtel4dbi7Hr1PuvNTKuE/NsRtX3p+zZHEl6SkFBVIgInlfezQxyytyLzL5mCjUCIe74krHDrU9bLkIwet3V/33SHjNYvv4BZ0VxCjvioI6iallhTw0ysizNFrbt3gyOCmS64E9qZWzYhzYUz8lF6nGpjNuwFcqrnZ0UN9Pk9905YuVAjO9H9kAIEKQ+bqAY0va8jcVC7NRKv3n5E7JFbr4SzSoOLulmkVDPRimax2XEt1fA8vr @@ -27,5 +26,4 @@ seahorse,seahorse.unstable.bitmask.i,seahorse.unstable.bitmask.net,199.119.112.1 snail,snail.dev.bitmask.i,snail.dev.bitmask.net,176.53.69.14 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGhGw8BA+EBnkf0puixL34qlzciMCnVfot3OySQp5bRlrTYkHnsbjjHjj0UmccQMHLOdo06wK8vgWWuXOL6kH/FFZ3EumoIwrt5Nfwe2kIvPtJNlgqCEGCA9fkZSffQdbkdfgH68XCPDClgKeol5lp/epuDu3FBAU7ZglQCnbljSEUDmlGfn2rc06QikmnzvetDrLllV78KwIseclx/2zb97+JAiTcPIEYxWW7LKOoHwOYXVo4mJNMMOcuaEyomhO1j3TMWOcmvEwFdwyF34dhN4Hte6Tqz4StNd7T7xezu2qZ8dCQ59S4G80zZuAfHoZxqzbR5DSq/MF7lblGpgHt starfish,starfish.dev.bitmask.i,starfish.dev.bitmask.net,176.53.69.23 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkbUoYD7f7Sbl+ElkJmxopRXh21DhcrVfFqlUwSdSpnAtgTSFRC1JMrDkPdJ69htsYiwoB+Bed0FQyCB4NU0QJbgM73VXJ0SqrpJJKx/7Ry5E8aBukiaAe8k8O6ZbnPeoZx11PwrSlS9Wrh928tuH7/ism7XHytlFYayYywvY2djIy9TbLsuOV6EQmVAVONhRVet4iOiFqfFDplRjttFVMJROO8W51YDdcTEwR+gLwS7yKp3e/XZT1vrHzmKo7j9saEgC0KncJrGDqoZ0Q1U0Did+MmHRQTJ13TcjHDnCiU7nO9w6OgGo4nTzGOJCjJkJm8opCxT3X0jCcHIkmEIU/ thrips,thrips.demo.bitmask.i,thrips.demo.bitmask.net,204.13.164.162 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIJHNnsfeuNBkVRm7cJvgD0rTX1wztnoz9SuHK2vJ9Pcluo8VfFoQrwayoFiAPJNC0dOoSra0Ir9L/eNQtjEzW0= -urchin,urchin.dev.bitmask.i,urchin.dev.bitmask.net,176.53.69.21 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkcNk748DAajCK3W99eLrc15nRGFeeEH4YLbsVd4gwNLzKsmVdm2oOAXl6Qb9nW2FIwsl37LR5dB/AU7lWQVICQ4CSdy9pwoWh6rd4tbobyMaQLDtx/oUXJlYBy7KBInSMxIPs2MRe9SG3BfhWvuj1m+bBSfqRQVj3YeE1M3pTMNHrYjDcdXusGITAxqNYDtN3+d4npVClavO5MuxQ4yr/vS8ibfvO21PMp2Sa9JtTXNX2Y1fF3xq0XT5UZd8YhnN/WWIaAxtkp3WMFLTOkFYTo+T3/C0Gsx6v+xCjKyytviquOJeLVJQ5ofP2RC0cSYdJJA1gs8bgUce3Sdp1+iij wallaby,wallaby.demo.bitmask.i,wallaby.demo.bitmask.net,204.13.164.57 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP/bJJ5OoSveoTEXAl26Gz0tqJkwzdA2fezMFeyoDDF6BCWntfzFZahoxHWg5alUfNMCJeYYOPYu/k05QzXThkQ= diff --git a/hiera/ant.yaml b/hiera/ant.yaml index fb4fd75..b752965 100644 --- a/hiera/ant.yaml +++ b/hiera/ant.yaml @@ -85,11 +85,36 @@ mail: - leech.demo.bitmask.net name: ant platform: - major_version: "0.6" - version: "0.6" + major_version: "0.7" + version: "0.7" service_type: internal_service services: - couchdb +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -113,6 +138,9 @@ ssh: kwadronaut: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw== type: ssh-rsa + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== type: ssh-rsa diff --git a/hiera/armadillo.yaml b/hiera/armadillo.yaml index caed966..5ad8ed4 100644 --- a/hiera/armadillo.yaml +++ b/hiera/armadillo.yaml @@ -82,11 +82,36 @@ mail: smarthost: [] name: armadillo platform: - major_version: "0.6" - version: "0.6" + major_version: "0.7" + version: "0.7" service_type: internal_service services: - couchdb +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -110,6 +135,9 @@ ssh: kwadronaut: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw== type: ssh-rsa + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== type: ssh-rsa diff --git a/hiera/canvasback.yaml b/hiera/canvasback.yaml index aa311b6..c118d32 100644 --- a/hiera/canvasback.yaml +++ b/hiera/canvasback.yaml @@ -153,11 +153,36 @@ nickserver: domain: nicknym.cdev.bitmask.net port: 6425 platform: - major_version: "0.6" - version: "0.6" + major_version: "0.7" + version: "0.7" service_type: public_service services: - webapp +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -181,6 +206,9 @@ ssh: kwadronaut: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw== type: ssh-rsa + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== type: ssh-rsa @@ -223,12 +251,16 @@ webapp: client_certificates: bit_size: 2048 digest: SHA256 - life_span: 2m + life_span: "2 months" limited_prefix: LIMITED unlimited_prefix: UNLIMITED client_version: max: ~ - min: "0.5" + min: "0.7" + couchdb_admin_user: + password: abVQmkZubeAvncgcVSYRD4_pHANEItWb + salt: a5a58ff4365be3113f19014ea3050129 + username: admin couchdb_webapp_user: password: _CatyL3Ienc4wRrfPubrhyfYCFmCyt9t salt: 1c1dd6eb78f027414f1638bd6c902a5a @@ -241,17 +273,41 @@ webapp: forbidden_usernames: - admin - administrator + - administrators + - admins - arin-admin - certmaster - contact + - email + - help + - help-desk + - help-ticket + - help-tickets + - help_desk + - help_ticket + - help_tickets + - helpdesk + - helpticket + - helptickets - info + - mail - maildrop + - noreply + - owner + - owners - postmaster + - reply + - robot - ssladmin + - staff + - support + - tech-support + - tech_support + - techsupport + - ticket + - tickets + - vmail - www-data - git: - revision: origin/version/0.6 - source: "https://leap.se/git/leap_web" modules: - billing - help diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml index a4fcf7a..55f2563 100644 --- a/hiera/chameleon.yaml +++ b/hiera/chameleon.yaml @@ -200,7 +200,7 @@ hosts: clam: domain_full: clam.dev.bitmask.net domain_internal: clam.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqXPBidNRThgSRlEeKFuLxnGf/kmkaHoBimkZRrN7kxhGAwYSrf5mtUGqVFWGcWMPYhqU1uGkZnCgQWV9d60OmWNIZNqsq5Rs343PGKW9S3LrnAa0yFZKLRtESCh53taxF+uJ/vcV76oai+I7b2EZOVtUP6F+iSb3/D+piAcL+p284KkKywsj9FREoh+dpMHthSb7bQDSKqq9UZJVEDQev1tjT7FHnbIY0QJLcYBtYbj945G63UYPQbHVxkl2GCaTXLKaC5CfLRH6cHvwLS3HtyCFEgo9fw0BqztN+Q50+YiQYlKmY6DEnMxwyB7/CjzBcDPa+e0qXygV2mjaHsuN9" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqsU3rov6ems9MEt/dt/bU3t8lwTUoFHwcADLyXgi+SfYr7KduMY+0NweHGR2Q5A3X3y4zJmulYxliFBdq8zYOp+etwNMwuqdy0qCjcbUn7VkvGI/AY4kcqJhcQRhvRfrB0auUyEKspTCjQ27M6HQgKyAlc3GSR6iu/fMmA+lw9p1QjNsCh9HHoaRe+qlg7tmAd5xkTlvk1xZpEz0MNKeNoGbblq+vTWKYfN3GBiwhQNfJhkIaqvzNgoSiqG7P4MY2gXkKfQSQXeVd2OT6kZN41KBBZPE7mRA9pFKIaEx3YGnwjxRrhzdrCz2F5uQzBZAtqs2gcIWeXE6/uvtr9JBz" ip_address: "176.53.69.22" port: 4422 deer: @@ -221,12 +221,6 @@ hosts: host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7XlP9uTmyHhP8x3ZqKZZfAiUtrVueWm+5yYJ1hJYHv9+o3WLN3AAv8q+ISd5AHE8XyHgXUZHfYZ8kOtF4DqPAXshhXxvmoRu5bSl+H36q0wFDUkM5z97IM46/ryDaQD0JlgNkZPARlHqZbKOf8ge4uVRxgV18bw9+E8aoNkjnMnC6TZBjXmpwa1tnIrfRN0NEEBYUyN8Hz8zZ0FA6o3q6FvWq1UzCntU4lhzvFV83PzU7r1tnUr8qWiVw708oPTduK9Lvzx7jgpNJYDKlCUJscXfwL4CYtn9AzaCTS1LsbH0apr7ccGatFwZ+6SRZQ9wUCsd6vP2reM93MTyYVg7N" ip_address: "176.53.69.13" port: 4422 - elk: - domain_full: elk.dev.bitmask.net - domain_internal: elk.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrcf0LAT87yXYy8D6M2cnn88Cq+sHn+yCc5bApC8eDAsnEhU85AM23uPPlhvrGUlC2sWq5027693OOiUeoWuIv62J0ezggw4m8NLp8Y1zWsx9jS7y3wUHjGmZcB/abWUOLLT9ouQoZeGRqix0jaSkO1VnjRwKzPPhLYhbsxuVVy2hvAWDoV0ufaJi1N+wpqPzDrUa5SrlEyGbhnPiA+AlVU6GyCxB/DV+PiURf+W52dDeiFkOGlPgwu4vzMj1nes6wrQKTguINBw+6tTIF3C6hIqtbIRu+EVV4JFQ/UjuaZ57ubw616R3BC8IJdwSycZ3TFbEDLRpG9AkKS/OBI8OV" - ip_address: "1.209.122.21" - port: 4422 frog: domain_full: frog.bitmask.net domain_internal: frog.bitmask.i @@ -317,12 +311,6 @@ hosts: host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIJHNnsfeuNBkVRm7cJvgD0rTX1wztnoz9SuHK2vJ9Pcluo8VfFoQrwayoFiAPJNC0dOoSra0Ir9L/eNQtjEzW0=" ip_address: "204.13.164.162" port: 4422 - urchin: - domain_full: urchin.dev.bitmask.net - domain_internal: urchin.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkcNk748DAajCK3W99eLrc15nRGFeeEH4YLbsVd4gwNLzKsmVdm2oOAXl6Qb9nW2FIwsl37LR5dB/AU7lWQVICQ4CSdy9pwoWh6rd4tbobyMaQLDtx/oUXJlYBy7KBInSMxIPs2MRe9SG3BfhWvuj1m+bBSfqRQVj3YeE1M3pTMNHrYjDcdXusGITAxqNYDtN3+d4npVClavO5MuxQ4yr/vS8ibfvO21PMp2Sa9JtTXNX2Y1fF3xq0XT5UZd8YhnN/WWIaAxtkp3WMFLTOkFYTo+T3/C0Gsx6v+xCjKyytviquOJeLVJQ5ofP2RC0cSYdJJA1gs8bgUce3Sdp1+iij" - ip_address: "176.53.69.21" - port: 4422 wallaby: domain_full: wallaby.demo.bitmask.net domain_internal: wallaby.demo.bitmask.i @@ -455,15 +443,6 @@ nagios: services: - webapp ssh_port: 4422 - elk: - domain_full_suffix: dev.bitmask.net - domain_internal: elk.dev.bitmask.i - domain_internal_suffix: dev.bitmask.i - environment: development - ip_address: "1.209.122.21" - services: - - couchdb - ssh_port: 4422 frog: domain_full_suffix: bitmask.net domain_internal: frog.bitmask.i @@ -608,16 +587,6 @@ nagios: - couchdb - soledad ssh_port: 4422 - urchin: - domain_full_suffix: dev.bitmask.net - domain_internal: urchin.dev.bitmask.i - domain_internal_suffix: dev.bitmask.i - environment: development - ip_address: "176.53.69.21" - services: - - couchdb - - soledad - ssh_port: 4422 wallaby: domain_full_suffix: demo.bitmask.net domain_internal: wallaby.demo.bitmask.i diff --git a/hiera/chipmonk.yaml b/hiera/chipmonk.yaml index 23e6eb7..fdcea5a 100644 --- a/hiera/chipmonk.yaml +++ b/hiera/chipmonk.yaml @@ -50,12 +50,10 @@ location: mail: smarthost: [] mynetworks: - - "1.209.122.21" - "1.209.122.24" - "1.209.122.26" - "176.53.69.13" - "176.53.69.14" - - "176.53.69.21" - "176.53.69.22" - "176.53.69.23" - "192.168.5.10" @@ -88,11 +86,36 @@ mynetworks: - "85.17.92.143" name: chipmonk platform: - major_version: "0.6" - version: "0.6" + major_version: "0.7" + version: "0.7" service_type: user_service services: - mx +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -116,6 +139,9 @@ ssh: kwadronaut: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw== type: ssh-rsa + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== type: ssh-rsa diff --git a/hiera/clam.yaml b/hiera/clam.yaml index 89a9456..808b397 100644 --- a/hiera/clam.yaml +++ b/hiera/clam.yaml @@ -7,9 +7,7 @@ couch: cookie: HrwZSWSPLYqySjqWpFYDBD8kzPSZIDf7 ednp_port: 9002 epmd_port: 4369 - neighbors: - - elk.dev.bitmask.net - - urchin.dev.bitmask.net + neighbors: [] master: false mode: multimaster port: 5984 @@ -60,27 +58,15 @@ hosts: clam: domain_full: clam.dev.bitmask.net domain_internal: clam.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqXPBidNRThgSRlEeKFuLxnGf/kmkaHoBimkZRrN7kxhGAwYSrf5mtUGqVFWGcWMPYhqU1uGkZnCgQWV9d60OmWNIZNqsq5Rs343PGKW9S3LrnAa0yFZKLRtESCh53taxF+uJ/vcV76oai+I7b2EZOVtUP6F+iSb3/D+piAcL+p284KkKywsj9FREoh+dpMHthSb7bQDSKqq9UZJVEDQev1tjT7FHnbIY0QJLcYBtYbj945G63UYPQbHVxkl2GCaTXLKaC5CfLRH6cHvwLS3HtyCFEgo9fw0BqztN+Q50+YiQYlKmY6DEnMxwyB7/CjzBcDPa+e0qXygV2mjaHsuN9" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqsU3rov6ems9MEt/dt/bU3t8lwTUoFHwcADLyXgi+SfYr7KduMY+0NweHGR2Q5A3X3y4zJmulYxliFBdq8zYOp+etwNMwuqdy0qCjcbUn7VkvGI/AY4kcqJhcQRhvRfrB0auUyEKspTCjQ27M6HQgKyAlc3GSR6iu/fMmA+lw9p1QjNsCh9HHoaRe+qlg7tmAd5xkTlvk1xZpEz0MNKeNoGbblq+vTWKYfN3GBiwhQNfJhkIaqvzNgoSiqG7P4MY2gXkKfQSQXeVd2OT6kZN41KBBZPE7mRA9pFKIaEx3YGnwjxRrhzdrCz2F5uQzBZAtqs2gcIWeXE6/uvtr9JBz" ip_address: "176.53.69.22" port: 4422 - elk: - domain_full: elk.dev.bitmask.net - domain_internal: elk.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrcf0LAT87yXYy8D6M2cnn88Cq+sHn+yCc5bApC8eDAsnEhU85AM23uPPlhvrGUlC2sWq5027693OOiUeoWuIv62J0ezggw4m8NLp8Y1zWsx9jS7y3wUHjGmZcB/abWUOLLT9ouQoZeGRqix0jaSkO1VnjRwKzPPhLYhbsxuVVy2hvAWDoV0ufaJi1N+wpqPzDrUa5SrlEyGbhnPiA+AlVU6GyCxB/DV+PiURf+W52dDeiFkOGlPgwu4vzMj1nes6wrQKTguINBw+6tTIF3C6hIqtbIRu+EVV4JFQ/UjuaZ57ubw616R3BC8IJdwSycZ3TFbEDLRpG9AkKS/OBI8OV" - ip_address: "1.209.122.21" - port: 4422 starfish: domain_full: starfish.dev.bitmask.net domain_internal: starfish.dev.bitmask.i host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkbUoYD7f7Sbl+ElkJmxopRXh21DhcrVfFqlUwSdSpnAtgTSFRC1JMrDkPdJ69htsYiwoB+Bed0FQyCB4NU0QJbgM73VXJ0SqrpJJKx/7Ry5E8aBukiaAe8k8O6ZbnPeoZx11PwrSlS9Wrh928tuH7/ism7XHytlFYayYywvY2djIy9TbLsuOV6EQmVAVONhRVet4iOiFqfFDplRjttFVMJROO8W51YDdcTEwR+gLwS7yKp3e/XZT1vrHzmKo7j9saEgC0KncJrGDqoZ0Q1U0Did+MmHRQTJ13TcjHDnCiU7nO9w6OgGo4nTzGOJCjJkJm8opCxT3X0jCcHIkmEIU/" ip_address: "176.53.69.23" port: 4422 - urchin: - domain_full: urchin.dev.bitmask.net - domain_internal: urchin.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkcNk748DAajCK3W99eLrc15nRGFeeEH4YLbsVd4gwNLzKsmVdm2oOAXl6Qb9nW2FIwsl37LR5dB/AU7lWQVICQ4CSdy9pwoWh6rd4tbobyMaQLDtx/oUXJlYBy7KBInSMxIPs2MRe9SG3BfhWvuj1m+bBSfqRQVj3YeE1M3pTMNHrYjDcdXusGITAxqNYDtN3+d4npVClavO5MuxQ4yr/vS8ibfvO21PMp2Sa9JtTXNX2Y1fF3xq0XT5UZd8YhnN/WWIaAxtkp3WMFLTOkFYTo+T3/C0Gsx6v+xCjKyytviquOJeLVJQ5ofP2RC0cSYdJJA1gs8bgUce3Sdp1+iij" - ip_address: "176.53.69.21" - port: 4422 ip_address: "176.53.69.22" location: country_code: TR @@ -92,8 +78,8 @@ mail: - starfish.dev.bitmask.net name: clam platform: - major_version: "0.6" - version: "0.6" + major_version: "0.7" + version: "0.7" service_type: public_service services: - couchdb @@ -105,6 +91,31 @@ soledad: username: soledad port: 2323 require_couchdb: true +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -128,6 +139,9 @@ ssh: kwadronaut: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw== type: ssh-rsa + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== type: ssh-rsa @@ -143,28 +157,8 @@ ssh: port: 4422 stunnel: clients: - ednp_clients: - elk_9002: - accept_port: 4002 - connect: elk.dev.bitmask.i - connect_port: 19002 - original_port: 9002 - urchin_9002: - accept_port: 4003 - connect: urchin.dev.bitmask.i - connect_port: 19002 - original_port: 9002 - epmd_clients: - elk_4369: - accept_port: 4000 - connect: elk.dev.bitmask.i - connect_port: 14369 - original_port: 4369 - urchin_4369: - accept_port: 4001 - connect: urchin.dev.bitmask.i - connect_port: 14369 - original_port: 4369 + ednp_clients: {} + epmd_clients: {} servers: couch_server: accept_port: 15984 diff --git a/hiera/deer.yaml b/hiera/deer.yaml index a178a44..e0d11ca 100644 --- a/hiera/deer.yaml +++ b/hiera/deer.yaml @@ -26,11 +26,36 @@ mail: - starfish.dev.bitmask.net name: deer platform: - major_version: "0.6" - version: "0.6" + major_version: "0.7" + version: "0.7" service_type: internal_service services: - tor +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -54,6 +79,9 @@ ssh: kwadronaut: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw== type: ssh-rsa + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== type: ssh-rsa diff --git a/hiera/demodex.yaml b/hiera/demodex.yaml index 192ed94..ba8b936 100644 --- a/hiera/demodex.yaml +++ b/hiera/demodex.yaml @@ -26,11 +26,36 @@ mail: - starfish.dev.bitmask.net name: demodex platform: - major_version: "0.6" - version: "0.6" + major_version: "0.7" + version: "0.7" service_type: internal_service services: - backup +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -54,6 +79,9 @@ ssh: kwadronaut: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw== type: ssh-rsa + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== type: ssh-rsa diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml index 8c05b53..7725d24 100644 --- a/hiera/elephant.yaml +++ b/hiera/elephant.yaml @@ -121,12 +121,6 @@ definition_files: "ip_address": "176.53.69.22", "location": "istanbul", "port": 2323 - }, - "urchin": { - "hostname": "urchin.dev.bitmask.net", - "ip_address": "176.53.69.21", - "location": "istanbul", - "port": 2323 } }, "locations": { @@ -167,43 +161,19 @@ haproxy: port: 4000 weight: 100 writable: true - elk: - backup: true - host: localhost - port: 4001 - weight: 10 - writable: true - urchin: - backup: false - host: localhost - port: 4002 - weight: 100 - writable: true hosts: clam: domain_full: clam.dev.bitmask.net domain_internal: clam.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqXPBidNRThgSRlEeKFuLxnGf/kmkaHoBimkZRrN7kxhGAwYSrf5mtUGqVFWGcWMPYhqU1uGkZnCgQWV9d60OmWNIZNqsq5Rs343PGKW9S3LrnAa0yFZKLRtESCh53taxF+uJ/vcV76oai+I7b2EZOVtUP6F+iSb3/D+piAcL+p284KkKywsj9FREoh+dpMHthSb7bQDSKqq9UZJVEDQev1tjT7FHnbIY0QJLcYBtYbj945G63UYPQbHVxkl2GCaTXLKaC5CfLRH6cHvwLS3HtyCFEgo9fw0BqztN+Q50+YiQYlKmY6DEnMxwyB7/CjzBcDPa+e0qXygV2mjaHsuN9" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqsU3rov6ems9MEt/dt/bU3t8lwTUoFHwcADLyXgi+SfYr7KduMY+0NweHGR2Q5A3X3y4zJmulYxliFBdq8zYOp+etwNMwuqdy0qCjcbUn7VkvGI/AY4kcqJhcQRhvRfrB0auUyEKspTCjQ27M6HQgKyAlc3GSR6iu/fMmA+lw9p1QjNsCh9HHoaRe+qlg7tmAd5xkTlvk1xZpEz0MNKeNoGbblq+vTWKYfN3GBiwhQNfJhkIaqvzNgoSiqG7P4MY2gXkKfQSQXeVd2OT6kZN41KBBZPE7mRA9pFKIaEx3YGnwjxRrhzdrCz2F5uQzBZAtqs2gcIWeXE6/uvtr9JBz" ip_address: "176.53.69.22" port: 4422 - elk: - domain_full: elk.dev.bitmask.net - domain_internal: elk.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrcf0LAT87yXYy8D6M2cnn88Cq+sHn+yCc5bApC8eDAsnEhU85AM23uPPlhvrGUlC2sWq5027693OOiUeoWuIv62J0ezggw4m8NLp8Y1zWsx9jS7y3wUHjGmZcB/abWUOLLT9ouQoZeGRqix0jaSkO1VnjRwKzPPhLYhbsxuVVy2hvAWDoV0ufaJi1N+wpqPzDrUa5SrlEyGbhnPiA+AlVU6GyCxB/DV+PiURf+W52dDeiFkOGlPgwu4vzMj1nes6wrQKTguINBw+6tTIF3C6hIqtbIRu+EVV4JFQ/UjuaZ57ubw616R3BC8IJdwSycZ3TFbEDLRpG9AkKS/OBI8OV" - ip_address: "1.209.122.21" - port: 4422 starfish: domain_full: starfish.dev.bitmask.net domain_internal: starfish.dev.bitmask.i host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkbUoYD7f7Sbl+ElkJmxopRXh21DhcrVfFqlUwSdSpnAtgTSFRC1JMrDkPdJ69htsYiwoB+Bed0FQyCB4NU0QJbgM73VXJ0SqrpJJKx/7Ry5E8aBukiaAe8k8O6ZbnPeoZx11PwrSlS9Wrh928tuH7/ism7XHytlFYayYywvY2djIy9TbLsuOV6EQmVAVONhRVet4iOiFqfFDplRjttFVMJROO8W51YDdcTEwR+gLwS7yKp3e/XZT1vrHzmKo7j9saEgC0KncJrGDqoZ0Q1U0Did+MmHRQTJ13TcjHDnCiU7nO9w6OgGo4nTzGOJCjJkJm8opCxT3X0jCcHIkmEIU/" ip_address: "176.53.69.23" port: 4422 - urchin: - domain_full: urchin.dev.bitmask.net - domain_internal: urchin.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkcNk748DAajCK3W99eLrc15nRGFeeEH4YLbsVd4gwNLzKsmVdm2oOAXl6Qb9nW2FIwsl37LR5dB/AU7lWQVICQ4CSdy9pwoWh6rd4tbobyMaQLDtx/oUXJlYBy7KBInSMxIPs2MRe9SG3BfhWvuj1m+bBSfqRQVj3YeE1M3pTMNHrYjDcdXusGITAxqNYDtN3+d4npVClavO5MuxQ4yr/vS8ibfvO21PMp2Sa9JtTXNX2Y1fF3xq0XT5UZd8YhnN/WWIaAxtkp3WMFLTOkFYTo+T3/C0Gsx6v+xCjKyytviquOJeLVJQ5ofP2RC0cSYdJJA1gs8bgUce3Sdp1+iij" - ip_address: "176.53.69.21" - port: 4422 ip_address: "176.53.69.13" location: country_code: TR @@ -222,11 +192,36 @@ nickserver: domain: nicknym.dev.bitmask.net port: 6425 platform: - major_version: "0.6" - version: "0.6" + major_version: "0.7" + version: "0.7" service_type: public_service services: - webapp +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -250,6 +245,9 @@ ssh: kwadronaut: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw== type: ssh-rsa + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== type: ssh-rsa @@ -271,16 +269,6 @@ stunnel: connect: clam.dev.bitmask.i connect_port: 15984 original_port: 5984 - elk_5984: - accept_port: 4001 - connect: elk.dev.bitmask.i - connect_port: 15984 - original_port: 5984 - urchin_5984: - accept_port: 4002 - connect: urchin.dev.bitmask.i - connect_port: 15984 - original_port: 5984 servers: {} tags: - development @@ -314,7 +302,11 @@ webapp: unlimited_prefix: UNLIMITED client_version: max: ~ - min: "0.5" + min: "0.7" + couchdb_admin_user: + password: PkyRLKGfQAnmk64EXqHWBVsxJfksKXNH + salt: 51d3c78980b9cf319cadbc73896f7128 + username: admin couchdb_webapp_user: password: PvRAdP9JrjS8qRsNCpyQ_KVDBTgTNGkY salt: 86497f034c8ef09b097f5c757ab038b7 @@ -327,17 +319,41 @@ webapp: forbidden_usernames: - admin - administrator + - administrators + - admins - arin-admin - certmaster - contact + - email + - help + - help-desk + - help-ticket + - help-tickets + - help_desk + - help_ticket + - help_tickets + - helpdesk + - helpticket + - helptickets - info + - mail - maildrop + - noreply + - owner + - owners - postmaster + - reply + - robot - ssladmin + - staff + - support + - tech-support + - tech_support + - techsupport + - ticket + - tickets + - vmail - www-data - git: - revision: origin/version/0.6 - source: "https://leap.se/git/leap_web" modules: - billing - help diff --git a/hiera/elk.yaml b/hiera/elk.yaml deleted file mode 100644 index 9e68e0d..0000000 --- a/hiera/elk.yaml +++ /dev/null @@ -1,301 +0,0 @@ ---- -apt: - url: - backports: "http://ftp.daum.net/debian/" - basic: "http://ftp.daum.net/debian/" -contacts: - - micah@leap.se - - sysdev@leap.se -couch: - bigcouch: - cookie: HrwZSWSPLYqySjqWpFYDBD8kzPSZIDf7 - ednp_port: 9002 - epmd_port: 4369 - neighbors: - - clam.dev.bitmask.net - - urchin.dev.bitmask.net - master: false - mode: multimaster - port: 5984 - users: - admin: - password: PkyRLKGfQAnmk64EXqHWBVsxJfksKXNH - salt: 51d3c78980b9cf319cadbc73896f7128 - username: admin - leap_mx: - password: TISmwrYwSBmwbdDyQvJYu3_VkZmfZITc - salt: 79fd6d71c94a1aaf44cefc84a5a748dc - username: leap_mx - nickserver: - password: VH7PcCGPLAIy8WHcLIJxVKnUpR7A2EuM - salt: 70bcff5aeb5a7ed22a96a4b43790965f - username: nickserver - replication: - password: B7LFWg7x7AQRIXdxGmsd4MjfQISB_EZj - salt: 868afc4ca18138cc256f57ff2a3c99a5 - username: replication - soledad: - password: PgrbUREhqBGY4r4XIXQEgkk3jTH4sEJA - salt: e3bec4f7126db333ce796beabd322244 - username: soledad - tapicero: - password: rZ8MYBTj8fHZDxI7awS927cnhE8qbrBC - salt: 36d800745f39733c206c806f95397698 - username: tapicero - webapp: - password: PvRAdP9JrjS8qRsNCpyQ_KVDBTgTNGkY - salt: 86497f034c8ef09b097f5c757ab038b7 - username: webapp - webapp: - nagios_test_pw: zvzLB64_Z_5ZL5xvI5MfpUCP3b7gKzhP -development: - site_config: true -dns: - public: false -domain: - full: elk.dev.bitmask.net - full_suffix: dev.bitmask.net - internal: elk.dev.bitmask.i - internal_suffix: dev.bitmask.i - name: elk.dev.bitmask.i -enabled: true -environment: development -hosts: - clam: - domain_full: clam.dev.bitmask.net - domain_internal: clam.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqXPBidNRThgSRlEeKFuLxnGf/kmkaHoBimkZRrN7kxhGAwYSrf5mtUGqVFWGcWMPYhqU1uGkZnCgQWV9d60OmWNIZNqsq5Rs343PGKW9S3LrnAa0yFZKLRtESCh53taxF+uJ/vcV76oai+I7b2EZOVtUP6F+iSb3/D+piAcL+p284KkKywsj9FREoh+dpMHthSb7bQDSKqq9UZJVEDQev1tjT7FHnbIY0QJLcYBtYbj945G63UYPQbHVxkl2GCaTXLKaC5CfLRH6cHvwLS3HtyCFEgo9fw0BqztN+Q50+YiQYlKmY6DEnMxwyB7/CjzBcDPa+e0qXygV2mjaHsuN9" - ip_address: "176.53.69.22" - port: 4422 - elk: - domain_full: elk.dev.bitmask.net - domain_internal: elk.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrcf0LAT87yXYy8D6M2cnn88Cq+sHn+yCc5bApC8eDAsnEhU85AM23uPPlhvrGUlC2sWq5027693OOiUeoWuIv62J0ezggw4m8NLp8Y1zWsx9jS7y3wUHjGmZcB/abWUOLLT9ouQoZeGRqix0jaSkO1VnjRwKzPPhLYhbsxuVVy2hvAWDoV0ufaJi1N+wpqPzDrUa5SrlEyGbhnPiA+AlVU6GyCxB/DV+PiURf+W52dDeiFkOGlPgwu4vzMj1nes6wrQKTguINBw+6tTIF3C6hIqtbIRu+EVV4JFQ/UjuaZ57ubw616R3BC8IJdwSycZ3TFbEDLRpG9AkKS/OBI8OV" - ip_address: "1.209.122.21" - port: 4422 - starfish: - domain_full: starfish.dev.bitmask.net - domain_internal: starfish.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkbUoYD7f7Sbl+ElkJmxopRXh21DhcrVfFqlUwSdSpnAtgTSFRC1JMrDkPdJ69htsYiwoB+Bed0FQyCB4NU0QJbgM73VXJ0SqrpJJKx/7Ry5E8aBukiaAe8k8O6ZbnPeoZx11PwrSlS9Wrh928tuH7/ism7XHytlFYayYywvY2djIy9TbLsuOV6EQmVAVONhRVet4iOiFqfFDplRjttFVMJROO8W51YDdcTEwR+gLwS7yKp3e/XZT1vrHzmKo7j9saEgC0KncJrGDqoZ0Q1U0Did+MmHRQTJ13TcjHDnCiU7nO9w6OgGo4nTzGOJCjJkJm8opCxT3X0jCcHIkmEIU/" - ip_address: "176.53.69.23" - port: 4422 - urchin: - domain_full: urchin.dev.bitmask.net - domain_internal: urchin.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkcNk748DAajCK3W99eLrc15nRGFeeEH4YLbsVd4gwNLzKsmVdm2oOAXl6Qb9nW2FIwsl37LR5dB/AU7lWQVICQ4CSdy9pwoWh6rd4tbobyMaQLDtx/oUXJlYBy7KBInSMxIPs2MRe9SG3BfhWvuj1m+bBSfqRQVj3YeE1M3pTMNHrYjDcdXusGITAxqNYDtN3+d4npVClavO5MuxQ4yr/vS8ibfvO21PMp2Sa9JtTXNX2Y1fF3xq0XT5UZd8YhnN/WWIaAxtkp3WMFLTOkFYTo+T3/C0Gsx6v+xCjKyytviquOJeLVJQ5ofP2RC0cSYdJJA1gs8bgUce3Sdp1+iij" - ip_address: "176.53.69.21" - port: 4422 -ip_address: "1.209.122.21" -location: - country_code: KR - hemisphere: "N" - name: Seoul - timezone: "+9" -mail: - smarthost: - - starfish.dev.bitmask.net -name: elk -platform: - major_version: "0.6" - version: "0.6" -service_type: internal_service -services: - - couchdb -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: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== - type: ssh-rsa - 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: 4422 -stunnel: - clients: - ednp_clients: - clam_9002: - accept_port: 4002 - connect: clam.dev.bitmask.i - connect_port: 19002 - original_port: 9002 - urchin_9002: - accept_port: 4003 - connect: urchin.dev.bitmask.i - connect_port: 19002 - original_port: 9002 - epmd_clients: - clam_4369: - accept_port: 4000 - connect: clam.dev.bitmask.i - connect_port: 14369 - original_port: 4369 - urchin_4369: - accept_port: 4001 - connect: urchin.dev.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: - - development - - seoul -x509: - ca_cert: | - -----BEGIN CERTIFICATE----- - MIIFbzCCA1egAwIBAgIBATANBgkqhkiG9w0BAQ0FADBKMRgwFgYDVQQDDA9CaXRt - YXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNVBAsME2h0dHBzOi8v - Yml0bWFzay5uZXQwHhcNMTIxMTA2MDAwMDAwWhcNMjIxMTA2MDAwMDAwWjBKMRgw - FgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNV - BAsME2h0dHBzOi8vYml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw - ggIKAoICAQC1eV4YvayaU+maJbWrD4OHo3d7S1BtDlcvkIRS1Fw3iYDjsyDkZxai - dHp4EUasfNQ+EVtXUvtk6170EmLco6Elg8SJBQ27trE6nielPRPCfX3fQzETRfvB - 7tNvGw4Jn2YKiYoMD79kkjgyZjkJ2r/bEHUSevmR09BRp86syHZerdNGpXYhcQ84 - CA1+V+603GFIHnrP+uQDdssW93rgDNYu+exT+Wj6STfnUkugyjmPRPjL7wh0tzy+ - znCeLl4xiV3g9sjPnc7r2EQKd5uaTe3j71sDPF92KRk0SSUndREz+B1+Dbe/RGk4 - MEqGFuOzrtsgEhPIX0hplhb0Tgz/rtug+yTT7oJjBa3u20AAOQ38/M99EfdeJvc4 - lPFF1XBBLh6X9UKF72an2NuANiX6XPySnJgZ7nZ09RiYZqVwu/qt3DfvLfhboq+0 - bQvLUPXrVDr70onv5UDjpmEA/cLmaIqqrduuTkFZOym65/PfAPvpGnt7crQj/Ibl - DEDYZQmP7AS+6zBjoOzNjUGE5r40zWAR1RSi7zliXTu+yfsjXUIhUAWmYR6J3KxB - lfsiHBQ+8dn9kC3YrUexWoOqBiqJOAJzZh5Y1tqgzfh+2nmHSB2dsQRs7rDRRlyy - YMbkpzL9ZsOUO2eTP1mmar6YjCN+rggYjRrX71K2SpBG6b1zZxOG+wIDAQABo2Aw - XjAdBgNVHQ4EFgQUuYGDLL2sswnYpHHvProt1JU+D48wDgYDVR0PAQH/BAQDAgIE - MAwGA1UdEwQFMAMBAf8wHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48w - DQYJKoZIhvcNAQENBQADggIBADeG67vaFcbITGpi51264kHPYPEWaXUa5XYbtmBl - cXYyB6hY5hv/YNuVGJ1gWsDmdeXEyj0j2icGQjYdHRfwhrbEri+h1EZOm1cSBDuY - k/P5+ctHyOXx8IE79DBsZ6IL61UKIaKhqZBfLGYcWu17DVV6+LT+AKtHhOrv3TSj - RnAcKnCbKqXLhUPXpK0eTjPYS2zQGQGIhIy9sQXVXJJJsGrPgMxna1Xw2JikBOCG - htD/JKwt6xBmNwktH0GI/LVtVgSp82Clbn9C4eZN9E5YbVYjLkIEDhpByeC71QhX - EIQ0ZR56bFuJA/CwValBqV/G9gscTPQqd+iETp8yrFpAVHOW+YzSFbxjTEkBte1J - aF0vmbqdMAWLk+LEFPQRptZh0B88igtx6tV5oVd+p5IVRM49poLhuPNJGPvMj99l - mlZ4+AeRUnbOOeAEuvpLJbel4rhwFzmUiGoeTVoPZyMevWcVFq6BMkS+jRR2w0jK - G6b0v5XDHlcFYPOgUrtsOBFJVwbutLvxdk6q37kIFnWCd8L3kmES5q4wjyFK47Co - Ja8zlx64jmMZPg/t3wWqkZgXZ14qnbyG5/lGsj5CwVtfDljrhN0oCWK1FZaUmW3d - 69db12/g4f6phldhxiWuGC/W6fCW5kre7nmhshcltqAJJuU47iX+DarBFiIj816e - yV8e - -----END CERTIFICATE----- - cert: | - -----BEGIN CERTIFICATE----- - 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 - PO+cnwXHBGM+bZk= - -----END CERTIFICATE----- - commercial_ca_cert: ~ - commercial_cert: ~ - commercial_key: ~ - key: | - -----BEGIN RSA PRIVATE KEY----- - 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 - -----END RSA PRIVATE KEY----- - use: true - use_commercial: false diff --git a/hiera/frog.yaml b/hiera/frog.yaml index c09b1fa..df88877 100644 --- a/hiera/frog.yaml +++ b/hiera/frog.yaml @@ -20,11 +20,36 @@ mail: smarthost: [] name: frog platform: - major_version: "0.6" - version: "0.6" + major_version: "0.7" + version: "0.7" service_type: public_service services: - static +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -48,6 +73,9 @@ ssh: kwadronaut: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw== type: ssh-rsa + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== type: ssh-rsa @@ -65,7 +93,7 @@ static: bootstrap_files: client_version: max: ~ - min: "0.5" + min: "0.7" domain: bitmask.net enabled: true provider_json: ~ diff --git a/hiera/gadwall.yaml b/hiera/gadwall.yaml index 1bf3cc5..48c7b56 100644 --- a/hiera/gadwall.yaml +++ b/hiera/gadwall.yaml @@ -78,8 +78,8 @@ mail: - chipmonk.cdev.bitmask.net name: gadwall platform: - major_version: "0.6" - version: "0.6" + major_version: "0.7" + version: "0.7" service_type: public_service services: - couchdb @@ -91,6 +91,31 @@ soledad: username: soledad port: 2323 require_couchdb: true +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -114,6 +139,9 @@ ssh: kwadronaut: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw== type: ssh-rsa + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== type: ssh-rsa diff --git a/hiera/gorilla.yaml b/hiera/gorilla.yaml index 338b637..0a399c3 100644 --- a/hiera/gorilla.yaml +++ b/hiera/gorilla.yaml @@ -82,11 +82,36 @@ mail: smarthost: [] name: gorilla platform: - major_version: "0.6" - version: "0.6" + major_version: "0.7" + version: "0.7" service_type: internal_service services: - couchdb +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -110,6 +135,9 @@ ssh: kwadronaut: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw== type: ssh-rsa + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== type: ssh-rsa diff --git a/hiera/hippo.yaml b/hiera/hippo.yaml index d853cfa..cbde76f 100644 --- a/hiera/hippo.yaml +++ b/hiera/hippo.yaml @@ -52,11 +52,36 @@ openvpn: unlimited_prefix: UNLIMITED user_ips: false platform: - major_version: "0.6" - version: "0.6" + major_version: "0.7" + version: "0.7" service_type: user_service services: - openvpn +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -80,6 +105,9 @@ ssh: kwadronaut: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw== type: ssh-rsa + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== type: ssh-rsa diff --git a/hiera/ladybug.yaml b/hiera/ladybug.yaml index 60fdce7..923b088 100644 --- a/hiera/ladybug.yaml +++ b/hiera/ladybug.yaml @@ -26,11 +26,36 @@ mail: - starfish.dev.bitmask.net name: ladybug platform: - major_version: "0.6" - version: "0.6" + major_version: "0.7" + version: "0.7" service_type: internal_service services: - backup +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -54,6 +79,9 @@ ssh: kwadronaut: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw== type: ssh-rsa + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== type: ssh-rsa diff --git a/hiera/leech.yaml b/hiera/leech.yaml index 75519a9..057293e 100644 --- a/hiera/leech.yaml +++ b/hiera/leech.yaml @@ -62,12 +62,10 @@ location: mail: smarthost: [] mynetworks: - - "1.209.122.21" - "1.209.122.24" - "1.209.122.26" - "176.53.69.13" - "176.53.69.14" - - "176.53.69.21" - "176.53.69.22" - "176.53.69.23" - "192.168.5.10" @@ -100,11 +98,36 @@ mynetworks: - "85.17.92.143" name: leech platform: - major_version: "0.6" - version: "0.6" + major_version: "0.7" + version: "0.7" service_type: user_service services: - mx +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -128,6 +151,9 @@ ssh: kwadronaut: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw== type: ssh-rsa + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== type: ssh-rsa diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml index 89ecaed..184d568 100644 --- a/hiera/millipede.yaml +++ b/hiera/millipede.yaml @@ -54,11 +54,36 @@ openvpn: unlimited_prefix: UNLIMITED user_ips: false platform: - major_version: "0.6" - version: "0.6" + major_version: "0.7" + version: "0.7" service_type: user_service services: - openvpn +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -82,6 +107,9 @@ ssh: kwadronaut: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw== type: ssh-rsa + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== type: ssh-rsa diff --git a/hiera/monitor1.yaml b/hiera/monitor1.yaml new file mode 100644 index 0000000..f5f6acf --- /dev/null +++ b/hiera/monitor1.yaml @@ -0,0 +1,596 @@ +--- +contacts: + - sysdev@leap.se +development: + site_config: true +dns: + public: false +domain: + full: monitor1.bitmask.net + full_suffix: bitmask.net + internal: monitor1.bitmask.i + internal_suffix: bitmask.i + name: monitor1.bitmask.i +enabled: true +environment: local +hosts: + couch1: + domain_full: couch1.bitmask.net + domain_internal: couch1.bitmask.i + ip_address: "10.5.5.44" + port: 22 + couch2: + domain_full: couch2.bitmask.net + domain_internal: couch2.bitmask.i + ip_address: "10.5.5.52" + port: 22 + monitor1: + domain_full: monitor1.bitmask.net + domain_internal: monitor1.bitmask.i + ip_address: "10.5.5.49" + port: 22 + mx1: + domain_full: mx1.bitmask.net + domain_internal: mx1.bitmask.i + ip_address: "10.5.5.51" + port: 22 + plain1: + domain_full: plain1.bitmask.net + domain_internal: plain1.bitmask.i + ip_address: "10.5.5.53" + port: 22 + tor1: + domain_full: tor1.bitmask.net + domain_internal: tor1.bitmask.i + ip_address: "10.5.5.50" + port: 22 + vpn1: + domain_full: vpn1.bitmask.net + domain_internal: vpn1.bitmask.i + ip_address: "10.5.5.45" + port: 22 + web1: + domain_full: web1.bitmask.net + domain_internal: web1.bitmask.i + ip_address: "10.5.5.47" + port: 22 +ip_address: "10.5.5.49" +location: ~ +mail: + smarthost: + - mx1.bitmask.net +nagios: + domains_internal: + - bitmask.i + environments: + local: + contact_emails: + - sysdev@leap.se + hosts: + couch1: + domain_full_suffix: bitmask.net + domain_internal: couch1.bitmask.i + domain_internal_suffix: bitmask.i + environment: local + ip_address: "10.5.5.44" + services: + - couchdb + - soledad + ssh_port: 22 + couch2: + domain_full_suffix: bitmask.net + domain_internal: couch2.bitmask.i + domain_internal_suffix: bitmask.i + environment: local + ip_address: "10.5.5.52" + services: + - couchdb + - soledad + ssh_port: 22 + monitor1: + domain_full_suffix: bitmask.net + domain_internal: monitor1.bitmask.i + domain_internal_suffix: bitmask.i + environment: local + ip_address: "10.5.5.49" + services: + - monitor + ssh_port: 22 + mx1: + domain_full_suffix: bitmask.net + domain_internal: mx1.bitmask.i + domain_internal_suffix: bitmask.i + environment: local + ip_address: "10.5.5.51" + services: + - mx + ssh_port: 22 + plain1: + domain_full_suffix: bitmask.net + domain_internal: plain1.bitmask.i + domain_internal_suffix: bitmask.i + environment: local + ip_address: "10.5.5.53" + services: [] + ssh_port: 22 + tor1: + domain_full_suffix: bitmask.net + domain_internal: tor1.bitmask.i + domain_internal_suffix: bitmask.i + environment: local + ip_address: "10.5.5.50" + services: + - tor + ssh_port: 22 + vpn1: + domain_full_suffix: bitmask.net + domain_internal: vpn1.bitmask.i + domain_internal_suffix: bitmask.i + environment: local + ip_address: "10.5.5.45" + openvpn_gateway_address: "10.5.5.46" + services: + - openvpn + ssh_port: 22 + web1: + domain_full_suffix: bitmask.net + domain_internal: web1.bitmask.i + domain_internal_suffix: bitmask.i + environment: local + ip_address: "10.5.5.47" + services: + - webapp + ssh_port: 22 + nagiosadmin_pw: Y_uRtQby7LtwXxFRhIv_qVVrwWHzYrQq +name: monitor1 +platform: + major_version: "0.7" + version: "0.7" +service_type: internal_service +services: + - monitor +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git +squid_deb_proxy_client: 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 + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa + micah: + key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== + type: ssh-rsa + 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 + monitor: + private_key: | + -----BEGIN EC PRIVATE KEY----- + MIHcAgEBBEIB8oVl77M1F7vixWTiW3WkRD3wdxh+sNqwnOtvRkM8PLBtBhYh5i5o + v65G3NivSKt/x4qeG2K9is5f2WogrCNUJjOgBwYFK4EEACOhgYkDgYYABAFqCXla + YmqZqbefpMBaMPqzjhYNaxejlOX/x8YCXsDN2HMfeb/E/FYfpEPCuLVJ5Z0aDkp7 + 6JL9i1CX/9Rcbq4DEQEc6vkEv79MOI2jfUCVVeWRcybvRK0YAT9eQK59+FgNDbEo + 2NCUWBRvKd+8TjzZ7GtCLDnGd6+gkr6orkiA3uus/A== + -----END EC PRIVATE KEY----- + username: monitor + mosh: + enabled: true + ports: "60000:61000" + port: 22 +stunnel: + clients: {} + servers: {} +tags: + - local +x509: + ca_cert: | + -----BEGIN CERTIFICATE----- + MIIFbzCCA1egAwIBAgIBATANBgkqhkiG9w0BAQ0FADBKMRgwFgYDVQQDDA9CaXRt + YXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNVBAsME2h0dHBzOi8v + Yml0bWFzay5uZXQwHhcNMTIxMTA2MDAwMDAwWhcNMjIxMTA2MDAwMDAwWjBKMRgw + FgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNV + BAsME2h0dHBzOi8vYml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw + ggIKAoICAQC1eV4YvayaU+maJbWrD4OHo3d7S1BtDlcvkIRS1Fw3iYDjsyDkZxai + dHp4EUasfNQ+EVtXUvtk6170EmLco6Elg8SJBQ27trE6nielPRPCfX3fQzETRfvB + 7tNvGw4Jn2YKiYoMD79kkjgyZjkJ2r/bEHUSevmR09BRp86syHZerdNGpXYhcQ84 + CA1+V+603GFIHnrP+uQDdssW93rgDNYu+exT+Wj6STfnUkugyjmPRPjL7wh0tzy+ + znCeLl4xiV3g9sjPnc7r2EQKd5uaTe3j71sDPF92KRk0SSUndREz+B1+Dbe/RGk4 + MEqGFuOzrtsgEhPIX0hplhb0Tgz/rtug+yTT7oJjBa3u20AAOQ38/M99EfdeJvc4 + lPFF1XBBLh6X9UKF72an2NuANiX6XPySnJgZ7nZ09RiYZqVwu/qt3DfvLfhboq+0 + bQvLUPXrVDr70onv5UDjpmEA/cLmaIqqrduuTkFZOym65/PfAPvpGnt7crQj/Ibl + DEDYZQmP7AS+6zBjoOzNjUGE5r40zWAR1RSi7zliXTu+yfsjXUIhUAWmYR6J3KxB + lfsiHBQ+8dn9kC3YrUexWoOqBiqJOAJzZh5Y1tqgzfh+2nmHSB2dsQRs7rDRRlyy + YMbkpzL9ZsOUO2eTP1mmar6YjCN+rggYjRrX71K2SpBG6b1zZxOG+wIDAQABo2Aw + XjAdBgNVHQ4EFgQUuYGDLL2sswnYpHHvProt1JU+D48wDgYDVR0PAQH/BAQDAgIE + MAwGA1UdEwQFMAMBAf8wHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48w + DQYJKoZIhvcNAQENBQADggIBADeG67vaFcbITGpi51264kHPYPEWaXUa5XYbtmBl + cXYyB6hY5hv/YNuVGJ1gWsDmdeXEyj0j2icGQjYdHRfwhrbEri+h1EZOm1cSBDuY + k/P5+ctHyOXx8IE79DBsZ6IL61UKIaKhqZBfLGYcWu17DVV6+LT+AKtHhOrv3TSj + RnAcKnCbKqXLhUPXpK0eTjPYS2zQGQGIhIy9sQXVXJJJsGrPgMxna1Xw2JikBOCG + htD/JKwt6xBmNwktH0GI/LVtVgSp82Clbn9C4eZN9E5YbVYjLkIEDhpByeC71QhX + EIQ0ZR56bFuJA/CwValBqV/G9gscTPQqd+iETp8yrFpAVHOW+YzSFbxjTEkBte1J + aF0vmbqdMAWLk+LEFPQRptZh0B88igtx6tV5oVd+p5IVRM49poLhuPNJGPvMj99l + mlZ4+AeRUnbOOeAEuvpLJbel4rhwFzmUiGoeTVoPZyMevWcVFq6BMkS+jRR2w0jK + G6b0v5XDHlcFYPOgUrtsOBFJVwbutLvxdk6q37kIFnWCd8L3kmES5q4wjyFK47Co + Ja8zlx64jmMZPg/t3wWqkZgXZ14qnbyG5/lGsj5CwVtfDljrhN0oCWK1FZaUmW3d + 69db12/g4f6phldhxiWuGC/W6fCW5kre7nmhshcltqAJJuU47iX+DarBFiIj816e + yV8e + -----END CERTIFICATE----- + cert: | + -----BEGIN CERTIFICATE----- + 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 + VNEW/yvsCH7IS9KuQoI= + -----END CERTIFICATE----- + client_ca_cert: | + -----BEGIN CERTIFICATE----- + MIIFpzCCA4+gAwIBAgIBATANBgkqhkiG9w0BAQ0FADBmMRAwDgYDVQQKDAdCaXRt + YXNrMRwwGgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MTQwMgYDVQQDDCtCaXRt + YXNrIFJvb3QgQ0EgKGNsaWVudCBjZXJ0aWZpY2F0ZXMgb25seSEpMB4XDTEzMDEy + MTAwMDAwMFoXDTIzMDEyMTAwMDAwMFowZjEQMA4GA1UECgwHQml0bWFzazEcMBoG + A1UECwwTaHR0cHM6Ly9iaXRtYXNrLm5ldDE0MDIGA1UEAwwrQml0bWFzayBSb290 + IENBIChjbGllbnQgY2VydGlmaWNhdGVzIG9ubHkhKTCCAiIwDQYJKoZIhvcNAQEB + BQADggIPADCCAgoCggIBAKaIdsRLSww0spDI9YzyBw4HKBJ+TdArzKcaspjdK9Tt + Utn6CgMnsVzSToNXNOjjqvlUbqqIcuLil7b1ALW65phadZ0BA31fZz1bPDO/hIua + UTSz8OhS93oRmgs22NOe/181YQgF1whhrPO4B7NzvZn6bNQnt96LAvBv74vfBacB + Vcp+yuvkBFT9Dh3v0ndLwu8WAL+Q54onoQvGge29MQkIs3l8xgOySUtl7lv04K0H + CV6tXRm3rrm9nI1RVaXUU5gfKuYT1V7NQIfrWjFrubpqhmwSp75mqLJya56k8C3o + mEoeL6pTXxMKIM/rpwnEweGNlHsEF7b1TF8jIxCSav1IMMR4APLLt6DLnwcKb+ix + IUeWU8QU9J7LyjyRPNKftsk2rp+ubsogjZ4sWBsEinB8jWjfVASmN+I2JV0a76ow + hmmHsm+2+2NPD3iQDi30yKpxNyhH3C0aoL7QqndC2/wNygYrM2wsiA2+Zic22s9b + //OVDdxQk5On3PwKiQZ2ZDrHapXjJeHQ1e3GeWn8EYwzwE0R7kDL6sDra8hH/1xY + sp8ZdEH9fDqjgtiKNEeevPzeGp321A8c7whkGdN926ihA9fsQ1jzEgQOJVBJd5Xa + GUWFPMDE6Xok3I1mXzvjJIgB8lqPf/gb4YvBV+lmEx8BxZIxQYonVQHFdZbD3sHt + AgMBAAGjYDBeMB0GA1UdDgQWBBSHfhO27FhbFFmofb2bj72ezvmibDAOBgNVHQ8B + Af8EBAMCAgQwDAYDVR0TBAUwAwEB/zAfBgNVHSMEGDAWgBSHfhO27FhbFFmofb2b + j72ezvmibDANBgkqhkiG9w0BAQ0FAAOCAgEAV8gHJY9Dh65P8hwlOUQHv5XMWIzI + idrtmeM0+OojShAJWSOqRxlHYcPn9i4hgMPRSkoZrmmEJLZESqD5EM0NcYwvYgQC + hn99fkTUnehHFZcLUALcmi/qk1rKI19+jB3XRIJWeppFJZjWyjwbdJ0z/4LoviF9 + gSfMgNck2llR0BNdPXG3re+zH8uWNEu9PAGYQ+P3E4NOkufFV1Mg1w4wlQdYAUQl + AnwOn6NtKOlnPK/Hp+wTVxJ2UzzJydQPetRPO/OMNVNOSdkTDSqcYdT22rO5AHlF + YJFESKnwSIWHiK48CEhUNLKCyy88V0YkOWnKGI5KVsA83RtFQq1JJp5q6k4Bp2WC + Ivio1xK+D9VksRaCJuBV1MalPsxczDCaTaGsgzeFUgTvskcWKSEOjYp2B0+gccMu + menJXRdodW1Tt9WIYdxygm5Q36M9XAH8DV0/DRcB51sdMGQs0Wd7NmNXFr1aF9YB + Yh4cJPsT/9qSF0Y1QfzaTVSZ/AoFP4K1I5JixUMTz9DHT+TqQ/6lygQMM41PtnrM + 6Kjuibkno2UVk/Y3FyjSxiYyGvHOC53Xi4qScSVZ5ejVkAP05WuH7IpsFzDtJK6K + xIAokTRYLx/6lq8bwelCPGVjy7EsGXt9aN+gMb4R3L9vA/NQrXu+dmCJKPE1vUHF + gkVBxxt/s0R2aKM= + -----END CERTIFICATE----- + client_ca_key: | + -----BEGIN RSA PRIVATE KEY----- + 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 + -----END RSA PRIVATE KEY----- + commercial_ca_cert: | + -----BEGIN CERTIFICATE----- + MIIGCDCCA/CgAwIBAgIQKy5u6tl1NmwUim7bo3yMBzANBgkqhkiG9w0BAQwFADCB + hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G + A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNV + BAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTQwMjEy + MDAwMDAwWhcNMjkwMjExMjM1OTU5WjCBkDELMAkGA1UEBhMCR0IxGzAZBgNVBAgT + EkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR + Q09NT0RPIENBIExpbWl0ZWQxNjA0BgNVBAMTLUNPTU9ETyBSU0EgRG9tYWluIFZh + bGlkYXRpb24gU2VjdXJlIFNlcnZlciBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP + ADCCAQoCggEBAI7CAhnhoFmk6zg1jSz9AdDTScBkxwtiBUUWOqigwAwCfx3M28Sh + bXcDow+G+eMGnD4LgYqbSRutA776S9uMIO3Vzl5ljj4Nr0zCsLdFXlIvNN5IJGS0 + Qa4Al/e+Z96e0HqnU4A7fK31llVvl0cKfIWLIpeNs4TgllfQcBhglo/uLQeTnaG6 + ytHNe+nEKpooIZFNb5JPJaXyejXdJtxGpdCsWTWM/06RQ1A/WZMebFEh7lgUq/51 + UHg+TLAchhP6a5i84DuUHoVS3AOTJBhuyydRReZw3iVDpA3hSqXttn7IzW3uLh0n + c13cRTCAquOyQQuvvUSH2rnlG51/ruWFgqUCAwEAAaOCAWUwggFhMB8GA1UdIwQY + MBaAFLuvfgI9+qbxPISOre44mOzZMjLUMB0GA1UdDgQWBBSQr2o6lFoL2JDqElZz + 30O0Oija5zAOBgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNV + HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGwYDVR0gBBQwEjAGBgRVHSAAMAgG + BmeBDAECATBMBgNVHR8ERTBDMEGgP6A9hjtodHRwOi8vY3JsLmNvbW9kb2NhLmNv + bS9DT01PRE9SU0FDZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDBxBggrBgEFBQcB + AQRlMGMwOwYIKwYBBQUHMAKGL2h0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9E + T1JTQUFkZFRydXN0Q0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21v + ZG9jYS5jb20wDQYJKoZIhvcNAQEMBQADggIBAE4rdk+SHGI2ibp3wScF9BzWRJ2p + mj6q1WZmAT7qSeaiNbz69t2Vjpk1mA42GHWx3d1Qcnyu3HeIzg/3kCDKo2cuH1Z/ + e+FE6kKVxF0NAVBGFfKBiVlsit2M8RKhjTpCipj4SzR7JzsItG8kO3KdY3RYPBps + P0/HEZrIqPW1N+8QRcZs2eBelSaz662jue5/DJpmNXMyYE7l3YphLG5SEXdoltMY + dVEVABt0iN3hxzgEQyjpFv3ZBdRdRydg1vs4O2xyopT4Qhrf7W8GjEXCBgCq5Ojc + 2bXhc3js9iPc0d1sjhqPpepUfJa3w/5Vjo1JXvxku88+vZbrac2/4EjxYoIQ5QxG + V/Iz2tDIY+3GH5QFlkoakdH368+PUq4NCNk+qKBR6cGHdNXJ93SrLlP7u3r7l+L4 + HyaPs9Kg4DdbKDsx5Q5XLVq4rXmsXiBmGqW5prU5wfWYQ//u+aen/e7KJD2AFsQX + j4rBYKEMrltDR5FL1ZoXX/nUh8HCjLfn4g8wGTeGrODcQgPmlKidrv0PJFGUzpII + 0fxQ8ANAe4hZ7Q7drNJ3gjTcBpUC2JD5Leo31Rpg0Gcg19hCC0Wvgmje3WYkN5Ap + lBlGGSW4gNfL1IYoakRwJiNiqZ+Gb7+6kHDSVneFeO/qJakXzlByjAA6quPbYzSf + +AZxAeKCINT+b72x + -----END CERTIFICATE----- + -----BEGIN CERTIFICATE----- + MIIFdDCCBFygAwIBAgIQJ2buVutJ846r13Ci/ITeIjANBgkqhkiG9w0BAQwFADBv + MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFk + ZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBF + eHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFow + gYUxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO + BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMSswKQYD + VQQDEyJDT01PRE8gUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkq + hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAkehUktIKVrGsDSTdxc9EZ3SZKzejfSNw + AHG8U9/E+ioSj0t/EFa9n3Byt2F/yUsPF6c947AEYe7/EZfH9IY+Cvo+XPmT5jR6 + 2RRr55yzhaCCenavcZDX7P0N+pxs+t+wgvQUfvm+xKYvT3+Zf7X8Z0NyvQwA1onr + ayzT7Y+YHBSrfuXjbvzYqOSSJNpDa2K4Vf3qwbxstovzDo2a5JtsaZn4eEgwRdWt + 4Q08RWD8MpZRJ7xnw8outmvqRsfHIKCxH2XeSAi6pE6p8oNGN4Tr6MyBSENnTnIq + m1y9TBsoilwie7SrmNnu4FGDwwlGTm0+mfqVF9p8M1dBPI1R7Qu2XK8sYxrfV8g/ + vOldxJuvRZnio1oktLqpVj3Pb6r/SVi+8Kj/9Lit6Tf7urj0Czr56ENCHonYhMsT + 8dm74YlguIwoVqwUHZwK53Hrzw7dPamWoUi9PPevtQ0iTMARgexWO/bTouJbt7IE + IlKVgJNp6I5MZfGRAy1wdALqi2cVKWlSArvX31BqVUa/oKMoYX9w0MOiqiwhqkfO + KJwGRXa/ghgntNWutMtQ5mv0TIZxMOmm3xaG4Nj/QN370EKIf6MzOi5cHkERgWPO + GHFrK+ymircxXDpqR+DDeVnWIBqv8mqYqnK8V0rSS527EPywTEHl7R09XiidnMy/ + s1Hap0flhFMCAwEAAaOB9DCB8TAfBgNVHSMEGDAWgBStvZh6NLQm9/rEJlTvA73g + JMtUGjAdBgNVHQ4EFgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQD + AgGGMA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0gBAowCDAGBgRVHSAAMEQGA1UdHwQ9 + MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9BZGRUcnVzdEV4dGVy + bmFsQ0FSb290LmNybDA1BggrBgEFBQcBAQQpMCcwJQYIKwYBBQUHMAGGGWh0dHA6 + Ly9vY3NwLnVzZXJ0cnVzdC5jb20wDQYJKoZIhvcNAQEMBQADggEBAGS/g/FfmoXQ + zbihKVcN6Fr30ek+8nYEbvFScLsePP9NDXRqzIGCJdPDoCpdTPW6i6FtxFQJdcfj + Jw5dhHk3QBN39bSsHNA7qxcS1u80GH4r6XnTq1dFDK8o+tDb5VCViLvfhVdpfZLY + Uspzgb8c8+a4bmYRBbMelC1/kZWSWfFMzqORcUx8Rww7Cxn2obFshj5cqsQugsv5 + B5a6SE2Q8pTIqXOi6wZ7I53eovNNVZ96YUWYGGjHXkBrI/V5eu+MtWuLt29G9Hvx + PUsE2JOAWVrgQSQdso8VYFhH2+9uRv0V9dlfmrPb2LjkQLPNlzmuhbsdjrzch5vR + pu/xO28QOG8= + -----END CERTIFICATE----- + commercial_cert: | + -----BEGIN CERTIFICATE----- + MIIGRjCCBS6gAwIBAgIRAMXTXEN0h4ykzS3Z4Z5tmyYwDQYJKoZIhvcNAQELBQAw + gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO + BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD + VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg + Q0EwHhcNMTUwNDAyMDAwMDAwWhcNMTYwNDE1MjM1OTU5WjBPMSEwHwYDVQQLExhE + b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBAsTC1Bvc2l0aXZlU1NMMRQw + EgYDVQQDEwtiaXRtYXNrLm5ldDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC + ggIBAJcUgSPtPUSCjhuIS2gwqU2/QukygEoZFf3SwR6XmbYj8GkEiXNm79p3T4kC + 5DEeHpRTrD3KrLir78PLxXC/AIKhRB3+dSoKI8aMfBOBvw0jS/E7AGA+0jdo+Lia + Hd9JZgWNl1FLgviIvYixaJTIA9+56ZIFu0s9To9VDEsLixXBMGvBQ+qJTkTrBRsE + Etc3EtPX5qYeTOt5zj6ewowlIBYL8yAqxBO0tyYvVBhNW3wnMaELK9oruRgiV06J + BdUQqkUoRCRsjgqEMrx2Ah/nMcUgmFR3C8XnrQGVaJLkXp4FKCIHMFrzDO24fEyD + dEhCLyXEUpC2P0wEXY9C1m29yuNgk33eA085GNT3X39FWdT58b0HsUZ3Fder144L + b4hunHah5pbE+GLvTKSCjWOZHjA+0P0bIjhGzqQPE96sB+hkmmAUuavuTM5YsDaY + cahuN9fBUh9BfClmbFb4Rp4qAptcKHc2mQtbF3uXvOb/y3BsMlBQ01dS0WR3JTba + BQ9YbF5kuwRoeeQIrj1EDKpMoMgm7L+7t/2ZXnZvXI64uUneRnDi/Qb6PF06gR1U + FBSiSkXorQIV+TO53pbNEkfBrL06pzpgTG4mzPyReFhHYKtpAekloaWb1ppcUDz7 + fSk2SEddinBHLoMWPwMHZ+K02ycXWb38qmxQAGZ2BWxRZYiJAgMBAAGjggHZMIIB + 1TAfBgNVHSMEGDAWgBSQr2o6lFoL2JDqElZz30O0Oija5zAdBgNVHQ4EFgQURlCc + FmI2dgueauqLhs7unyuIUQ0wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAw + HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCME8GA1UdIARIMEYwOgYLKwYB + BAGyMQECAgcwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLmNv + bS9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly9jcmwuY29t + b2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJD + QS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5j + b21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZl + ckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMCcG + A1UdEQQgMB6CC2JpdG1hc2submV0gg93d3cuYml0bWFzay5uZXQwDQYJKoZIhvcN + AQELBQADggEBAIsv7f5sxvUm4nvtst9o/KMBjgcuXSB41Ti8v+DVRzz/iyANDZTi + hpTHnjnQa4/aXkY1Ko5449MRhHAGPTxEX2cyPHRTg8RcGFQzTpEcTbsOMlL18M8N + Vo+qjj/MK3F95nz1lD2EqF58uYkGpmEfqIcbAHpuSab+1btb0zSE+SOpPXML6Az2 + rqHXGYZ4jKQ0cepyIgR84quczVk2AhvXMNVuYWQUPbZ7CbaVdumwsyRgG6oXcGOP + Km7P5HwcqV8577RcSLI7XnYfQgkTH8xtrgD68h4l7AazjhsRoVO60qEx3YQA5cmb + zgmKCy3yOhRP0/kZBNsbIXH3w4lOmNQ2zNE= + -----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/mx1.yaml b/hiera/mx1.yaml index 5b1fccd..688f123 100644 --- a/hiera/mx1.yaml +++ b/hiera/mx1.yaml @@ -54,12 +54,10 @@ location: ~ mail: smarthost: [] mynetworks: - - "1.209.122.21" - "1.209.122.24" - "1.209.122.26" - "176.53.69.13" - "176.53.69.14" - - "176.53.69.21" - "176.53.69.22" - "176.53.69.23" - "192.168.5.10" diff --git a/hiera/octopus.yaml b/hiera/octopus.yaml index b2fa731..995ee1f 100644 --- a/hiera/octopus.yaml +++ b/hiera/octopus.yaml @@ -61,12 +61,10 @@ location: mail: smarthost: [] mynetworks: - - "1.209.122.21" - "1.209.122.24" - "1.209.122.26" - "176.53.69.13" - "176.53.69.14" - - "176.53.69.21" - "176.53.69.22" - "176.53.69.23" - "192.168.5.10" diff --git a/hiera/otter.yaml b/hiera/otter.yaml index 53f937e..bbb000a 100644 --- a/hiera/otter.yaml +++ b/hiera/otter.yaml @@ -54,12 +54,37 @@ openvpn: unlimited_prefix: UNLIMITED user_ips: false platform: - major_version: "0.6" - version: "0.6" + major_version: "0.7" + version: "0.7" service_type: user_service services: - openvpn - tor +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -83,6 +108,9 @@ ssh: kwadronaut: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw== type: ssh-rsa + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== type: ssh-rsa diff --git a/hiera/snail.yaml b/hiera/snail.yaml index 05d0eeb..46c2bd9 100644 --- a/hiera/snail.yaml +++ b/hiera/snail.yaml @@ -55,11 +55,36 @@ openvpn: unlimited_prefix: UNLIMITED user_ips: false platform: - major_version: "0.6" - version: "0.6" + major_version: "0.7" + version: "0.7" service_type: user_service services: - openvpn +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -83,6 +108,9 @@ ssh: kwadronaut: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw== type: ssh-rsa + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== type: ssh-rsa diff --git a/hiera/starfish.yaml b/hiera/starfish.yaml index 629c7a1..1c5d753 100644 --- a/hiera/starfish.yaml +++ b/hiera/starfish.yaml @@ -28,43 +28,19 @@ haproxy: port: 4000 weight: 100 writable: true - elk: - backup: true - host: localhost - port: 4001 - weight: 10 - writable: true - urchin: - backup: false - host: localhost - port: 4002 - weight: 100 - writable: true hosts: clam: domain_full: clam.dev.bitmask.net domain_internal: clam.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqXPBidNRThgSRlEeKFuLxnGf/kmkaHoBimkZRrN7kxhGAwYSrf5mtUGqVFWGcWMPYhqU1uGkZnCgQWV9d60OmWNIZNqsq5Rs343PGKW9S3LrnAa0yFZKLRtESCh53taxF+uJ/vcV76oai+I7b2EZOVtUP6F+iSb3/D+piAcL+p284KkKywsj9FREoh+dpMHthSb7bQDSKqq9UZJVEDQev1tjT7FHnbIY0QJLcYBtYbj945G63UYPQbHVxkl2GCaTXLKaC5CfLRH6cHvwLS3HtyCFEgo9fw0BqztN+Q50+YiQYlKmY6DEnMxwyB7/CjzBcDPa+e0qXygV2mjaHsuN9" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqsU3rov6ems9MEt/dt/bU3t8lwTUoFHwcADLyXgi+SfYr7KduMY+0NweHGR2Q5A3X3y4zJmulYxliFBdq8zYOp+etwNMwuqdy0qCjcbUn7VkvGI/AY4kcqJhcQRhvRfrB0auUyEKspTCjQ27M6HQgKyAlc3GSR6iu/fMmA+lw9p1QjNsCh9HHoaRe+qlg7tmAd5xkTlvk1xZpEz0MNKeNoGbblq+vTWKYfN3GBiwhQNfJhkIaqvzNgoSiqG7P4MY2gXkKfQSQXeVd2OT6kZN41KBBZPE7mRA9pFKIaEx3YGnwjxRrhzdrCz2F5uQzBZAtqs2gcIWeXE6/uvtr9JBz" ip_address: "176.53.69.22" port: 4422 - elk: - domain_full: elk.dev.bitmask.net - domain_internal: elk.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrcf0LAT87yXYy8D6M2cnn88Cq+sHn+yCc5bApC8eDAsnEhU85AM23uPPlhvrGUlC2sWq5027693OOiUeoWuIv62J0ezggw4m8NLp8Y1zWsx9jS7y3wUHjGmZcB/abWUOLLT9ouQoZeGRqix0jaSkO1VnjRwKzPPhLYhbsxuVVy2hvAWDoV0ufaJi1N+wpqPzDrUa5SrlEyGbhnPiA+AlVU6GyCxB/DV+PiURf+W52dDeiFkOGlPgwu4vzMj1nes6wrQKTguINBw+6tTIF3C6hIqtbIRu+EVV4JFQ/UjuaZ57ubw616R3BC8IJdwSycZ3TFbEDLRpG9AkKS/OBI8OV" - ip_address: "1.209.122.21" - port: 4422 starfish: domain_full: starfish.dev.bitmask.net domain_internal: starfish.dev.bitmask.i host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkbUoYD7f7Sbl+ElkJmxopRXh21DhcrVfFqlUwSdSpnAtgTSFRC1JMrDkPdJ69htsYiwoB+Bed0FQyCB4NU0QJbgM73VXJ0SqrpJJKx/7Ry5E8aBukiaAe8k8O6ZbnPeoZx11PwrSlS9Wrh928tuH7/ism7XHytlFYayYywvY2djIy9TbLsuOV6EQmVAVONhRVet4iOiFqfFDplRjttFVMJROO8W51YDdcTEwR+gLwS7yKp3e/XZT1vrHzmKo7j9saEgC0KncJrGDqoZ0Q1U0Did+MmHRQTJ13TcjHDnCiU7nO9w6OgGo4nTzGOJCjJkJm8opCxT3X0jCcHIkmEIU/" ip_address: "176.53.69.23" port: 4422 - urchin: - domain_full: urchin.dev.bitmask.net - domain_internal: urchin.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkcNk748DAajCK3W99eLrc15nRGFeeEH4YLbsVd4gwNLzKsmVdm2oOAXl6Qb9nW2FIwsl37LR5dB/AU7lWQVICQ4CSdy9pwoWh6rd4tbobyMaQLDtx/oUXJlYBy7KBInSMxIPs2MRe9SG3BfhWvuj1m+bBSfqRQVj3YeE1M3pTMNHrYjDcdXusGITAxqNYDtN3+d4npVClavO5MuxQ4yr/vS8ibfvO21PMp2Sa9JtTXNX2Y1fF3xq0XT5UZd8YhnN/WWIaAxtkp3WMFLTOkFYTo+T3/C0Gsx6v+xCjKyytviquOJeLVJQ5ofP2RC0cSYdJJA1gs8bgUce3Sdp1+iij" - ip_address: "176.53.69.21" - port: 4422 ip_address: "176.53.69.23" location: country_code: TR @@ -74,12 +50,10 @@ location: mail: smarthost: [] mynetworks: - - "1.209.122.21" - "1.209.122.24" - "1.209.122.26" - "176.53.69.13" - "176.53.69.14" - - "176.53.69.21" - "176.53.69.22" - "176.53.69.23" - "192.168.5.10" @@ -112,11 +86,36 @@ mynetworks: - "85.17.92.143" name: starfish platform: - major_version: "0.6" - version: "0.6" + major_version: "0.7" + version: "0.7" service_type: user_service services: - mx +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -140,6 +139,9 @@ ssh: kwadronaut: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw== type: ssh-rsa + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== type: ssh-rsa @@ -161,16 +163,6 @@ stunnel: connect: clam.dev.bitmask.i connect_port: 15984 original_port: 5984 - elk_5984: - accept_port: 4001 - connect: elk.dev.bitmask.i - connect_port: 15984 - original_port: 5984 - urchin_5984: - accept_port: 4002 - connect: urchin.dev.bitmask.i - connect_port: 15984 - original_port: 5984 servers: {} tags: - development diff --git a/hiera/thrips.yaml b/hiera/thrips.yaml index 5e707f6..0e4dea6 100644 --- a/hiera/thrips.yaml +++ b/hiera/thrips.yaml @@ -86,8 +86,8 @@ mail: - leech.demo.bitmask.net name: thrips platform: - major_version: "0.6" - version: "0.6" + major_version: "0.7" + version: "0.7" service_type: public_service services: - couchdb @@ -99,6 +99,31 @@ soledad: username: soledad port: 2323 require_couchdb: true +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -122,6 +147,9 @@ ssh: kwadronaut: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw== type: ssh-rsa + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== type: ssh-rsa diff --git a/hiera/urchin.yaml b/hiera/urchin.yaml deleted file mode 100644 index 88d555e..0000000 --- a/hiera/urchin.yaml +++ /dev/null @@ -1,306 +0,0 @@ ---- -contacts: - - micah@leap.se - - sysdev@leap.se -couch: - backup: true - bigcouch: - cookie: HrwZSWSPLYqySjqWpFYDBD8kzPSZIDf7 - ednp_port: 9002 - epmd_port: 4369 - neighbors: - - clam.dev.bitmask.net - - elk.dev.bitmask.net - master: false - mode: multimaster - port: 5984 - users: - admin: - password: PkyRLKGfQAnmk64EXqHWBVsxJfksKXNH - salt: 51d3c78980b9cf319cadbc73896f7128 - username: admin - leap_mx: - password: TISmwrYwSBmwbdDyQvJYu3_VkZmfZITc - salt: 79fd6d71c94a1aaf44cefc84a5a748dc - username: leap_mx - nickserver: - password: VH7PcCGPLAIy8WHcLIJxVKnUpR7A2EuM - salt: 70bcff5aeb5a7ed22a96a4b43790965f - username: nickserver - replication: - password: B7LFWg7x7AQRIXdxGmsd4MjfQISB_EZj - salt: 868afc4ca18138cc256f57ff2a3c99a5 - username: replication - soledad: - password: PgrbUREhqBGY4r4XIXQEgkk3jTH4sEJA - salt: e3bec4f7126db333ce796beabd322244 - username: soledad - tapicero: - password: rZ8MYBTj8fHZDxI7awS927cnhE8qbrBC - salt: 36d800745f39733c206c806f95397698 - username: tapicero - webapp: - password: PvRAdP9JrjS8qRsNCpyQ_KVDBTgTNGkY - salt: 86497f034c8ef09b097f5c757ab038b7 - username: webapp - webapp: - nagios_test_pw: zvzLB64_Z_5ZL5xvI5MfpUCP3b7gKzhP -development: - site_config: true -dns: - public: true -domain: - full: urchin.dev.bitmask.net - full_suffix: dev.bitmask.net - internal: urchin.dev.bitmask.i - internal_suffix: dev.bitmask.i - name: urchin.dev.bitmask.net -enabled: true -environment: development -hosts: - clam: - domain_full: clam.dev.bitmask.net - domain_internal: clam.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqXPBidNRThgSRlEeKFuLxnGf/kmkaHoBimkZRrN7kxhGAwYSrf5mtUGqVFWGcWMPYhqU1uGkZnCgQWV9d60OmWNIZNqsq5Rs343PGKW9S3LrnAa0yFZKLRtESCh53taxF+uJ/vcV76oai+I7b2EZOVtUP6F+iSb3/D+piAcL+p284KkKywsj9FREoh+dpMHthSb7bQDSKqq9UZJVEDQev1tjT7FHnbIY0QJLcYBtYbj945G63UYPQbHVxkl2GCaTXLKaC5CfLRH6cHvwLS3HtyCFEgo9fw0BqztN+Q50+YiQYlKmY6DEnMxwyB7/CjzBcDPa+e0qXygV2mjaHsuN9" - ip_address: "176.53.69.22" - port: 4422 - elk: - domain_full: elk.dev.bitmask.net - domain_internal: elk.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrcf0LAT87yXYy8D6M2cnn88Cq+sHn+yCc5bApC8eDAsnEhU85AM23uPPlhvrGUlC2sWq5027693OOiUeoWuIv62J0ezggw4m8NLp8Y1zWsx9jS7y3wUHjGmZcB/abWUOLLT9ouQoZeGRqix0jaSkO1VnjRwKzPPhLYhbsxuVVy2hvAWDoV0ufaJi1N+wpqPzDrUa5SrlEyGbhnPiA+AlVU6GyCxB/DV+PiURf+W52dDeiFkOGlPgwu4vzMj1nes6wrQKTguINBw+6tTIF3C6hIqtbIRu+EVV4JFQ/UjuaZ57ubw616R3BC8IJdwSycZ3TFbEDLRpG9AkKS/OBI8OV" - ip_address: "1.209.122.21" - port: 4422 - starfish: - domain_full: starfish.dev.bitmask.net - domain_internal: starfish.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkbUoYD7f7Sbl+ElkJmxopRXh21DhcrVfFqlUwSdSpnAtgTSFRC1JMrDkPdJ69htsYiwoB+Bed0FQyCB4NU0QJbgM73VXJ0SqrpJJKx/7Ry5E8aBukiaAe8k8O6ZbnPeoZx11PwrSlS9Wrh928tuH7/ism7XHytlFYayYywvY2djIy9TbLsuOV6EQmVAVONhRVet4iOiFqfFDplRjttFVMJROO8W51YDdcTEwR+gLwS7yKp3e/XZT1vrHzmKo7j9saEgC0KncJrGDqoZ0Q1U0Did+MmHRQTJ13TcjHDnCiU7nO9w6OgGo4nTzGOJCjJkJm8opCxT3X0jCcHIkmEIU/" - ip_address: "176.53.69.23" - port: 4422 - urchin: - domain_full: urchin.dev.bitmask.net - domain_internal: urchin.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkcNk748DAajCK3W99eLrc15nRGFeeEH4YLbsVd4gwNLzKsmVdm2oOAXl6Qb9nW2FIwsl37LR5dB/AU7lWQVICQ4CSdy9pwoWh6rd4tbobyMaQLDtx/oUXJlYBy7KBInSMxIPs2MRe9SG3BfhWvuj1m+bBSfqRQVj3YeE1M3pTMNHrYjDcdXusGITAxqNYDtN3+d4npVClavO5MuxQ4yr/vS8ibfvO21PMp2Sa9JtTXNX2Y1fF3xq0XT5UZd8YhnN/WWIaAxtkp3WMFLTOkFYTo+T3/C0Gsx6v+xCjKyytviquOJeLVJQ5ofP2RC0cSYdJJA1gs8bgUce3Sdp1+iij" - ip_address: "176.53.69.21" - port: 4422 -ip_address: "176.53.69.21" -location: - country_code: TR - hemisphere: "N" - name: Istanbul - timezone: "+2" -mail: - smarthost: - - starfish.dev.bitmask.net -name: urchin -platform: - major_version: "0.6" - version: "0.6" -service_type: public_service -services: - - couchdb - - soledad -soledad: - couchdb_soledad_user: - password: PgrbUREhqBGY4r4XIXQEgkk3jTH4sEJA - salt: e3bec4f7126db333ce796beabd322244 - 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: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== - type: ssh-rsa - 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: 4422 -stunnel: - clients: - ednp_clients: - clam_9002: - accept_port: 4002 - connect: clam.dev.bitmask.i - connect_port: 19002 - original_port: 9002 - elk_9002: - accept_port: 4003 - connect: elk.dev.bitmask.i - connect_port: 19002 - original_port: 9002 - epmd_clients: - clam_4369: - accept_port: 4000 - connect: clam.dev.bitmask.i - connect_port: 14369 - original_port: 4369 - elk_4369: - accept_port: 4001 - connect: elk.dev.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: - - development - - istanbul -x509: - ca_cert: | - -----BEGIN CERTIFICATE----- - MIIFbzCCA1egAwIBAgIBATANBgkqhkiG9w0BAQ0FADBKMRgwFgYDVQQDDA9CaXRt - YXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNVBAsME2h0dHBzOi8v - Yml0bWFzay5uZXQwHhcNMTIxMTA2MDAwMDAwWhcNMjIxMTA2MDAwMDAwWjBKMRgw - FgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNV - BAsME2h0dHBzOi8vYml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw - ggIKAoICAQC1eV4YvayaU+maJbWrD4OHo3d7S1BtDlcvkIRS1Fw3iYDjsyDkZxai - dHp4EUasfNQ+EVtXUvtk6170EmLco6Elg8SJBQ27trE6nielPRPCfX3fQzETRfvB - 7tNvGw4Jn2YKiYoMD79kkjgyZjkJ2r/bEHUSevmR09BRp86syHZerdNGpXYhcQ84 - CA1+V+603GFIHnrP+uQDdssW93rgDNYu+exT+Wj6STfnUkugyjmPRPjL7wh0tzy+ - znCeLl4xiV3g9sjPnc7r2EQKd5uaTe3j71sDPF92KRk0SSUndREz+B1+Dbe/RGk4 - MEqGFuOzrtsgEhPIX0hplhb0Tgz/rtug+yTT7oJjBa3u20AAOQ38/M99EfdeJvc4 - lPFF1XBBLh6X9UKF72an2NuANiX6XPySnJgZ7nZ09RiYZqVwu/qt3DfvLfhboq+0 - bQvLUPXrVDr70onv5UDjpmEA/cLmaIqqrduuTkFZOym65/PfAPvpGnt7crQj/Ibl - DEDYZQmP7AS+6zBjoOzNjUGE5r40zWAR1RSi7zliXTu+yfsjXUIhUAWmYR6J3KxB - lfsiHBQ+8dn9kC3YrUexWoOqBiqJOAJzZh5Y1tqgzfh+2nmHSB2dsQRs7rDRRlyy - YMbkpzL9ZsOUO2eTP1mmar6YjCN+rggYjRrX71K2SpBG6b1zZxOG+wIDAQABo2Aw - XjAdBgNVHQ4EFgQUuYGDLL2sswnYpHHvProt1JU+D48wDgYDVR0PAQH/BAQDAgIE - MAwGA1UdEwQFMAMBAf8wHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48w - DQYJKoZIhvcNAQENBQADggIBADeG67vaFcbITGpi51264kHPYPEWaXUa5XYbtmBl - cXYyB6hY5hv/YNuVGJ1gWsDmdeXEyj0j2icGQjYdHRfwhrbEri+h1EZOm1cSBDuY - k/P5+ctHyOXx8IE79DBsZ6IL61UKIaKhqZBfLGYcWu17DVV6+LT+AKtHhOrv3TSj - RnAcKnCbKqXLhUPXpK0eTjPYS2zQGQGIhIy9sQXVXJJJsGrPgMxna1Xw2JikBOCG - htD/JKwt6xBmNwktH0GI/LVtVgSp82Clbn9C4eZN9E5YbVYjLkIEDhpByeC71QhX - EIQ0ZR56bFuJA/CwValBqV/G9gscTPQqd+iETp8yrFpAVHOW+YzSFbxjTEkBte1J - aF0vmbqdMAWLk+LEFPQRptZh0B88igtx6tV5oVd+p5IVRM49poLhuPNJGPvMj99l - mlZ4+AeRUnbOOeAEuvpLJbel4rhwFzmUiGoeTVoPZyMevWcVFq6BMkS+jRR2w0jK - G6b0v5XDHlcFYPOgUrtsOBFJVwbutLvxdk6q37kIFnWCd8L3kmES5q4wjyFK47Co - Ja8zlx64jmMZPg/t3wWqkZgXZ14qnbyG5/lGsj5CwVtfDljrhN0oCWK1FZaUmW3d - 69db12/g4f6phldhxiWuGC/W6fCW5kre7nmhshcltqAJJuU47iX+DarBFiIj816e - yV8e - -----END CERTIFICATE----- - cert: | - -----BEGIN CERTIFICATE----- - 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 - rbX+vWsGmizCAC6WQXG1QkLa+pM= - -----END CERTIFICATE----- - commercial_ca_cert: ~ - commercial_cert: ~ - commercial_key: ~ - key: | - -----BEGIN RSA PRIVATE KEY----- - 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 - -----END RSA PRIVATE KEY----- - use: true - use_commercial: false diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml index 7d6d845..2625c2b 100644 --- a/hiera/wallaby.yaml +++ b/hiera/wallaby.yaml @@ -228,11 +228,36 @@ nickserver: domain: nicknym.demo.bitmask.net port: 6425 platform: - major_version: "0.6" - version: "0.6" + major_version: "0.7" + version: "0.7" service_type: public_service services: - webapp +sources: + apt: + backports: "http://httpredir.debian.org/debian/" + basic: "http://httpredir.debian.org/debian/" + security: "http://security.debian.org/" + leap-mx: + package: leap-mx + revision: latest + type: apt + nickserver: + revision: origin/master + source: "https://leap.se/git/nickserver" + type: git + soledad: + package: soledad-server + revision: latest + type: apt + tapicero: + revision: origin/version/0.7 + source: "https://leap.se/git/tapicero" + type: git + webapp: + revision: origin/version/0.7 + source: "https://leap.se/git/leap_web" + type: git ssh: authorized_keys: azul: @@ -256,6 +281,9 @@ ssh: kwadronaut: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw== type: ssh-rsa + meskio: + key: AAAAB3NzaC1yc2EAAAABIwAAAQEAxonQ1Z9ogZEG74osrapyc793rSkmPcReOBaA8pvxjtXi8C09Z4lYtim/aRBZzHlYPhXXIXTxYDwuA9Yd09dYUue/UuiPU1CwhJdXQKLW9g3+2agDr54dPO7dZ+NTSLKYH8End/Hm5GnQZo30sTxCRGkY4ehllUk1PMAqB3ADJyNNMehuwUbRDKx62KVruGpPZk2Ab1TYh++YChRM8sFDj+uO+CnXQSrOElVU7+DXTWgUWsCYSHTsvs0RHs/NiLggZ2/0qLTPyc6Hp69rMbHDMnz989Ib1VhY/K6MC050VR3t/1SyV7Jec4wyb7wwuIuA9UFeDhvKZtRa8fPHz3Iq+w== + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw== type: ssh-rsa @@ -303,12 +331,16 @@ webapp: client_certificates: bit_size: 2048 digest: SHA256 - life_span: 2m + life_span: "2 months" limited_prefix: LIMITED unlimited_prefix: UNLIMITED client_version: max: ~ - min: "0.5" + min: "0.7" + couchdb_admin_user: + password: hfY4x7epQ7BrULbZJRgu5KKk4gR_J2AW + salt: e1dca99375c513be477295f141b9f032 + username: admin couchdb_webapp_user: password: LH5DH5rbLZs7zuCaIgWpDAetDpLvUAHg salt: c632af58769857bcdf108b46da9eaa44 @@ -321,17 +353,41 @@ webapp: forbidden_usernames: - admin - administrator + - administrators + - admins - arin-admin - certmaster - contact + - email + - help + - help-desk + - help-ticket + - help-tickets + - help_desk + - help_ticket + - help_tickets + - helpdesk + - helpticket + - helptickets - info + - mail - maildrop + - noreply + - owner + - owners - postmaster + - reply + - robot - ssladmin + - staff + - support + - tech-support + - tech_support + - techsupport + - ticket + - tickets + - vmail - www-data - git: - revision: origin/version/0.6 - source: "https://leap.se/git/leap_web" modules: - billing - help diff --git a/nodes/elk.json b/nodes/elk.json deleted file mode 100644 index f71c920..0000000 --- a/nodes/elk.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ip_address": "1.209.122.21", - "services": "couchdb", - "ssh": { - "port": 4422 - }, - "tags": [ - "development", "seoul" - ], - "enabled": true -} diff --git a/nodes/urchin.json b/nodes/urchin.json deleted file mode 100644 index bac4ea6..0000000 --- a/nodes/urchin.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ip_address": "176.53.69.21", - "services": ["couchdb","soledad"], - "tags": ["development", "istanbul"], - "ssh": { - "port": 4422 - }, - "couch": { - "backup": true - } -} |