diff --git a/provision/core/nginx/apt-keys/nginx-archive-keyring.gpg b/provision/core/nginx/apt-keys/nginx-archive-keyring.gpg new file mode 100644 index 000000000..8f9e9bf8e Binary files /dev/null and b/provision/core/nginx/apt-keys/nginx-archive-keyring.gpg differ diff --git a/provision/core/nginx/apt-keys/nginx_signing.key b/provision/core/nginx/apt-keys/nginx_signing.key deleted file mode 100644 index d2258b8fb..000000000 --- a/provision/core/nginx/apt-keys/nginx_signing.key +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.22 (GNU/Linux) - -mQENBE5OMmIBCAD+FPYKGriGGf7NqwKfWC83cBV01gabgVWQmZbMcFzeW+hMsgxH -W6iimD0RsfZ9oEbfJCPG0CRSZ7ppq5pKamYs2+EJ8Q2ysOFHHwpGrA2C8zyNAs4I -QxnZZIbETgcSwFtDun0XiqPwPZgyuXVm9PAbLZRbfBzm8wR/3SWygqZBBLdQk5TE -fDR+Eny/M1RVR4xClECONF9UBB2ejFdI1LD45APbP2hsN/piFByU1t7yK2gpFyRt -97WzGHn9MV5/TL7AmRPM4pcr3JacmtCnxXeCZ8nLqedoSuHFuhwyDnlAbu8I16O5 -XRrfzhrHRJFM1JnIiGmzZi6zBvH0ItfyX6ttABEBAAG0KW5naW54IHNpZ25pbmcg -a2V5IDxzaWduaW5nLWtleUBuZ2lueC5jb20+iQE+BBMBAgAoAhsDBgsJCAcDAgYV -CAIJCgsEFgIDAQIeAQIXgAUCV2K1+AUJGB4fQQAKCRCr9b2Ce9m/YloaB/9XGrol -kocm7l/tsVjaBQCteXKuwsm4XhCuAQ6YAwA1L1UheGOG/aa2xJvrXE8X32tgcTjr -KoYoXWcdxaFjlXGTt6jV85qRguUzvMOxxSEM2Dn115etN9piPl0Zz+4rkx8+2vJG -F+eMlruPXg/zd88NvyLq5gGHEsFRBMVufYmHtNfcp4okC1klWiRIRSdp4QY1wdrN -1O+/oCTl8Bzy6hcHjLIq3aoumcLxMjtBoclc/5OTioLDwSDfVx7rWyfRhcBzVbwD -oe/PD08AoAA6fxXvWjSxy+dGhEaXoTHjkCbz/l6NxrK3JFyauDgU4K4MytsZ1HDi -MgMW8hZXxszoICTTiQEcBBABAgAGBQJOTkelAAoJEKZP1bF62zmo79oH/1XDb29S -YtWp+MTJTPFEwlWRiyRuDXy3wBd/BpwBRIWfWzMs1gnCjNjk0EVBVGa2grvy9Jtx -JKMd6l/PWXVucSt+U/+GO8rBkw14SdhqxaS2l14v6gyMeUrSbY3XfToGfwHC4sa/ -Thn8X4jFaQ2XN5dAIzJGU1s5JA0tjEzUwCnmrKmyMlXZaoQVrmORGjCuH0I0aAFk -RS0UtnB9HPpxhGVbs24xXZQnZDNbUQeulFxS4uP3OLDBAeCHl+v4t/uotIad8v6J -SO93vc1evIje6lguE81HHmJn9noxPItvOvSMb2yPsE8mH4cJHRTFNSEhPW6ghmlf -Wa9ZwiVX5igxcvaIRgQQEQIABgUCTk5b0gAKCRDs8OkLLBcgg1G+AKCnacLb/+W6 -cflirUIExgZdUJqoogCeNPVwXiHEIVqithAM1pdY/gcaQZmIRgQQEQIABgUCTk5f -YQAKCRCpN2E5pSTFPnNWAJ9gUozyiS+9jf2rJvqmJSeWuCgVRwCcCUFhXRCpQO2Y -Va3l3WuB+rgKjsQ= -=EWWI ------END PGP PUBLIC KEY BLOCK----- diff --git a/provision/core/nginx/provision.sh b/provision/core/nginx/provision.sh index ee162bf55..7d0f74a8b 100644 --- a/provision/core/nginx/provision.sh +++ b/provision/core/nginx/provision.sh @@ -13,15 +13,20 @@ function nginx_register_apt_sources() { fi } vvv_add_hook register_apt_sources nginx_register_apt_sources - function nginx_register_apt_keys() { # Before running `apt-get update`, we should add the public keys for # the packages that we are installing from non standard sources via # our appended apt source.list + if vvv_apt_keys_has '573B FD6B 3D8F BC64 1079 A6AB ABF5 BD82 7BD9 BF62'; then + # Retrieve the Nginx signing key from nginx.org + vvv_info " * Replacing expired Nginx signing key..." + apt-key add /srv/provision/core/nginx/apt-keys/nginx-archive-keyring.gpg + fi + if ! vvv_apt_keys_has 'nginx'; then # Retrieve the Nginx signing key from nginx.org - vvv_info " * Applying Nginx signing key..." - apt-key add /srv/provision/core/nginx/apt-keys/nginx_signing.key + vvv_info " * Adding Nginx signing key..." + apt-key add /srv/provision/core/nginx/apt-keys/nginx-archive-keyring.gpg fi } vvv_add_hook register_apt_keys nginx_register_apt_keys