Merge branch 'develop'

TandoorRecipes · Mar 21, 2024 · 20e0c94 · 20e0c94
2 parents a626bda + ceb68af
commit 20e0c94
Show file tree

Hide file tree

Showing 139 changed files with 41,661 additions and 27,505 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -13,6 +13,22 @@
         "args": ["runserver"],
         "django": true,
         "justMyCode": true
-      }
+      },
+    {
+      "name": "Python: Debug Tests",
+      "type": "debugpy",
+      "request": "launch",
+      "program": "${file}",
+      "purpose": [
+        "debug-test"
+      ],
+      "console": "integratedTerminal",
+      "env": {
+        "//comment": "coverage and pytest can't both be running at the same time",
+        "PYTEST_ADDOPTS": "--no-cov -n 2"
+      },
+      "django": true,
+      "justMyCode": true
+    },
     ]
-  }
+  }
diff --git a/boot.sh b/boot.sh
@@ -76,4 +76,11 @@ echo "Done"
 
 chmod -R 755 /opt/recipes/mediafiles
 
-exec gunicorn -b "[::]:$TANDOOR_PORT" --workers $GUNICORN_WORKERS --threads $GUNICORN_THREADS --access-logfile - --error-logfile - --log-level $GUNICORN_LOG_LEVEL recipes.wsgi
+ipv6_disable=$(cat /sys/module/ipv6/parameters/disable)
+
+# Check if IPv6 is enabled, only then run gunicorn with ipv6 support
+if [ "$ipv6_disable" -eq 0 ]; then
+    exec gunicorn -b "[::]:$TANDOOR_PORT" --workers $GUNICORN_WORKERS --threads $GUNICORN_THREADS --access-logfile - --error-logfile - --log-level $GUNICORN_LOG_LEVEL recipes.wsgi
+else
+    exec gunicorn -b ":$TANDOOR_PORT" --workers $GUNICORN_WORKERS --threads $GUNICORN_THREADS --access-logfile - --error-logfile - --log-level $GUNICORN_LOG_LEVEL recipes.wsgi
+fi
diff --git a/cookbook/locale/ar/LC_MESSAGES/django.mo b/cookbook/locale/ar/LC_MESSAGES/django.mo