diff --git a/default.rulesets.1622134324.gz b/default.rulesets.1622134324.gz new file mode 100644 index 0000000..6ee71e7 Binary files /dev/null and b/default.rulesets.1622134324.gz differ diff --git a/default.rulesets.1625068418.gz b/default.rulesets.1625068418.gz new file mode 100644 index 0000000..de1b81a Binary files /dev/null and b/default.rulesets.1625068418.gz differ diff --git a/default.rulesets.1625865001.gz b/default.rulesets.1625865001.gz new file mode 100644 index 0000000..204fdb7 Binary files /dev/null and b/default.rulesets.1625865001.gz differ diff --git a/docker/Dockerfile b/docker/Dockerfile index d9de044..78a8069 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -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 +FROM nginx:mainline-alpine@sha256:bead42240255ae1485653a956ef41c9e458eb077fcb6dc664cbc3aa9701a05ce COPY docker/nginx.conf /etc/nginx RUN mkdir -p /opt/nginx && chown nginx:nginx /opt/nginx diff --git a/docker/nginx.conf b/docker/nginx.conf index 80d3340..6213e6a 100644 --- a/docker/nginx.conf +++ b/docker/nginx.conf @@ -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; } } } diff --git a/index.html b/index.html index 7b96e8d..a67d032 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@ - rulesets-signature.1625864047.sha256
+ rulesets-signature.1625865001.sha256
latest-rulesets-timestamp
- default.rulesets.1625864047.gz
+ default.rulesets.1625865001.gz
diff --git a/latest-rulesets-timestamp b/latest-rulesets-timestamp index ddd5244..74eed20 100644 --- a/latest-rulesets-timestamp +++ b/latest-rulesets-timestamp @@ -1 +1 @@ -1625864047 +1625865001 diff --git a/public_release.pem b/public_release.pem index 8b4ecc0..6084b27 100644 --- a/public_release.pem +++ b/public_release.pem @@ -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----- - diff --git a/release-pubkey.jwk b/release-pubkey.jwk index b06a1c0..8e84450 100644 --- a/release-pubkey.jwk +++ b/release-pubkey.jwk @@ -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"} diff --git a/rulesets-signature.1622134324.sha256 b/rulesets-signature.1622134324.sha256 new file mode 100644 index 0000000..09faf2e Binary files /dev/null and b/rulesets-signature.1622134324.sha256 differ diff --git a/rulesets-signature.1625068418.sha256 b/rulesets-signature.1625068418.sha256 new file mode 100644 index 0000000..8a4f0e4 --- /dev/null +++ b/rulesets-signature.1625068418.sha256 @@ -0,0 +1,4 @@ +Z`R݇~;v:SdN5 +Id?e_ 8շx]t曍ϊG"A&xd@{[jxnIyp9݀QfU <]P+((W)9T6`2,8`9@0='CŸ +-ɪ0btlPAEK|h`Y/ysn'Pr7C(ߺM%b`^[ 7*_l;M8A|dnt@cE@`dψ>@Ԟ]kyNK{3Fa?pVś;v}\;B˷4]O4 DŔ'pwS~Pb7;U@5. 4L͞Ȋsw6`!Q|CѴ7C=̷'Ide?b-:bdΛ/7a1 z83ƅ$w tBYj3o.aR YR:W! +Jf} \ No newline at end of file diff --git a/rulesets-signature.1625865001.sha256 b/rulesets-signature.1625865001.sha256 new file mode 100644 index 0000000..173fca9 Binary files /dev/null and b/rulesets-signature.1625865001.sha256 differ