Merge branch 'docker-redis-config' into 'master'

Default redis configuration for docker setup

See merge request allianceauth/allianceauth!1787

README.md

@@ -63,7 +63,6 @@ Here is an example of the Alliance Auth web site with a mixture of Services, App
 - [Aaron Kable](https://gitlab.com/aaronkable/)
 - [Ariel Rin](https://gitlab.com/soratidus999/)
 - [Col Crunch](https://gitlab.com/colcrunch/)
-- [Erik Kalkoken](https://gitlab.com/ErikKalkoken/)
 - [Rounon Dax](https://gitlab.com/ppfeufer)
 - [snipereagle1](https://gitlab.com/mckernanin)
 
@@ -71,6 +70,7 @@ Here is an example of the Alliance Auth web site with a mixture of Services, App
 
 - [Adarnof](https://gitlab.com/adarnof/)
 - [Basraah](https://gitlab.com/basraah/)
+- [Erik Kalkoken](https://gitlab.com/ErikKalkoken/)
 
 ### Beta Testers / Bug Fixers
 

allianceauth/notifications/templates/notifications/list.html

@@ -33,7 +33,7 @@
     {% include "framework/header/nav-collapse-icon.html" with fa_icon="fa-solid fa-check-double" url=nav_item_link title=nav_item_title icon_on_mobile=True %}
 
     {% translate "Delete all read notifications" as nav_item_title %}
-    {% url "notifications:mark_all_read" as nav_item_link %}
+    {% url "notifications:delete_all_read" as nav_item_link %}
     {% include "framework/header/nav-collapse-icon.html" with fa_icon="fa-solid fa-trash-can" url=nav_item_link title=nav_item_title icon_on_mobile=True %}
 {% endblock %}
 

allianceauth/project_template/project_name/settings/local.py

@@ -57,10 +57,10 @@ DATABASES['default'] = {
 # CCP's developer portal
 # Logging in to auth requires the publicData scope (can be overridden through the
 # LOGIN_TOKEN_SCOPES setting). Other apps may require more (see their docs).
+ESI_SSO_CALLBACK_URL = f"{SITE_URL}/sso/callback"  # Do NOT change this line!
 ESI_SSO_CLIENT_ID = ''
 ESI_SSO_CLIENT_SECRET = ''
-ESI_SSO_CALLBACK_URL = f"{SITE_URL}/sso/callback"
+ESI_USER_CONTACT_EMAIL = ''  # A server maintainer that CCP can contact in case of issues.
-ESI_USER_CONTACT_EMAIL = ''    # A server maintainer that CCP can contact in case of issues.
 
 # By default, emails are validated before new users can log in.
 # It's recommended to use a free service like SparkPost or Elastic Email to send email.

docker/conf/local.py

@@ -17,9 +17,7 @@ DATABASES["default"] = {
     "PASSWORD": os.environ.get("AA_DB_PASSWORD"),
     "HOST": os.environ.get("AA_DB_HOST"),
     "PORT": os.environ.get("AA_DB_PORT", "3306"),
-    "OPTIONS": {
+    "OPTIONS": {"charset": os.environ.get("AA_DB_CHARSET", "utf8mb4")},
-        "charset": os.environ.get("AA_DB_CHARSET", "utf8mb4")
-    }
 }
 
 # Register an application at https://developers.eveonline.com for Authentication
@@ -27,10 +25,9 @@ DATABASES["default"] = {
 # to https://example.com/sso/callback substituting your domain for example.com
 # Logging in to auth requires the publicData scope (can be overridden through the
 # LOGIN_TOKEN_SCOPES setting). Other apps may require more (see their docs).
-
+ESI_SSO_CALLBACK_URL = f"{SITE_URL}/sso/callback"  # Do NOT change this line!
 ESI_SSO_CLIENT_ID = os.environ.get("ESI_SSO_CLIENT_ID")
 ESI_SSO_CLIENT_SECRET = os.environ.get("ESI_SSO_CLIENT_SECRET")
-ESI_SSO_CALLBACK_URL = f"{SITE_URL}/sso/callback"
 ESI_USER_CONTACT_EMAIL = os.environ.get(
     "ESI_USER_CONTACT_EMAIL"
 )  # A server maintainer that CCP can contact in case of issues.
@@ -70,7 +67,6 @@ INSTALLED_APPS += [
     # 'allianceauth.permissions_tool',
     # 'allianceauth.srp',
     # 'allianceauth.timerboard',
-
     # https://allianceauth.readthedocs.io/en/latest/features/services/index.html
     # 'allianceauth.services.modules.discord',
     # 'allianceauth.services.modules.discourse',

docker/conf/redis.conf

@@ -0,0 +1,12 @@
+# Set the maximum memory usage
+maxmemory 2GB
+
+# Evict old keys instead of growing
+maxmemory-policy allkeys-lru
+
+# Disable disk persistence
+appendonly no
+save ""
+
+# Optional: reduce fragmentation
+activedefrag yes

docker/docker-compose.yml

@@ -78,10 +78,11 @@ services:
 
   redis:
     image: redis:8
-    command: redis-server
+    command: ["redis-server", "/usr/local/etc/redis/redis.conf"]
     restart: always
     volumes:
       - "redis-data:/data"
+      - ./conf/redis.conf:/usr/local/etc/redis/redis.conf:ro
       - ./conf/redis_healthcheck.sh:/usr/local/bin/redis_healthcheck.sh
     healthcheck:
       test: ["CMD", "/usr/local/bin/redis_healthcheck.sh"]

docs/development/custom/framework/svg-sprite.md

@@ -28,6 +28,7 @@ The following icons are available in the Alliance Auth SVG sprite:
 
 - `aa-logo`: The Alliance Auth logo
 - `aa-loading-spinner`: A loading spinner icon
+- `aa-mumble-logo`: The Mumble logo
 
 ### Alliance Auth Logo
 

docs/features/services/discord.md

@@ -20,8 +20,8 @@ Make the following changes in your auth project's settings file (`local.py`):
 # Be sure to set the callback URLto https://example.com/discord/callback/
 # substituting your domain for example.com in Discord's developer portal
 # (Be sure to add the trailing slash)
+DISCORD_CALLBACK_URL = f"{SITE_URL}/discord/callback/"  # Do NOT change this line!
 DISCORD_GUILD_ID = ''
-DISCORD_CALLBACK_URL = f"{SITE_URL}/discord/callback/"
 DISCORD_APP_ID = ''
 DISCORD_APP_SECRET = ''
 DISCORD_BOT_TOKEN = ''