ci: merge main to release

Author: jennifer-richards

ietf/settings_testcrawl.py

@@ -27,9 +27,11 @@
             'MAX_ENTRIES': 10000,
         },
     },
+    'proceedings': {
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+    },
     'sessions': {
         'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-        # No version-specific VERSION setting.
     },
     'htmlized': {
         'BACKEND': 'django.core.cache.backends.dummy.DummyCache',

k8s/settings_local.py

@@ -301,6 +301,17 @@ def _multiline_to_list(s):
         "LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}",
         "VERSION": __version__,
         "KEY_PREFIX": "ietf:dt",
+        # Key function is default except with sha384-encoded key
+        "KEY_FUNCTION": lambda key, key_prefix, version: (
+            f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}"
+        ),
+    },
+    "proceedings": {
+        "BACKEND": "ietf.utils.cache.LenientMemcacheCache",
+        "LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}",
+        # No release-specific VERSION setting.
+        "KEY_PREFIX": "ietf:dt:proceedings",
+        # Key function is default except with sha384-encoded key
         "KEY_FUNCTION": lambda key, key_prefix, version: (
             f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}"
         ),