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.2'
+__version__ = '4.2.1'
 __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://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A001"))
+        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"))
     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://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A002"))
+        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"))
     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://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html#redis-and-other-tools", id="allianceauth.checks.A018"))
+        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"))
     elif redis_version.major in [6, 5]:
-        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"))
+        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"))
 
     return errors
 
@@ -161,19 +161,11 @@ 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"))
 
-    try:
+    if current_app.conf.broker_connection_retry_on_startup != True:
-        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 broker_connection_retry_on_startup not set correctly", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/380c41400b535447839e5552df2410af35a75280", id="allianceauth.checks.B004"))
-            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,9 +7,7 @@
 {% endblock %}
 
 {% block url %}
-    {% if username != '' %}
+    <a href="{{ service_url }}">{{ service_url }}</a>
-        <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 me-2">{% translate "Open" %}</span>
+                                    <span class="badge bg-success">{% translate "Open" %}</span>
                                 {% else %}
-                                    <span class="badge bg-danger me-2">{% translate "Closed" %}</span>
+                                    <span class="badge bg-danger">{% 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.2
+AA_DOCKER_TAG=registry.gitlab.com/allianceauth/allianceauth/auth:v4.2.1
 
 # Nginx Proxy Manager
 PROXY_HTTP_PORT=80

docker/Dockerfile

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

docker/conf/celery.py

@@ -9,10 +9,6 @@ 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 (Docker)
+# Mumble
 
 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 (Docker)
+# Openfire
 
 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 (Docker)
+# TeamSpeak 3
 
 ## Overview
 

docs/installation/allianceauth.md

@@ -181,17 +181,13 @@ 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 the installation of packages.
+A few extra utilities are also required for 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
 ```