summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVarac <varac@leap.se>2018-01-06 19:30:47 +0100
committerVarac <varac@leap.se>2018-01-06 19:30:47 +0100
commitc3818923cd69a0c6639832135ad8544c3a6b654d (patch)
treeb42a04b3cac2bdc2dd414eec773106654a29d79d
parent7f06ef05f66d4e3d5bff05f9cb96f974a38e9599 (diff)
leap deployHEADmaster
-rw-r--r--files/ssh/authorized_keys2
-rw-r--r--hiera/ibex.yaml8
2 files changed, 5 insertions, 5 deletions
diff --git a/files/ssh/authorized_keys b/files/ssh/authorized_keys
index f3572c6..0d01e9e 100644
--- a/files/ssh/authorized_keys
+++ b/files/ssh/authorized_keys
@@ -1,5 +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 AAAAB3NzaC1yc2EAAAADAQABAAABAQC7SX6VirEVTjo4Y1JHY6WYVgcDuvvRhK6YXfWYQiguY81toNw6nEcfGvGvdfPH0QvjV61k+4J8wJjHRdtvfp/jjvBucjZ9RAa2Q71ojsdnKzpP/Z/aW11WpZC2gkvKlzsAyhSUerDCE7vceYOUsywF+kJTj2zxdcrFdJw2LKCdMJ4Tc51pvc86AwHakTiHkyUeuHVLI1f4Nyaoz8Bl+TOQ6DlQsNXr+a4Kvb92IBTjZCwGiuJb9/v18N/fxiplAZXKj9I0vUN9o464u9UmIzyN7d0+KxB6fW3Q3tDwM2nWjvs7zgCGRwB6J9EiSDQywmJg1DtE81XbKadSFgofTPTf 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 34c7b7d..8fe7846 100644
--- a/hiera/ibex.yaml
+++ b/hiera/ibex.yaml
@@ -331,25 +331,25 @@ sources:
revision: latest
type: apt
nickserver:
- revision: tags/0.10.0
+ revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
platform:
apt:
basic: "http://deb.leap.se/platform"
- component: "0.10"
+ component: master
soledad:
package: soledad-server
revision: latest
type: apt
webapp:
- revision: tags/0.9.2
+ revision: origin/master
source: "https://leap.se/git/leap_web"
type: git
ssh:
authorized_keys:
cirunner:
- key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDEtniDgIYEm4WtGgiQsZKBpY8x3tbzDBIoMLbZT496juCu4c3f+F5KkMPLmYRPcAupF8tVf+j7Fns7z69PuTjdGfe/cA9CTw/4sNAu3iLpunGR0d2Wtctez5mwz13bKRu9fck3H9p2F9Z47vMKtRTJJ6iIgaUVWU/eFd/MSMJeUVd2ns4Wr7SkHCBB3PV+QL1xl4+AZsUtnGVQ5cE4MZZFia/g6SlrKQYFtLRVIIpDuuaDSvULg1BFMhSCBDNygts8dKTJsCEQYeGVvHZaDwtKTnMqEIwBP4TkIoP+YWnZTPrGywFEJOlZ8b+4HdgdUAFLcFCycWMM9nVcWX7P2lIN
+ key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC7SX6VirEVTjo4Y1JHY6WYVgcDuvvRhK6YXfWYQiguY81toNw6nEcfGvGvdfPH0QvjV61k+4J8wJjHRdtvfp/jjvBucjZ9RAa2Q71ojsdnKzpP/Z/aW11WpZC2gkvKlzsAyhSUerDCE7vceYOUsywF+kJTj2zxdcrFdJw2LKCdMJ4Tc51pvc86AwHakTiHkyUeuHVLI1f4Nyaoz8Bl+TOQ6DlQsNXr+a4Kvb92IBTjZCwGiuJb9/v18N/fxiplAZXKj9I0vUN9o464u9UmIzyN7d0+KxB6fW3Q3tDwM2nWjvs7zgCGRwB6J9EiSDQywmJg1DtE81XbKadSFgofTPTf
type: ssh-rsa
kwadronaut:
key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv