Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch main branch to use 2021 signing key #66

Merged
merged 16 commits into from
Aug 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added default.rulesets.1622134324.gz
Binary file not shown.
Binary file added default.rulesets.1625068418.gz
Binary file not shown.
Binary file added default.rulesets.1625865001.gz
Binary file not shown.
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# sha256 as of 2020-09-25 for mainline-alpine
FROM nginx@sha256:4635b632d2aaf8c37c8a1cf76a1f96d11b899f74caa2c6946ea56d0a5af02c0c
# sha256 as of 2021-08-18 for nginx:mainline-alpine
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've been moving toward putting the tag in the FROM line, a la nginx:mainline-alpine@sha256:... and then having only the datestamp in the comment. (Didn't know you could use that syntax until recently!)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TIL! That's much clearer, will do.

FROM nginx:mainline-alpine@sha256:bead42240255ae1485653a956ef41c9e458eb077fcb6dc664cbc3aa9701a05ce

COPY docker/nginx.conf /etc/nginx
RUN mkdir -p /opt/nginx && chown nginx:nginx /opt/nginx
Expand Down
3 changes: 2 additions & 1 deletion docker/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ http {
location / {
root /opt/nginx/root;
index index.html;
rewrite ^/https-everywhere($|//+)(.*) /https-everywhere/$2 permanent;
# Catch all relevant URLs and redirect to most recent, i.e. "2021" route
rewrite ^/https-everywhere($|//+)(.*) /https-everywhere-2021/$2 permanent;
}
}
}
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<html>
<a href='rulesets-signature.1625864047.sha256'>rulesets-signature.1625864047.sha256</a><br>
<a href='rulesets-signature.1625865001.sha256'>rulesets-signature.1625865001.sha256</a><br>
<a href='latest-rulesets-timestamp'>latest-rulesets-timestamp</a><br>
<a href='default.rulesets.1625864047.gz'>default.rulesets.1625864047.gz</a><br>
<a href='default.rulesets.1625865001.gz'>default.rulesets.1625865001.gz</a><br>
</html>
2 changes: 1 addition & 1 deletion latest-rulesets-timestamp
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1625864047
1625865001
25 changes: 12 additions & 13 deletions public_release.pem
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
-----BEGIN PUBLIC KEY-----
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp10BbUVc5Xj2S/+MH3bA
CNBaISo/r9e3PVPyTTjsGsdg2qSXvqUO42fBtpFAy0zUzIGS83v4JjiRdvKJaZTI
vbC8AcpymzdsTqujMm8RPTSy3hO/8mXzGa4DEsIB1uNLnUWRBKXvSGCmT9kFyxhT
pkYqokNBzafVihTU34tN2Md1xFHnmZGqfYtPtbJLWAa5Z1M11EyR4lIyUxIiPTV9
t1XstDbWr3iS83REJrGEFmjG1+BAgx8/lDUTa41799N2yYEhgZud7bL0M3ei8s5O
ERjiion5uANkUV3+s2QqUZjiVA+XR/HizXjciaUWNd683KqekpNOZ/0STh/UGwpc
wU+KwG07QyiCrLrRpz8S/vH8CqGrrcWY3GSzYe9dp34jJdO65oA+G8tK6fMXtvTC
FDZI6oNNaXJH71F5J0YbqO2ZqwKYc2WSi0gKVl2wd9roOVjaBmkJqvocntYuNM7t
38fDEWHn5KUkmrTbiG68Cy56tDUfpKl3D9Uj4LaMvxJ1tKGvzQ4k/60odT7gIxu6
DqYjXUHZpwPsSGBq3njaD7boe4CUXF2K7ViOc87BsKxRNCzDD8OklRjjXzOTOBH3
PqFJ93CJ+4ECE5t9STU20aZ8E+2zKB8vjKyCySE4+kcIvBBsnkwVaJTPy9Ft1qYy
bo+soXEWVEZATANNWklBt8kCAwEAAQ==
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvsC7BNafkRe8Uh1DUgCk
v6RbPQMdJgAKKnWdSqQd7tQzU1mXfmo/k1Py/2MYMZXOWmqSZ9iwIYkykZYywJ2V
yMGve4byj1sLn6YQoOkG8g5Z3V4y0S2RpEfmYumNjTzfq8nxtLnwjaYd4sCUd5wa
0SzeLrpRQuXo2bF3QuUF2xcbLJloxX1MmlsMMCdBc+qGNonLJ7bpn/JuyXlDWy1F
keyw1qgjiOdiRIbMC1x302zgzX6dSrBrNB8Cpsh+vCE0ZjUo8M9caEv06F6QbYmd
GJHM0ZZY34OHMSNdf+/qUKIV/SuxuSuFE99tkAeWnbWpyI1V+xhVo1sc7NzChP8c
i2TdPvI3/0JyAuCvL6zIFqJUJkZibEUghhg6F09+oNJKpy7rhUJq7zZyLXJsvuXn
n0gnIxfjRvMcDfZAKUVMZKRdw7fwWzwQril4Ib0MQOVda9vb/4JMk7Gup+TUI4sf
uS4NKwsnKoODIO+2U5QpJWdtp1F4AQ1pBv8ajFl1WTrVGvkRGK0woPWaO6pWyJ4k
RnhnxrV2FyNNt3JSR+0JEjhFWws47kjBvpr0VRiVRFppKA+plKs4LPlaaCff39Tl
eYmY3mETe3w1GIGc2Lliad32Jpbx496IgDe1K3FMBEoKFZfhmtlRSXft8NKgSzPt
2zkatM9bFKfaCYRaSy7akbkCAwEAAQ==
-----END PUBLIC KEY-----

2 changes: 1 addition & 1 deletion release-pubkey.jwk
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"kty": "RSA", "e": "AQAB", "n": "p10BbUVc5Xj2S_-MH3bACNBaISo_r9e3PVPyTTjsGsdg2qSXvqUO42fBtpFAy0zUzIGS83v4JjiRdvKJaZTIvbC8AcpymzdsTqujMm8RPTSy3hO_8mXzGa4DEsIB1uNLnUWRBKXvSGCmT9kFyxhTpkYqokNBzafVihTU34tN2Md1xFHnmZGqfYtPtbJLWAa5Z1M11EyR4lIyUxIiPTV9t1XstDbWr3iS83REJrGEFmjG1-BAgx8_lDUTa41799N2yYEhgZud7bL0M3ei8s5OERjiion5uANkUV3-s2QqUZjiVA-XR_HizXjciaUWNd683KqekpNOZ_0STh_UGwpcwU-KwG07QyiCrLrRpz8S_vH8CqGrrcWY3GSzYe9dp34jJdO65oA-G8tK6fMXtvTCFDZI6oNNaXJH71F5J0YbqO2ZqwKYc2WSi0gKVl2wd9roOVjaBmkJqvocntYuNM7t38fDEWHn5KUkmrTbiG68Cy56tDUfpKl3D9Uj4LaMvxJ1tKGvzQ4k_60odT7gIxu6DqYjXUHZpwPsSGBq3njaD7boe4CUXF2K7ViOc87BsKxRNCzDD8OklRjjXzOTOBH3PqFJ93CJ-4ECE5t9STU20aZ8E-2zKB8vjKyCySE4-kcIvBBsnkwVaJTPy9Ft1qYybo-soXEWVEZATANNWklBt8k"}
{"kty": "RSA", "e": "AQAB", "n": "vsC7BNafkRe8Uh1DUgCkv6RbPQMdJgAKKnWdSqQd7tQzU1mXfmo_k1Py_2MYMZXOWmqSZ9iwIYkykZYywJ2VyMGve4byj1sLn6YQoOkG8g5Z3V4y0S2RpEfmYumNjTzfq8nxtLnwjaYd4sCUd5wa0SzeLrpRQuXo2bF3QuUF2xcbLJloxX1MmlsMMCdBc-qGNonLJ7bpn_JuyXlDWy1Fkeyw1qgjiOdiRIbMC1x302zgzX6dSrBrNB8Cpsh-vCE0ZjUo8M9caEv06F6QbYmdGJHM0ZZY34OHMSNdf-_qUKIV_SuxuSuFE99tkAeWnbWpyI1V-xhVo1sc7NzChP8ci2TdPvI3_0JyAuCvL6zIFqJUJkZibEUghhg6F09-oNJKpy7rhUJq7zZyLXJsvuXnn0gnIxfjRvMcDfZAKUVMZKRdw7fwWzwQril4Ib0MQOVda9vb_4JMk7Gup-TUI4sfuS4NKwsnKoODIO-2U5QpJWdtp1F4AQ1pBv8ajFl1WTrVGvkRGK0woPWaO6pWyJ4kRnhnxrV2FyNNt3JSR-0JEjhFWws47kjBvpr0VRiVRFppKA-plKs4LPlaaCff39TleYmY3mETe3w1GIGc2Lliad32Jpbx496IgDe1K3FMBEoKFZfhmtlRSXft8NKgSzPt2zkatM9bFKfaCYRaSy7akbk"}
Binary file added rulesets-signature.1622134324.sha256
Binary file not shown.
4 changes: 4 additions & 0 deletions rulesets-signature.1625068418.sha256
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Z��`��R���݇~��;v��:�S�dN�5
��Id?����e�_��� �8�շx�]t曍ϊ�G"A�&�x���d�@{[jx���n�Iy�p�9�݀���Qf��U �<]P+���((�W)�9T6���`2�������,�8�`9��@0='�CŸ�
-ɪ0bt�lPA�E�K�|h`�Y�/��ysn�'����P�r7�C(ߺ�M%���b���`^[��� �7���*_l;�M8A�|�dn��t�@��cE@`dψ�>�@�Ԟ����������]kyN��K{3Fa?pVś;��v��}�\;B���˷��4]�O��4 DŔ�'�pw�����S~P����b�7;U@�5. 4L͞��Ȋ�sw���6`�!Q|�CѴ7�C�����=����̷����'�Ide?����b��-��:�bdΛ/7a��1� ��z83�ƅ��$w� t��BYj�3���o.�aR ��YR��:���W�!�
Jf�}�
Binary file added rulesets-signature.1625865001.sha256
Binary file not shown.