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 <kevin@scrye.com>

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

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/