From edf1010bc0a0aa989fff9c9702f850f0f482b967 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 4 Apr 2022 10:47:15 -0700 Subject: [PATCH] calendar: fix url for fedocal in apps and redirect for old calendars fedocal moved to calendar.fedoraproject.org, so use that in apps. Also some links to the old admin.fedoraproject.org/calendar/whatever still exist, so redirect those to calendar.fedoraproject.org/whatever Fixes ticket 10616 Signed-off-by: Kevin Fenzi --- playbooks/include/proxies-redirects.yml | 4 ++-- roles/apps-fp-o/files/apps.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml index 1a10c4c1ad..1d7f44d346 100644 --- a/playbooks/include/proxies-redirects.yml +++ b/playbooks/include/proxies-redirects.yml @@ -126,8 +126,8 @@ - role: httpd/redirectmatch shortname: calendar website: apps.fedoraproject.org - regex: /calendar - target: https://calendar.fedoraproject.org/ + regex: /calendar$1 + target: https://calendar.fedoraproject.org/$1 - role: httpd/redirectmatch shortname: mailman diff --git a/roles/apps-fp-o/files/apps.yaml b/roles/apps-fp-o/files/apps.yaml index a7799cf8f6..2840763847 100644 --- a/roles/apps-fp-o/files/apps.yaml +++ b/roles/apps-fp-o/files/apps.yaml @@ -321,7 +321,7 @@ children: - name: FedoCal data: icon: fedocal.png - url: https://apps.fedoraproject.org/calendar + url: https://calendar.fedoraproject.org/ source_url: https://github.com/fedora-infra/fedocal bugs_url: https://github.com/fedora-infra/fedocal/issues docs_url: https://fedocal.readthedocs.org/en/latest/