Merge branch 'master' of gitlab.com:allianceauth/allianceauth into v5.x

[MISC] Improve Redis installation instructions for Ubuntu

See merge request allianceauth/allianceauth!1641

.gitlab-ci.yml

@@ -51,30 +51,6 @@ secret_detection:
   stage: gitlab
   before_script: []
 
-test-3.8-core:
-  <<: *only-default
-  image: python:3.8-bookworm
-  script:
-    - tox -e py38-core
-  artifacts:
-    when: always
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
-
-test-3.9-core:
-  <<: *only-default
-  image: python:3.9-bookworm
-  script:
-    - tox -e py39-core
-  artifacts:
-    when: always
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
-
 test-3.10-core:
   <<: *only-default
   image: python:3.10-bookworm
@@ -111,30 +87,6 @@ test-3.12-core:
         coverage_format: cobertura
         path: coverage.xml
 
-test-3.8-all:
-  <<: *only-default
-  image: python:3.8-bookworm
-  script:
-    - tox -e py38-all
-  artifacts:
-    when: always
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
-
-test-3.9-all:
-  <<: *only-default
-  image: python:3.9-bookworm
-  script:
-    - tox -e py39-all
-  artifacts:
-    when: always
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: coverage.xml
-
 test-3.10-all:
   <<: *only-default
   image: python:3.10-bookworm
@@ -174,7 +126,7 @@ test-3.12-all:
 
 build-test:
   stage: test
-  image: python:3.11-bookworm
+  image: python:3.12-bookworm
 
   before_script:
     - python -m pip install --upgrade pip
@@ -193,13 +145,13 @@ build-test:
 
 test-docs:
   <<: *only-default
-  image: python:3.11-bookworm
+  image: python:3.12-bookworm
   script:
     - tox -e docs
 
 deploy_production:
   stage: deploy
-  image: python:3.11-bookworm
+  image: python:3.12-bookworm
 
   before_script:
     - python -m pip install --upgrade pip
@@ -215,10 +167,10 @@ deploy_production:
 
 build-image:
   before_script: []
-  image: docker:24.0
+  image: docker:27.0
   stage: docker
   services:
-    - docker:24.0-dind
+    - docker:27-dind
   script: |
     CURRENT_DATE=$(echo $CI_COMMIT_TIMESTAMP | head -c 10 | tr -d -)
     IMAGE_TAG=$CI_REGISTRY_IMAGE/auth:$CURRENT_DATE-$CI_COMMIT_SHORT_SHA
@@ -239,10 +191,10 @@ build-image:
 
 build-image-dev:
   before_script: []
-  image: docker:24.0
+  image: docker:27
   stage: docker
   services:
-    - docker:24.0-dind
+    - docker:27-dind
   script: |
     CURRENT_DATE=$(echo $CI_COMMIT_TIMESTAMP | head -c 10 | tr -d -)
     IMAGE_TAG=$CI_REGISTRY_IMAGE/auth:$CURRENT_DATE-$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA
@@ -260,10 +212,10 @@ build-image-dev:
 
 build-image-mr:
   before_script: []
-  image: docker:24.0
+  image: docker:27
   stage: docker
   services:
-    - docker:24.0-dind
+    - docker:27-dind
   script: |
     CURRENT_DATE=$(echo $CI_COMMIT_TIMESTAMP | head -c 10 | tr -d -)
     IMAGE_TAG=$CI_REGISTRY_IMAGE/auth:$CURRENT_DATE-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME-$CI_COMMIT_SHORT_SHA

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
     rev: v3.15.2
     hooks:
       - id: pyupgrade
-        args: [--py38-plus]
+        args: [--py310-plus]
   - repo: https://github.com/adamchainz/django-upgrade
     rev: 1.17.0
     hooks:

allianceauth/__init__.py

@@ -5,7 +5,7 @@ manage online service access.
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 
-__version__ = '4.2.1'
+__version__ = '4.2.2'
 __title__ = 'Alliance Auth'
 __url__ = 'https://gitlab.com/allianceauth/allianceauth'
 NAME = f'{__title__} v{__version__}'

allianceauth/checks.py

