summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez Piedehierro <palvarez89@gmail.com>2017-09-29 09:48:25 +0000
committerPedro Alvarez Piedehierro <palvarez89@gmail.com>2017-09-29 09:48:25 +0000
commit9d0b282cc4d2eac1f881ce6ceb311388518672dd (patch)
tree67e29550f9fcf01827ce60a3240567218eeb97ad
parentff9b29b84af5b114a545b69baa461fa47972b1f9 (diff)
parentab96538e8eea95a124a0c9fc98134b45c3f3de98 (diff)
downloadinfrastructure-9d0b282cc4d2eac1f881ce6ceb311388518672dd.tar.gz
Merge branch 'sam/jonathanmaw-ostree-access' into 'master'
Give Jonathan Maw push access to ostree.baserock.org See merge request baserock/infrastructure!7
-rw-r--r--baserock_ostree/keys/jonathanmaw.key.pub1
-rw-r--r--baserock_ostree/ostree-access-config.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/baserock_ostree/keys/jonathanmaw.key.pub b/baserock_ostree/keys/jonathanmaw.key.pub
new file mode 100644
index 00000000..8a7fec5c
--- /dev/null
+++ b/baserock_ostree/keys/jonathanmaw.key.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBgkX7spfU4PyIcZIj2HtQbWfMs4D/WDDslBsgAZ2tB+XRDj1TExDHG2VQlGXZnfylqb4FolgX4s1yumuKx10HBCLt/dQr4alQYTxQkapYPwQZBNmdBDAtsfQbbyQ7u309M2hTd6FUSLJizmGWn+KnLz39ExayFDfQqQHsNkARKvmdduhOj6FF621kKvbjxyMvz8OA19sRs0HrWCvW+0XFDQpwU6IcmN90LfHrcP16Ih1vY86U9nOmJYfSEMzr+cPTbqLL9a9fqovwaYnDXpBdlu087jh7JCea21TDSbY2l+NaiT58eXvd4upmR1t5XjiLop2y28jiHZDCD3mkSf5r jonathan.maw@codethink.co.uk
diff --git a/baserock_ostree/ostree-access-config.yml b/baserock_ostree/ostree-access-config.yml
index 92560cb9..ff8c7def 100644
--- a/baserock_ostree/ostree-access-config.yml
+++ b/baserock_ostree/ostree-access-config.yml
@@ -11,5 +11,6 @@
with_items:
- keys/baserock-gitlab-ci.key.pub
- keys/garyperkins.key.pub
+ - keys/jonathanmaw.key.pub
- keys/pedroalvarez.key.pub
- keys/samthursfield.key.pub