Merge branch 'v4.x' of gitlab.com:allianceauth/allianceauth into v4docs

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.0.0a4
+AA_DOCKER_TAG=registry.gitlab.com/allianceauth/allianceauth/auth:v4.0.0b1
 
 # Nginx Proxy Manager
 PROXY_HTTP_PORT=80
@@ -10,8 +10,10 @@ PROXY_DASH_PORT=81
 PROXY_MYSQL_PASS=%PROXY_MYSQL_PASS%
 PROXY_MYSQL_PASS_ROOT=%PROXY_MYSQL_PASS_ROOT%
 
-# grafana
+# Grafana
 GRAFANA_DB_PASSWORD=%GRAFANA_DB_PASSWORD%
+GF_SECURITY_ADMIN_USERNAME=admin
+GF_SECURITY_ADMIN_PASSWORD=%GF_SECURITY_ADMIN_PASSWORD%
 
 # Alliance Auth Environment Config
 AA_SITENAME=%AA_SITENAME%

docker/Dockerfile

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

docker/docker-compose.yml

@@ -142,6 +142,8 @@ services:
       - grafana-data:/var/lib/grafana
     environment:
       GF_INSTALL_PLUGINS: grafana-piechart-panel,grafana-clock-panel,grafana-simple-json-datasource
+      GF_SECURITY_ADMIN_USERNAME: ${GF_SECURITY_ADMIN_USERNAME}
+      GF_SECURITY_ADMIN_PASSWORD: ${GF_SECURITY_ADMIN_PASSWORD}
       GF_AUTH_DATABASE_PASSWORD: ${GRAFANA_DB_PASSWORD}
     logging:
       driver: "json-file"

docker/scripts/prepare-env.sh

@@ -11,6 +11,7 @@ cp .env.example .env
 sed -i.bak 's/%PROXY_MYSQL_PASS%/'"$(openssl rand -hex 24)"'/g' .env
 sed -i.bak 's/%PROXY_MYSQL_PASS_ROOT%/'"$(openssl rand -hex 24)"'/g' .env
 sed -i.bak 's/%GRAFANA_DB_PASSWORD%/'"$(openssl rand -hex 24)"'/g' .env
+sed -i.bak 's/%GF_SECURITY_ADMIN_PASSWORD%/'"$(openssl rand -hex 24)"'/g' .env
 sed -i.bak 's/%AA_SECRET_KEY%/'"$(openssl rand -hex 24)"'/g' .env
 sed -i.bak 's/%AA_DB_PASSWORD%/'"$(openssl rand -hex 24)"'/g' .env
 sed -i.bak 's/%AA_DB_ROOT_PASSWORD%/'"$(openssl rand -hex 24)"'/g' .env