Move third-party packages to /thirdpartypackages

Also, add an alias of `/3pp` and redirect the `/mpl-third-party` path to
the new path.

Author: QuLogic

matplotlib.org.yml

@@ -8,21 +8,21 @@
       site_dir: "/usr/share/caddy"
       tls_config: "tls /etc/caddy/tls/cert.pem /etc/caddy/tls/privkey.pem"
     repos:
-      - mpl-brochure-site
-      - matplotlib.github.com
-      - basemap
-      - cheatsheets
-      - cycler
-      - devdocs
-      - governance
-      - ipympl
-      - matplotblog
-      - mpl-bench
-      - mpl-gui
-      - mpl-sphinx-theme
-      - mpl-third-party
-      - pytest-mpl
-      - data-prototype
+      mpl-brochure-site:
+      matplotlib.github.com:
+      basemap:
+      cheatsheets:
+      cycler:
+      devdocs:
+      governance:
+      ipympl:
+      matplotblog:
+      mpl-bench:
+      mpl-gui:
+      mpl-sphinx-theme:
+      mpl-third-party: thirdpartypackages
+      pytest-mpl:
+      data-prototype:
   vars_files:
     - files/webhook_vars.yml
   tasks:
@@ -162,7 +162,7 @@
             mode: 0755
             owner: caddy
             group: caddy
-          loop: "{{ repos }}"
+          loop: "{{ repos.keys() }}"
 
         - name: Clone Git repositories
           become: true
@@ -174,7 +174,7 @@
               {{
                 (item == 'matplotlib.github.com') | ternary('main', 'gh-pages')
               }}
-          loop: "{{ repos }}"
+          loop: "{{ repos.keys() }}"
 
     # Caddy server setup
     # ##################

templates/Caddyfile.j2

@@ -3,9 +3,9 @@
 (subproject) {
 	# Caddy doesn't know this is a directory, so redirect to trailing / as
 	# would usually happen for them.
-	redir /{args[0]} /{args[0]}/ permanent
+	redir /{args[1]} /{args[1]}/ permanent
 
-	handle_path /{args[0]}/* {
+	handle_path /{args[1]}/* {
 		root * {{ caddy.site_dir }}/{args[0]}
 		try_files {path}.html {path}
 		file_server {
@@ -70,8 +70,8 @@ http://{{ caddy.addresses.main }}, http://{{ ansible_fqdn }} {
 
 	root * {{ caddy.site_dir }}
 
-{% for site in repos %}
-	import subproject {{ site }}
+{% for site, path in repos.items() %}
+	import subproject {{ site }} {{ path | default(site, true) }}
 {% endfor %}
 
 	# Hide mpl-altair until the site is fixed.
@@ -96,6 +96,16 @@ http://{{ caddy.addresses.main }}, http://{{ ansible_fqdn }} {
 		}
 	}
 
+	# Redirect the repo-named third-party packages path to the more-generic path.
+	redir /3pp /thirdpartypackages/  # And also add a shortcut.
+	@mpl-third-party path /mpl-third-party /mpl-third-party/*
+	handle @mpl-third-party {
+		route {
+			uri strip_prefix /mpl-third-party
+			redir * /thirdpartypackages{uri}
+		}
+	}
+
 	# Place the brochure site at the top level.
 	@brochure file {
 		root {{ caddy.site_dir }}/mpl-brochure-site