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

Author: JacobCoffee

pillar/base/bugs.sls

@@ -139,7 +139,7 @@ bugs:
       rdbms__isolation_level: "read committed"
       logging__config: ""
       logging__filename: ""
-      logging__level: "ERROR"
+      logging__level: "WARNING"
       mail__domain: ""
       mail__host: "localhost"
       mail__username: ""

salt/cdn-logs/config/fastly.logrotate.conf

@@ -7,6 +7,6 @@
     delaycompress
     sharedscripts
     postrotate
-        /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
+        /usr/lib/rsyslog/rsyslog-rotate
     endscript
 }

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

@@ -130,10 +130,7 @@ location ~ ^/([a-z-]*/)?(3|3.5|3.6|3.7|3.8|3.9|3.10)/library/__builtin__.html$ {
 location ~ ^/([a-z-]*/)?(3|3.5|3.6|3.7|3.8|3.9|3.10)/library/_winreg.html$ {
     return 301 https://$host/$1$2/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|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|tkinter.tix).html$ {
     return 301 https://$host/$1$2/;
 }