From cda3f82d4de3a059bebf03ad0f9ee10c5c012fef Mon Sep 17 00:00:00 2001
From: Yarmo Mackenbach <yarmo@qivro.xyz>
Date: Tue, 16 Jun 2020 12:03:21 +0200
Subject: [PATCH] Update PGP public keys and PGP view

---
 9F0048AC0B23301E1F77E994909F6BD6F80F485D.asc |  38 ++++++++++++-
 9F0048AC0B23301E1F77E994909F6BD6F80F485D.pub | Bin 2125 -> 0 bytes
 views/pgp.pug                                |  53 +++++++++++++++----
 3 files changed, 80 insertions(+), 11 deletions(-)
 delete mode 100644 9F0048AC0B23301E1F77E994909F6BD6F80F485D.pub

diff --git a/9F0048AC0B23301E1F77E994909F6BD6F80F485D.asc b/9F0048AC0B23301E1F77E994909F6BD6F80F485D.asc
index 6dac6ea..7628876 100644
--- a/9F0048AC0B23301E1F77E994909F6BD6F80F485D.asc
+++ b/9F0048AC0B23301E1F77E994909F6BD6F80F485D.asc
@@ -44,6 +44,40 @@ d9/DQqGV5jGjZS4NyULhVg6pjuhzFq3IxY+fn6KlJOGXCeVvHH96EMqZKibjxNDl
 BOfIQqA5t3iMomx1F0p6npxGz1xZLXVfU6cgy2tXwQZd4UXw1l2Wl06nV9J7LjkV
 cV4IeuFb8OP9UZDayv8e9NnX2BMp8DpCoK9Z5oeRAbb+mKEOyLBITJtsc6I/0kl/
 GjvKql9hjkSSj9HVR0L2IngnpuBgqaGK8r/Z9Mn9Eh+f/x2bnr8rrHFudscKYIPf
-T5daUrQE1WR8yJibrA==
-=rabO
+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
+=6xah
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/9F0048AC0B23301E1F77E994909F6BD6F80F485D.pub b/9F0048AC0B23301E1F77E994909F6BD6F80F485D.pub
deleted file mode 100644
index cf22ecd06b0e8ea008884037a2cfea0f10e0f396..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2125
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
DT2T(l

diff --git a/views/pgp.pug b/views/pgp.pug
index 3beac63..b8cd02f 100644
--- a/views/pgp.pug
+++ b/views/pgp.pug
@@ -12,20 +12,21 @@ block content
         h3#pgp-signature Signature
         p 9F0048AC0B23301E1F77E994909F6BD6F80F485D
         
-        h3 Files
-        p
-            a(href="/9F0048AC0B23301E1F77E994909F6BD6F80F485D.pub", download="/9F0048AC0B23301E1F77E994909F6BD6F80F485D.pub", rel="pgpkey", type="application/pgp-keys", title="PGP (binary)") Binary format
-            br
-            a(href="/9F0048AC0B23301E1F77E994909F6BD6F80F485D.asc", download="/9F0048AC0B23301E1F77E994909F6BD6F80F485D.asc", rel="pgpkey", type="text/plain", title="PGP (text)") Text format
-
         h3 Key servers
         p
             a(href="https://keys.openpgp.org/") OpenPGP key server
         
+        h3 Files
+        p
+            //a(href="/9F0048AC0B23301E1F77E994909F6BD6F80F485D.pub", download="/9F0048AC0B23301E1F77E994909F6BD6F80F485D.pub", rel="pgpkey", type="application/pgp-keys", title="PGP (binary)") Binary format
+            a(href="/9F0048AC0B23301E1F77E994909F6BD6F80F485D.asc", download="/9F0048AC0B23301E1F77E994909F6BD6F80F485D.asc", rel="pgpkey", type="text/plain", title="PGP (text)") Text format
+        
         h3#pgp-public-key Plaintext
         pre.select-all
             code
-                | -----BEGIN PGP PUBLIC KEY BLOCK-----<br>
+                | -----BEGIN PGP PUBLIC KEY BLOCK-----
+                br
+                br
                 | mQINBF0mIsIBEADacleiyiV+z6FIunvLWrO6ZETxGNVpqM+WbBQKdW1BVrJBBolg
                 | m8dDOFGDVIRPWNQxhflghKZa2uTudndQVg8tFozRUW0aAzx8Q9na95hW9Ni4p3vI
                 | BdzE7JkyPbySMA0BPgfjXu69rudNMedx98AvUPBye1WdRb09o9JXD2kk86NDWLwh
@@ -70,6 +71,40 @@ block content
                 | BOfIQqA5t3iMomx1F0p6npxGz1xZLXVfU6cgy2tXwQZd4UXw1l2Wl06nV9J7LjkV
                 | cV4IeuFb8OP9UZDayv8e9NnX2BMp8DpCoK9Z5oeRAbb+mKEOyLBITJtsc6I/0kl/
                 | GjvKql9hjkSSj9HVR0L2IngnpuBgqaGK8r/Z9Mn9Eh+f/x2bnr8rrHFudscKYIPf
-                | T5daUrQE1WR8yJibrA==
-                | =rabO
+                | T5daUrQE1WR8yJibrLkCDQRdVlrgARAAoDJkQKK6Kz4gVxPFdyDEpJqu1KTZzI1M
+                | O+VYm3iYcPt+xJTreBL2McUZ7jj6VJOadaDrxwqtqaK+ztlUCyGEJ2Pj1hy4FtJm
+                | Vq+5t1vRk4vx+WQhffeNOzB2/8KI5GSd+GBGwPlZukyQnKpjh5zAgyL7qHDHO0hf
+                | Ik4DZFCn98U6C7RWXUIWaMMjTRoFZBXAZJd1crkMLFBFHVhBdCNJP3TkPGLeLoK1
+                | c1+0Ra6asmphmdRLb8LXbWrnPGH6M0z6Ynfmy3TPIULp9YKKwiGhGizyWgSlQcKi
+                | vxDMlKAwc6dGNL0vO5MPO9qM6M0740P51H4lg4Af8BhP4lutjXi7bY0uf2zTutFB
+                | Gk3xVEfzTI2NexGm3utmyBe1Kee7Ar7VWnKfCMR7l9wDoTk32MjUNuGCzolaGroY
+                | 6dk1HpcCwe6cvJQ7zR88DvtRGJU387rKSmrhP0oiI7p6o5OmeO9AumKk/EMmqwIN
+                | uOmvLmlV9sT3of020dopQaHHVVTo6lzjwm0gx10TE4+Rf5i2saT9nSMLhcw3uzsH
+                | 8vOEVQyO9LbT9yrPPM9nltosGpL7OWUewymI+QKvPzujzAwBxhwxRRMEhs4gfep5
+                | iUSeOw/ZqsS2D/K1aGt1IQFcwzA6+cl3oJPJHuaS00UEyAmkNHwJ1U5BnDRwPSWj
+                | 63mwvZUxAAMAEQEAAYkEbAQYAQgAIBYhBJ8ASKwLIzAeH3fplJCfa9b4D0hdBQJd
+                | VlrgAhsCAkAJEJCfa9b4D0hdwXQgBBkBCAAdFiEEog/Pt4tEmnyVrrtlNzZ/SvQI
+                | etEFAl1WWuAACgkQNzZ/SvQIetGBbA//fws2L5GAcWv6fNGTvdrtV0vEPxKlJ2/s
+                | TYttTtyMscF/1ulpSFkCqc6qk5pE5KkV7VI8mu21EAIDUxC0H4uKk8GM1tMgOxLV
+                | lD20y3H3WvkAAB766bGe5UJqSw4rIdxIYVjZ6+7fUtV6iBBem/qOtMkvoHYUNiDd
+                | O26olBEjn2Yxh0ZwCIFrcYjJpay1xAq9T3+JiAp2zqcTnHmakVIaskC9QNwPPT93
+                | iQX8afD+bSuIPDlM4PH5vV3ay+SJPP2Jz8FtMvHReueuqKtFe4s3s8nu0M73iIcM
+                | 7q9aAzz+koPo7JhvXh1UeaDJ1rCRkB2ZzQnL11nX+KZz0QFFoXUF8bNy6c6O0BKU
+                | zUcH6s6V6sDswDMkuOcX8PRCaAglMdneTFo6K7cPoibJalzoszp2UhzjSFmok4mp
+                | llkdwd9gyYGBF5TegWx6E7gtyRGaqDDaRNtkeMLBDD2huKpvVQKAqVwrjplc0RLx
+                | HjxLN7IUG3yty80w4W9nrT6RSjHCKnj++yprwXETSG5tlqXyLg+/qSJlXEv3H+II
+                | Qzk1xxqjFFytyZuz2dfnxO/BSqILtFBeVCkxtOzavzuQvPmxYVh5x2c4wc/sAR1u
+                | xHw5Bo1EducK8d3GeBE3P3e/Ff9XxbsbLG9kvVPx8fDxTRqRwAO1Q+0wWvBJFZUV
+                | QUyvQyZo4gRJQw/7BGRzQyXdjmWEu677QgwP2Iya7nRLxe6kFGLNo1lIYvZGyQF1
+                | IFREZ1RFqU6do8ll6fT/yri5ILn68MAy7Sm/HOH9s8pQ2hZsu+Nd9Dqg2KrUyOgx
+                | WhhwZjDtXQ3CIbAphZk/IVJuWiUX0RZUBcZt6W+i+rf7BLvTumEw4tUHepZf6ZrO
+                | e521xRYyw9FefFcfGoNFxdQaxLLEOCAihldK5BURBqEjujcUTpJWoyV6Zzd1vL9F
+                | RSKmzwKE3rTz6yNlEJJRp9FyyW5R/MAzLWJZjQEiwQNkTa9dHBh5cqx4f0y35Qmg
+                | 2paziuF2HqFFu5wioDUHKGUAdmIJQGCHz4kwvUDYU63DkIMjrjSe+A76B9prlCHY
+                | 5XGCtxVTL1H5RKdOGgdDIr08X/urXLitzhao2RfwQcn5dWBjcBXh1Cko/ideX2r1
+                | GZ6U2F+Y6I7dsWaE4Uo3KN4rx0wzvNl+qbCxNWfDr22HH6iNiCVVcdCx4Nx0ZSW6
+                | 0NYwCgsj/sURDhK0fIoKQUsZNYz95MaOmu33Vr9v2P2+8zQ7LI3mVgM80v5PZ4Yj
+                | rjC7V16PTyAIK6qZp0AiPth9vkroLj7YuhQS/++5bGolEaQKe5yIauKZCSkSrT85
+                | 9xfCZ2G5Pn5rt9iqDoMYJSu798Lvj4yfpKV7Ad5nwa126SjU0ynXUtaE0W4=
+                | =6xah
                 | -----END PGP PUBLIC KEY BLOCK-----