@@ -42,13 +42,13 @@ def system_package_redis(app_configs, **kwargs) -> List[CheckMessage]:
         return errors
 
     if redis_version.major == 7 and redis_version.minor == 2 and timezone.now() > timezone.datetime(year=2025, month=8, day=31, tzinfo=timezone.utc):
-        errors.append(Error(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://redis.io/docs/latest/operate/oss_and_stack/install/install-redis/install-redis-on-linux/", id="allianceauth.checks.A001"))
+        errors.append(Error(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A001"))
     elif redis_version.major == 7 and redis_version.minor == 0:
-        errors.append(Warning(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://redis.io/docs/latest/operate/oss_and_stack/install/install-redis/install-redis-on-linux/", id="allianceauth.checks.A002"))
+        errors.append(Warning(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A002"))
     elif redis_version.major == 6 and redis_version.minor == 2:
-        errors.append(Warning(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://redis.io/docs/latest/operate/oss_and_stack/install/install-redis/install-redis-on-linux/", id="allianceauth.checks.A018"))
+        errors.append(Warning(f"Redis {redis_version.public} in Security Support only, Updating Suggested", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A018"))
     elif redis_version.major in [6, 5]:
-        errors.append(Error(f"Redis {redis_version.public} EOL", hint="https://redis.io/docs/latest/operate/oss_and_stack/install/install-redis/install-redis-on-linux/", id="allianceauth.checks.A003"))
+        errors.append(Error(f"Redis {redis_version.public} EOL", hint="https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A003"))
 
     return errors
 
@@ -161,11 +161,19 @@ def sql_settings(app_configs, **kwargs) -> List[CheckMessage]:
 @register()
 def celery_settings(app_configs, **kwargs) -> List[CheckMessage]:
     errors: List[CheckMessage] = []
-    if current_app.conf.broker_transport_options != {'priority_steps': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], 'queue_order_strategy': 'priority'}:
-        errors.append(Error("Celery Priorities are not set correctly", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/8861ec0a61790eca0261f1adc1cc04ca5f243cbc", id="allianceauth.checks.B003"))
 
-    if current_app.conf.broker_connection_retry_on_startup != True:
-        errors.append(Error("Celery broker_connection_retry_on_startup not set correctly", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280", id="allianceauth.checks.B004"))
+    try:
+        if current_app.conf.broker_transport_options != {'priority_steps': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], 'queue_order_strategy': 'priority'}:
+            errors.append(Error("Celery Priorities are not set correctly", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/8861ec0a61790eca0261f1adc1cc04ca5f243cbc", id="allianceauth.checks.B003"))
+    except KeyError:
+        errors.append(Error("Celery Priorities are not set", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/8861ec0a61790eca0261f1adc1cc04ca5f243cbc", id="allianceauth.checks.B003"))
+
+    try:
+        if current_app.conf.broker_connection_retry_on_startup != True:
+            errors.append(Error("Celery broker_connection_retry_on_startup not set correctly", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280", id="allianceauth.checks.B004"))
+    except KeyError:
+        errors.append(Error("Celery broker_connection_retry_on_startup not set", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280", id="allianceauth.checks.B004"))
+
     return errors
 
 

allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html

@@ -7,7 +7,9 @@
 {% endblock %}
 
 {% block url %}
-    <a href="{{ service_url }}">{{ service_url }}</a>
+    {% if username != '' %}
+        <a href="mumble://{{ connect_url }}">{{ service_url }}</a>
+    {% endif %}
 {% endblock %}
 
 {% block user %}

allianceauth/templates/allianceauth/admin-status/overview.html

@@ -13,9 +13,9 @@
                         {% for notif in notifications %}
                             <li class="list-group-item">
                                 {% if notif.state == 'opened' %}
-                                    <span class="badge bg-success">{% translate "Open" %}</span>
+                                    <span class="badge bg-success me-2">{% translate "Open" %}</span>
                                 {% else %}
-                                    <span class="badge bg-danger">{% translate "Closed" %}</span>
+                                    <span class="badge bg-danger me-2">{% translate "Closed" %}</span>
                                 {% endif %}
                                 <a href="{{ notif.web_url }}" target="_blank">#{{ notif.iid }} {{ notif.title }}</a>
                             </li>

docker/.env.example

@@ -1,7 +1,7 @@
 PROTOCOL=https://
 AUTH_SUBDOMAIN=%AUTH_SUBDOMAIN%
 DOMAIN=%DOMAIN%
-AA_DOCKER_TAG=registry.gitlab.com/allianceauth/allianceauth/auth:v4.2.1
+AA_DOCKER_TAG=registry.gitlab.com/allianceauth/allianceauth/auth:v4.2.2
 
 # Nginx Proxy Manager
 PROXY_HTTP_PORT=80

docker/Dockerfile

@@ -1,5 +1,5 @@
 FROM python:3.11-slim
-ARG AUTH_VERSION=v4.2.1
+ARG AUTH_VERSION=v4.2.2
 ARG AUTH_PACKAGE=allianceauth==${AUTH_VERSION}
 ENV AUTH_USER=allianceauth
 ENV AUTH_GROUP=allianceauth

docker/conf/celery.py

@@ -9,6 +9,10 @@ from django.conf import settings  # noqa
 
 app = Celery('myauth')
 
+# Automatically try to establish the connection to the AMQP broker on
+# Celery startup if it is unavailable.
+app.conf.broker_connection_retry_on_startup = True
+
 # Using a string here means the worker don't have to serialize
 # the configuration object to child processes.
 app.config_from_object('django.conf:settings')

docs/features/services/mumble-docker.md

@@ -1,4 +1,4 @@
-# Mumble
+# Mumble (Docker)
 
 An alternate install guide for Mumble using Docker, better suited to an Alliance Auth Docker install
 

docs/features/services/openfire-docker.md

@@ -1,4 +1,4 @@
-# Openfire
+# Openfire (Docker)
 
 An alternate install guide for Openfire using Docker, better suited to an Alliance Auth Docker install
 

docs/features/services/teamspeak3-docker.md

@@ -1,4 +1,4 @@
-# TeamSpeak 3
+# TeamSpeak 3 (Docker)
 
 ## Overview
 

docs/installation/allianceauth.md

@@ -181,13 +181,17 @@ If you don't plan on running the database on the same server as auth you still n
 
 ### Redis and Other Tools
 
-A few extra utilities are also required for installation of packages.
+A few extra utilities are also required for the installation of packages.
 
 ::::{tabs}
 
 :::{group-tab} Ubuntu 2004, 2204
 
 ```shell
+curl -fsSL https://packages.redis.io/gpg | sudo gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg
+sudo chmod 644 /usr/share/keyrings/redis-archive-keyring.gpg
+echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/redis.list
+sudo apt-get update
 sudo apt-get install unzip git redis-server curl libssl-dev libbz2-dev libffi-dev build-essential pkg-config
 ```
 

pyproject.toml

@@ -15,7 +15,7 @@ license = { file = "LICENSE" }
 authors = [
     { name = "Alliance Auth", email = "adarnof@gmail.com" },
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 classifiers = [
     "Environment :: Web Environment",
     "Framework :: Celery",
@@ -26,8 +26,6 @@ classifiers = [
     "Operating System :: POSIX :: Linux",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -43,7 +41,7 @@ dependencies = [
     "beautifulsoup4",
     "celery<6,>=5.2",
     "celery-once>=3.0.1",
-    "django<5,>=4.2",
+    "django<5.2,>=5.1",
     "django-bootstrap-form",
     "django-bootstrap5>=23.3",
     "django-celery-beat>=2.3",

tox.ini

@@ -2,15 +2,13 @@
 isolated_build = true
 skipsdist = true
 usedevelop = true
-envlist = py{38,39,310,311,312}-{all,core}, docs
+envlist = py{310,311,312}-{all,core}, docs
 
 [testenv]
 setenv =
     all: DJANGO_SETTINGS_MODULE = tests.settings_all
     core: DJANGO_SETTINGS_MODULE = tests.settings_core
 basepython =
-    py38: python3.8
-    py39: python3.9
     py310: python3.10
     py311: python3.11
     py312: python3.12