mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2026-02-10 09:06:21 +01:00
Compare commits
2 Commits
master
...
64a6e1f79c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
64a6e1f79c | ||
|
|
9a25a53d18 |
@@ -5,7 +5,7 @@ manage online service access.
|
|||||||
# This will make sure the app is always imported when
|
# This will make sure the app is always imported when
|
||||||
# Django starts so that shared_task will use this app.
|
# Django starts so that shared_task will use this app.
|
||||||
|
|
||||||
__version__ = '4.12.0'
|
__version__ = '4.11.2'
|
||||||
__title__ = 'Alliance Auth'
|
__title__ = 'Alliance Auth'
|
||||||
__title_useragent__ = 'AllianceAuth'
|
__title_useragent__ = 'AllianceAuth'
|
||||||
__url__ = 'https://gitlab.com/allianceauth/allianceauth'
|
__url__ = 'https://gitlab.com/allianceauth/allianceauth'
|
||||||
|
|||||||
@@ -796,7 +796,7 @@ msgstr "Framework"
|
|||||||
|
|
||||||
#: allianceauth/framework/templates/framework/datatables/process-indicator.html:8
|
#: allianceauth/framework/templates/framework/datatables/process-indicator.html:8
|
||||||
msgid "Loading …"
|
msgid "Loading …"
|
||||||
msgstr "Lade …"
|
msgstr ""
|
||||||
|
|
||||||
#: allianceauth/groupmanagement/apps.py:8
|
#: allianceauth/groupmanagement/apps.py:8
|
||||||
#: allianceauth/groupmanagement/auth_hooks.py:18
|
#: allianceauth/groupmanagement/auth_hooks.py:18
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
PROTOCOL=https://
|
PROTOCOL=https://
|
||||||
AUTH_SUBDOMAIN=%AUTH_SUBDOMAIN%
|
AUTH_SUBDOMAIN=%AUTH_SUBDOMAIN%
|
||||||
DOMAIN=%DOMAIN%
|
DOMAIN=%DOMAIN%
|
||||||
AA_DOCKER_TAG=registry.gitlab.com/allianceauth/allianceauth/auth:v4.12.0
|
AA_DOCKER_TAG=registry.gitlab.com/allianceauth/allianceauth/auth:v4.11.2
|
||||||
|
|
||||||
# Nginx Proxy Manager
|
# Nginx Proxy Manager
|
||||||
PROXY_HTTP_PORT=80
|
PROXY_HTTP_PORT=80
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
FROM python:3.11-slim
|
FROM python:3.11-slim
|
||||||
ARG AUTH_VERSION=v4.12.0
|
ARG AUTH_VERSION=v4.11.2
|
||||||
ARG AUTH_PACKAGE=allianceauth==${AUTH_VERSION}
|
ARG AUTH_PACKAGE=allianceauth==${AUTH_VERSION}
|
||||||
ENV AUTH_USER=allianceauth
|
ENV AUTH_USER=allianceauth
|
||||||
ENV AUTH_GROUP=allianceauth
|
ENV AUTH_GROUP=allianceauth
|
||||||
|
|||||||
12
docker/conf/redis.conf
Normal file
12
docker/conf/redis.conf
Normal file
@@ -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
|
||||||
@@ -78,10 +78,11 @@ services:
|
|||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:8
|
image: redis:8
|
||||||
command: redis-server
|
command: ["redis-server", "/usr/local/etc/redis/redis.conf"]
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- "redis-data:/data"
|
- "redis-data:/data"
|
||||||
|
- ./conf/redis.conf:/usr/local/etc/redis/redis.conf:ro
|
||||||
- ./conf/redis_healthcheck.sh:/usr/local/bin/redis_healthcheck.sh
|
- ./conf/redis_healthcheck.sh:/usr/local/bin/redis_healthcheck.sh
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "/usr/local/bin/redis_healthcheck.sh"]
|
test: ["CMD", "/usr/local/bin/redis_healthcheck.sh"]
|
||||||
|
|||||||
Reference in New Issue
Block a user