Merge branch 'main' into rate-limit-at-lb

Author: JacobCoffee

.github/workflows/deployminder.yml

@@ -11,6 +11,8 @@ jobs:
   remind:
     if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
+    permissions:
+        issues: write
     steps:
       - name: Comment on PR
         uses: actions/github-script@v7

pillar/base/users/_admin/ee.sls

@@ -10,3 +10,5 @@ users:
       ee@chungus
     - ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBt9u0P2LhONN5ngUmtU8GupeRXp+BKXnq9Pmx6r6vE8iJ1MQCeRroiNpJ5C8Lr+2yCgsRK5pLndKOowIz5hFPY=
       ee@pancack
+    - ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBSz/Yna8yFAglO9iY/lEdBHDNY91UTfbfGLYcYAZKtYnAnTMyOSQBhubUYr7z5zZv8NBpLiU+10WR8hgDtSsr0=
+      ee@psf-air

pillar/dev/secrets/docs.sls

@@ -1,3 +1,6 @@
 docs:
   sentry:
     dsn: https://[email protected]/6666666
+  fastly:
+    service_id: deadbeefdeadbeefdead
+    token: deadbeefdeadbeefdeadbeefdeadbeef

salt/docs/config/nginx.docs-redirects.conf

@@ -133,7 +133,7 @@ location ~ ^/([a-z-]*/)?(3|3.5|3.6|3.7|3.8|3.9|3.10)/library/_winreg.html$ {
 location ~ ^/([a-z-]*/)?(3|3.12|3.13|3.14)/library/(asynchat|asyncore|smtpd).html$ {
     return 301 https://$host/$1$2/;
 }
-location ~ ^/([a-z-]*/)?(3.13|3.14)/library/(2to3|aifc|audioop|cgi|cgitb|chunk|crypt|imghdr|mailcap|msilib|nis|nntplib|ossaudiodev|pipes|sndhdr|spwd|sunau|telnetlib|tkinter.tix|uu|xdrlib).html$ {
+location ~ ^/([a-z-]*/)?(3|3.13|3.14)/library/(2to3|aifc|audioop|cgi|cgitb|chunk|crypt|imghdr|mailcap|msilib|nis|nntplib|ossaudiodev|pipes|sndhdr|spwd|sunau|telnetlib|tkinter.tix|uu|xdrlib).html$ {
     return 301 https://$host/$1$2/;
 }
 
@@ -167,7 +167,7 @@ location = /documenting/building.html {
 }
 
 # Map toplevel URIs to Python 3 docs.
-location ~ ^/((archives|c-api|distutils|extending|faq|howto|install|library|reference|tutorial|using|whatsnew|_images|_sources|_static)(/.*)?)$ {
+location ~ ^/((archives|c-api|deprecations|distutils|extending|faq|howto|install|library|reference|tutorial|using|whatsnew|_images|_sources|_static)(/.*)?)$ {
     return 301 https://$host/3/$1;
 }
 location ~ ^/(about|bugs|contents|copyright|download|genindex(-[^.]+)?|glossary|index|license|py-modindex|search)(.html)?$ {
@@ -185,36 +185,46 @@ location ~ ^/((2|3)(\.[0-9]+)?|dev)/\w+/[\d\w\.]+(?!\.html)$ {
     if (-f "${request_filename}.html") {
         return 301 https://$host:$request_uri.html;
     }
+    add_header Surrogate-Key en/$1 always;
+}
+
+# Add the Surrogate-Key for bulk CDN purging
+# xref https://docs.fastly.com/en/guides/working-with-surrogate-keys
+location ~ ^/((2|3)(\.[0-9]+)?|dev)/ {
+    add_header Surrogate-Key en/$1 always;
+}
+location ~ ^/(es|fr|id|it|ja|ko|pl|pt-br|tr|uk|zh-cn|zh-tw)/((2|3)(\.[0-9]+)?|dev)/ {
+    add_header Surrogate-Key $1/$2 always;
 }
 
 # Map old, 2.5-and-earlier directory names to 2.6-and-later names.
 location = /lib/ {
-    return 301 https://$host/library/;
+    return 301 https://$host/3/library/;
 }
 location ~ ^/lib/module-([a-zA-Z0-9.]+)\.html$ {
-    return 301 https://$host/library/$1.html;
+    return 301 https://$host/3/library/$1.html;
 }
 location = /tut/ {
-    return 301 https://$host/tutorial/;
+    return 301 https://$host/3/tutorial/;
 }
 location = /tut/tut.html {
-    return 301 https://$host/tutorial/;
+    return 301 https://$host/3/tutorial/;
 }
 location = /api/ {
-    return 301 https://$host/c-api/;
+    return 301 https://$host/3/c-api/;
 }
 location = /ext/ {
-    return 301 https://$host/extending/;
+    return 301 https://$host/3/extending/;
 }
 location = /dist/ {
-    return 301 https://docs.python.org/distutils/;
+    return 301 https://$host/3/;
 }
 location = /inst/ {
-    return 301 https://$host/install/;
+    return 301 https://$host/3/;
 }
 location = /doc/ {
-    return 301 https://devguide.python.org/documenting.html;
+    return 301 https://devguide.python.org/documentation/start-documenting/;
 }
 location = /ref/ {
-    return 301 https://$host/reference/;
+    return 301 https://$host/3/reference/;
 }

salt/docs/init.sls

@@ -22,6 +22,7 @@ doc-pkgs:
       - texlive-latex-extra
       - texlive-latex-recommended
       - texlive-fonts-recommended
+      - texlive-fonts-extra
       - texlive-lang-all
       - texlive-xetex
       - xindy
@@ -78,8 +79,21 @@ docsbuild-sentry:
     - name: SENTRY_DSN
     - value: {{ pillar.get('docs', {}).get('sentry', {}).get('dsn', '') }}
 
+docsbuild-fastly-service-id:
+  cron.env_present:
+    - user: docsbuild
+    - name: FASTLY_SERVICE_ID
+    - value: {{ pillar.get('docs', {}).get('fastly', {}).get('service_id', '') }}
+
+docsbuild-fastly-token:
+  cron.env_present:
+    - user: docsbuild
+    - name: FASTLY_TOKEN
+    - value: {{ pillar.get('docs', {}).get('fastly', {}).get('token', '') }}
+
 docsbuild-no-html:
   cron.present:
+    # run every other day at 07:06
     - identifier: docsbuild-no-html
     - name: >
         /srv/docsbuild/venv/bin/python
@@ -88,18 +102,35 @@ docsbuild-no-html:
     - user: docsbuild
     - minute: 7
     - hour: 6
+    - daymonth: '*/2'
     - require:
       - cmd: virtualenv-dependencies
 
 docsbuild-only-html:
   cron.present:
+    # run daily at 04:42
     - identifier: docsbuild-only-html
     - name: >
         /srv/docsbuild/venv/bin/python
         /srv/docsbuild/scripts/build_docs.py
         --select-output=only-html
     - user: docsbuild
-    - minute: 16
+    - minute: 42
+    - hour: 4
+    - require:
+      - cmd: virtualenv-dependencies
+
+docsbuild-only-html-en:
+  cron.present:
+    # run twice hourly at HH:16 and HH:46
+    - identifier: docsbuild-only-html-en
+    - name: >
+        /srv/docsbuild/venv/bin/python
+        /srv/docsbuild/scripts/build_docs.py
+        --select-output=only-html-en
+        --language=en
+    - user: docsbuild
+    - minute: 16,46
     - require:
       - cmd: virtualenv-dependencies
 

salt/planet/init.sls

@@ -40,6 +40,7 @@ planet-user:
 
 https://github.com/python/planet:
   git.latest:
+    - branch: py2
     - target: /srv/planet/
     - user: planet
     - require: