diff --git a/roles/archweb/defaults/main.yml b/roles/archweb/defaults/main.yml index 602710467c6ed5c18f74afedea067e56fa1e3f19..f5a5b4da2993c2c9325d99d1d1fb2424eadb77a2 100644 --- a/roles/archweb/defaults/main.yml +++ b/roles/archweb/defaults/main.yml @@ -12,7 +12,7 @@ archweb_domains_templates: archweb_allowed_hosts: ["{{ archweb_domain }}", 'ipxe.archlinux.org'] archweb_nginx_conf: '/etc/nginx/nginx.d/archweb.conf' archweb_repository: 'https://github.com/archlinux/archweb.git' -archweb_version: 'release_2023-08-25' +archweb_version: 'release_2023-10-23' archweb_pgp_key: ['E499C79F53C96A54E572FEE1C06086337C50773E'] archweb_site: true archweb_mirrorcheck: false diff --git a/roles/archweb/templates/nginx.d.conf.j2 b/roles/archweb/templates/nginx.d.conf.j2 index 2fa0779a191e4cb8ba709210f650f87616d9ea35..913ec1ddae693517b0b564e1e3d638273cae10dc 100644 --- a/roles/archweb/templates/nginx.d.conf.j2 +++ b/roles/archweb/templates/nginx.d.conf.j2 @@ -189,6 +189,16 @@ server { limit_req zone=rsslimit burst=10 nodelay; } + # Temporary redirects + location /people/trusted-users/ { + return 301 /people/package-maintainers/; + } + + location /people/trusted-users-fellows/ { + return 301 /people/package-maintainer-fellows/; + } + + location / { access_log /var/log/nginx/{{ archweb_domain }}/access.log main; access_log /var/log/nginx/{{ archweb_domain }}/access.log.json json_main;