diff options
-rw-r--r-- | files/cert/ci.leap.se.crt | 18 | ||||
-rw-r--r-- | files/ssh/authorized_keys | 1 | ||||
-rw-r--r-- | hiera/ibex.yaml | 27 |
3 files changed, 25 insertions, 21 deletions
diff --git a/files/cert/ci.leap.se.crt b/files/cert/ci.leap.se.crt index a2a5618..2c6ed03 100644 --- a/files/cert/ci.leap.se.crt +++ b/files/cert/ci.leap.se.crt @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE----- -MIIF9zCCBN+gAwIBAgISA15gQcsVF++EOwDy8isV7CKxMA0GCSqGSIb3DQEBCwUA +MIIF9zCCBN+gAwIBAgISA/pznuhaDBoobB5cKPN2UH/fMA0GCSqGSIb3DQEBCwUA MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD -ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA5MjgwNzA0MDBaFw0x -NzEyMjcwNzA0MDBaMBUxEzARBgNVBAMTCmNpLmxlYXAuc2UwggIiMA0GCSqGSIb3 +ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzEyMjcxMjM3NTFaFw0x +ODAzMjcxMjM3NTFaMBUxEzARBgNVBAMTCmNpLmxlYXAuc2UwggIiMA0GCSqGSIb3 DQEBAQUAA4ICDwAwggIKAoICAQC9JM0dQyuX1nno1y3vb45R/U0e/dsFduslfADd UQ9eIKasp2itVRG/iikSvYxUbFBtbzUqHboZQEY3bm7dQbJgfbv9kBKWwNuEyWar gcjGhXJsBx8LhEsdutY19kPsWevM4ZPy3m1XY2QZHoBCgOAMVOSaZf+1qbvQpa8P @@ -25,12 +25,12 @@ dHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCBqwYIKwYBBQUHAgIwgZ4MgZtUaGlz IENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9uIGJ5IFJlbHlpbmcg UGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGggdGhlIENlcnRpZmlj YXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNyeXB0Lm9yZy9yZXBv -c2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAPHKkziF2PIdDg+wIkgQoKEkjJacc -ltQvBoR/Qc0wMS0DQY7o/e6snIZLDVqJzTIT6HPn5ICLqpqTv07dVsfa0yjS8AQL -9BtmfDdZz8n8HhYnOoYtIpntyCaz1WjgAq9sZnTM8C681NJRRBdRkdfF7zi/CqE3 -QDhZbUpO1xGkSHbtpaQqRPsyUbZSjFXrRxbpwDHotuRXYFfkcGIEmiCITF9shlr5 -CDJDeJaPMtWbBmyXkdFR0lUk82AB/kLDnwrvaMFJ1Z/ZmNyVGxvtsQEvgbjO33EY -gnhoyUzQvQyYtvWTpfRXNmoJyu1VvdKKrKnu1iodIqN1aQHrAFPnvxJlTA== +c2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAa5Li+PSegv32IPN+hUDQ5ipAoNBc +QzLIV9WcW9kLrV/7Cw1/THBMMhVCCPZLclQIOPHKt9mW0CebY6KGlWrg3WyQJ3PF +s3/NlqqOiEDWJ/mcvMQqe4GEqdyaqVckyJmblMnV6W6ALpEdD0FnH1GywiuSfH+t +wGT9q2X9ICmG5s//epfOtIJu4TkekFhhdlV1NaJMylVh+mxyr0tHv7phxfvZ7w/t +CW+kZH0MFVMpiNjeqo3Qd/bSAD6M6ynJhrPObVSh4bQhru+w15TzQhbIzwDEhSjK +K5Vah4JRkqebw99RvlGxhaMwV9BFcnq3hHoxQcskbz0hxTzvfM28g7ygRg== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ diff --git a/files/ssh/authorized_keys b/files/ssh/authorized_keys index 50a62c9..f3572c6 100644 --- a/files/ssh/authorized_keys +++ b/files/ssh/authorized_keys @@ -1,4 +1,5 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDMDkXxPZottNuSWUuuWo5y6TmQJQpK9Ihi0c5dZUpI1/soZWrxCbX9hGEh4zTPM+q0VCHXkgnI6pvuxLde9dIf/JXEyQzik0VNKe3v2WDLtDbPlZ0mrNv0pXWQJKO/YsbNkaPFl+UlfcJkfaA84PUXb4NFSn8p759stsxFXwddCv9gR9/7SDuTgYTp8yuU5MiLHOPWi+0RUOsgKDSYh989W8OnCmg8An6EciquC2IEnVD1iiOBCNZaOmm0JzK7ycnDl4A34nH6DMD5tEcvBdr7JjfUmhda3CJT2ljNGopAN01j/XtWXztnSzDHb++Ayk2BCkSGS+z68oybBJJD2BMe5FqMGWg2cLi5UofTm7kaM62Kk8ByuXSOtTQ19FF2wMfLpBW2MRNpAuaYfWxnrdcsOR4rtUDh9vdPs+5L8kA1AXVk7x6k4X1UYOuDZdx9gW8lBwhbdBfJokslTxA+QlOB8ZSY4ubuQWK22DCzeDBSju+aYcN5BMqni/5wexwIy0UEVwcjruo58sUn1UFcE0h+KJHIylwRYdgfKgu+G8EMwd1bqfEvkAs4scWqK+AldAbCxwoZXwylXklylCRayMbFe6gQ4Oxmgwynj0NwuLsCkwMv/Tzt4tcPGwMJqtKn2G+1Y2rDffeRyK0kpEsHvffyBxyCxZIaqS9mCXaLfnWwaQ== files/ssh/monitor_ssh.pub ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEtniDgIYEm4WtGgiQsZKBpY8x3tbzDBIoMLbZT496juCu4c3f+F5KkMPLmYRPcAupF8tVf+j7Fns7z69PuTjdGfe/cA9CTw/4sNAu3iLpunGR0d2Wtctez5mwz13bKRu9fck3H9p2F9Z47vMKtRTJJ6iIgaUVWU/eFd/MSMJeUVd2ns4Wr7SkHCBB3PV+QL1xl4+AZsUtnGVQ5cE4MZZFia/g6SlrKQYFtLRVIIpDuuaDSvULg1BFMhSCBDNygts8dKTJsCEQYeGVvHZaDwtKTnMqEIwBP4TkIoP+YWnZTPrGywFEJOlZ8b+4HdgdUAFLcFCycWMM9nVcWX7P2lIN users/cirunner/cirunner_ssh.pub +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv users/kwadronaut/kwadronaut_ssh.pub ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC5xvAs8c8KmJ/Lt2TiYthxOVEgUkprbLWVOwK1Hmc+3h6rV4iyT//8dv8Ov79ZMOAuqQhQ5fz7RckOTqoexW/kzbFhXw5NEt+eqHonayiAh8LVt2K79GbMtWmS2ss81ivDyQkaW3+PK5IDibsoOfNeuAZ17Hgudatjc4v7WEjVliYBwPLAA5DUZt8wf7nNQX3moHGE8A+d3S0UDQyEmT657D1p8jmrpg9qTL7nuvjZTq7v/mVErnIDUY83FGdrT1F+gPlCLetzSDeaNkYFm+RjVixF2pZKT+BsHkj/8nTJw7NBh/BTG34pSyuCmepwBBwPEISkfMAEA9Ag+TXq+Oe53GmmBa92asusM7XzyPTxUcvnUAp4kxn5i+65dDx4F2//cVe7+CNCdl8N5p88Xe3jmsTeEdEXnmXPFOBbvAE0kikDE30FqU06u/pLDy7ZG3JTZZtvvFuKrYokgQysDMLaxlMVMANs9WugJkOlexzOeDDgptPf8f2fQs2Q9Xo0xq1wrtD4kdopgtF1LLEFcUDKp7+nev+czzNWbv6ccZotlicZIqauYnBjjGPYz0sC4OCvZjz7bK7nDsdHoaZBSl1YUhTyLUDH2XH8V1lbEOJhfJSp+vZMJETIe8oP+uByEt01FIt8JsRhijXoKCPfXp59P9d3KS8vuaUsCEVrpkkalQ== users/micah/micah_ssh.pub ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC8PN+jl30tI/EBqMqmVfmc0sfAqb+AWbBrOxic+ZZAbAOch+8SadhUd/67L6BCMANAdvJDRdwq86xbdnAhF9p5fQ8JYUVluvs6VAy4lDEx7N+ZSeKcQ7P1sp9OncdulBgaeK2vtEsjELm2e0yLkbLe8jBCFo4s9/cp0hEtc58+qvFkIlp9iycZOQWt3q0Uj6fM7V4nvT0y8QI6ta4Hwl5IMdSAi8GlwuwZwtrUtZ419sUR/L0ftRGr+SgHxwxL2AoiRpbXVaeIban6nvMUS7RAKGYMnXzG7i33nF9vM0LnbAWU2DNxTuzzJbbOyGXkzKn3kKgq5YNlMyxLxb1BsI6HRya5YDkvBF8IADhjrjDiAMYecRLsjpRa4XuCodHq6DVf5vlWBOpkh2FHHDHQ7VgWlwVXsvJyhNdVb679+aiu/u1/R2+UhjMo2BqXVMrNE7AtixyPj49DZrNtiIxriG4HGnEuRreCQVi6XmDDJid5ZBmqCJFQwYmeKZdRn1Rv2dd0423NXjQcg+6rvc67MhA/qgr/igwGsVebGa2mTb+cL0gIWekeSKEkVzRqXBlxNEzpZnbGt+A1cXRMag6BF1WDV5+I8WIp28q6c8eUBisR3xNkgtia8xdmXHSweEw3CYgT/Wy19vNbLpOtIPCLw1L313CtBmo42LdqG1bByIcUSQ== users/varac/varac_ssh.pub diff --git a/hiera/ibex.yaml b/hiera/ibex.yaml index 08d20dc..34c7b7d 100644 --- a/hiera/ibex.yaml +++ b/hiera/ibex.yaml @@ -331,19 +331,19 @@ sources: revision: latest type: apt nickserver: - revision: origin/master + revision: tags/0.10.0 source: "https://leap.se/git/nickserver" type: git platform: apt: basic: "http://deb.leap.se/platform" - component: master + component: "0.10" soledad: package: soledad-server revision: latest type: apt webapp: - revision: origin/master + revision: tags/0.9.2 source: "https://leap.se/git/leap_web" type: git ssh: @@ -351,6 +351,9 @@ ssh: cirunner: key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDEtniDgIYEm4WtGgiQsZKBpY8x3tbzDBIoMLbZT496juCu4c3f+F5KkMPLmYRPcAupF8tVf+j7Fns7z69PuTjdGfe/cA9CTw/4sNAu3iLpunGR0d2Wtctez5mwz13bKRu9fck3H9p2F9Z47vMKtRTJJ6iIgaUVWU/eFd/MSMJeUVd2ns4Wr7SkHCBB3PV+QL1xl4+AZsUtnGVQ5cE4MZZFia/g6SlrKQYFtLRVIIpDuuaDSvULg1BFMhSCBDNygts8dKTJsCEQYeGVvHZaDwtKTnMqEIwBP4TkIoP+YWnZTPrGywFEJOlZ8b+4HdgdUAFLcFCycWMM9nVcWX7P2lIN type: ssh-rsa + kwadronaut: + key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv + type: ssh-rsa micah: key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC5xvAs8c8KmJ/Lt2TiYthxOVEgUkprbLWVOwK1Hmc+3h6rV4iyT//8dv8Ov79ZMOAuqQhQ5fz7RckOTqoexW/kzbFhXw5NEt+eqHonayiAh8LVt2K79GbMtWmS2ss81ivDyQkaW3+PK5IDibsoOfNeuAZ17Hgudatjc4v7WEjVliYBwPLAA5DUZt8wf7nNQX3moHGE8A+d3S0UDQyEmT657D1p8jmrpg9qTL7nuvjZTq7v/mVErnIDUY83FGdrT1F+gPlCLetzSDeaNkYFm+RjVixF2pZKT+BsHkj/8nTJw7NBh/BTG34pSyuCmepwBBwPEISkfMAEA9Ag+TXq+Oe53GmmBa92asusM7XzyPTxUcvnUAp4kxn5i+65dDx4F2//cVe7+CNCdl8N5p88Xe3jmsTeEdEXnmXPFOBbvAE0kikDE30FqU06u/pLDy7ZG3JTZZtvvFuKrYokgQysDMLaxlMVMANs9WugJkOlexzOeDDgptPf8f2fQs2Q9Xo0xq1wrtD4kdopgtF1LLEFcUDKp7+nev+czzNWbv6ccZotlicZIqauYnBjjGPYz0sC4OCvZjz7bK7nDsdHoaZBSl1YUhTyLUDH2XH8V1lbEOJhfJSp+vZMJETIe8oP+uByEt01FIt8JsRhijXoKCPfXp59P9d3KS8vuaUsCEVrpkkalQ== type: ssh-rsa @@ -687,10 +690,10 @@ x509: commercial_ca_cert: ~ commercial_cert: | -----BEGIN CERTIFICATE----- - MIIF9zCCBN+gAwIBAgISA15gQcsVF++EOwDy8isV7CKxMA0GCSqGSIb3DQEBCwUA + MIIF9zCCBN+gAwIBAgISA/pznuhaDBoobB5cKPN2UH/fMA0GCSqGSIb3DQEBCwUA MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD - ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA5MjgwNzA0MDBaFw0x - NzEyMjcwNzA0MDBaMBUxEzARBgNVBAMTCmNpLmxlYXAuc2UwggIiMA0GCSqGSIb3 + ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzEyMjcxMjM3NTFaFw0x + ODAzMjcxMjM3NTFaMBUxEzARBgNVBAMTCmNpLmxlYXAuc2UwggIiMA0GCSqGSIb3 DQEBAQUAA4ICDwAwggIKAoICAQC9JM0dQyuX1nno1y3vb45R/U0e/dsFduslfADd UQ9eIKasp2itVRG/iikSvYxUbFBtbzUqHboZQEY3bm7dQbJgfbv9kBKWwNuEyWar gcjGhXJsBx8LhEsdutY19kPsWevM4ZPy3m1XY2QZHoBCgOAMVOSaZf+1qbvQpa8P @@ -713,12 +716,12 @@ x509: IENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9uIGJ5IFJlbHlpbmcg UGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGggdGhlIENlcnRpZmlj YXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNyeXB0Lm9yZy9yZXBv - c2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAPHKkziF2PIdDg+wIkgQoKEkjJacc - ltQvBoR/Qc0wMS0DQY7o/e6snIZLDVqJzTIT6HPn5ICLqpqTv07dVsfa0yjS8AQL - 9BtmfDdZz8n8HhYnOoYtIpntyCaz1WjgAq9sZnTM8C681NJRRBdRkdfF7zi/CqE3 - QDhZbUpO1xGkSHbtpaQqRPsyUbZSjFXrRxbpwDHotuRXYFfkcGIEmiCITF9shlr5 - CDJDeJaPMtWbBmyXkdFR0lUk82AB/kLDnwrvaMFJ1Z/ZmNyVGxvtsQEvgbjO33EY - gnhoyUzQvQyYtvWTpfRXNmoJyu1VvdKKrKnu1iodIqN1aQHrAFPnvxJlTA== + c2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAa5Li+PSegv32IPN+hUDQ5ipAoNBc + QzLIV9WcW9kLrV/7Cw1/THBMMhVCCPZLclQIOPHKt9mW0CebY6KGlWrg3WyQJ3PF + s3/NlqqOiEDWJ/mcvMQqe4GEqdyaqVckyJmblMnV6W6ALpEdD0FnH1GywiuSfH+t + wGT9q2X9ICmG5s//epfOtIJu4TkekFhhdlV1NaJMylVh+mxyr0tHv7phxfvZ7w/t + CW+kZH0MFVMpiNjeqo3Qd/bSAD6M6ynJhrPObVSh4bQhru+w15TzQhbIzwDEhSjK + K5Vah4JRkqebw99RvlGxhaMwV9BFcnq3hHoxQcskbz0hxTzvfM28g7ygRg== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ |