forked from coop-cloud/authentik
Compare commits
4 Commits
main
...
6.3.1+2024
Author | SHA1 | Date | |
---|---|---|---|
a5929044c2 | |||
5a89a6156f | |||
7e1caeee6a | |||
43b305c965 |
@ -1,7 +1,6 @@
|
|||||||
TYPE=authentik
|
TYPE=authentik
|
||||||
TIMEOUT=900
|
TIMEOUT=900
|
||||||
ENABLE_AUTO_UPDATE=true
|
ENABLE_AUTO_UPDATE=true
|
||||||
POST_DEPLOY_CMDS="worker set_admin_pass"
|
|
||||||
# POST_DEPLOY_CMDS="worker set_admin_pass|worker apply_blueprints|worker add_applications"
|
# POST_DEPLOY_CMDS="worker set_admin_pass|worker apply_blueprints|worker add_applications"
|
||||||
LETS_ENCRYPT_ENV=production
|
LETS_ENCRYPT_ENV=production
|
||||||
|
|
||||||
@ -71,7 +70,6 @@ AUTHENTIK_COLOR_BACKGROUND_LIGHT=#1c1e21
|
|||||||
|
|
||||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.matrix.yml"
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.matrix.yml"
|
||||||
# ELEMENT_DOMAIN=element-web.example.com
|
# ELEMENT_DOMAIN=element-web.example.com
|
||||||
# MATRIX_DOMAIN=matrix-synapse.example.com
|
|
||||||
# SECRET_MATRIX_ID_VERSION=v1
|
# SECRET_MATRIX_ID_VERSION=v1
|
||||||
# SECRET_MATRIX_SECRET_VERSION=v1
|
# SECRET_MATRIX_SECRET_VERSION=v1
|
||||||
# APP_ICONS="$APP_ICONS matrix:~/.abra/recipes/authentik/icons/matrix.svg"
|
# APP_ICONS="$APP_ICONS matrix:~/.abra/recipes/authentik/icons/matrix.svg"
|
||||||
@ -124,4 +122,4 @@ AUTHENTIK_COLOR_BACKGROUND_LIGHT=#1c1e21
|
|||||||
|
|
||||||
# APPLICATIONS='{"Calendar": "https://nextcloud.example.com/apps/calendar/", "BBB": "https://nextcloud.example.com/apps/bbb/"}'
|
# APPLICATIONS='{"Calendar": "https://nextcloud.example.com/apps/calendar/", "BBB": "https://nextcloud.example.com/apps/bbb/"}'
|
||||||
# APP_ICONS="$APP_ICONS Calendar:~/.abra/recipes/authentik/icons/calendar.svg"
|
# APP_ICONS="$APP_ICONS Calendar:~/.abra/recipes/authentik/icons/calendar.svg"
|
||||||
# APP_ICONS="$APP_ICONS BBB:~/.abra/recipes/authentik/icons/bbb.png"
|
# APP_ICONS="$APP_ICONS BBB:~/.abra/recipes/authentik/icons/bbb.jpg"
|
||||||
|
@ -17,7 +17,6 @@ matrix-synapse:
|
|||||||
uncomment:
|
uncomment:
|
||||||
- compose.matrix.yml
|
- compose.matrix.yml
|
||||||
- ELEMENT_DOMAIN
|
- ELEMENT_DOMAIN
|
||||||
- MATRIX_DOMAIN
|
|
||||||
- SECRET_MATRIX_ID_VERSION
|
- SECRET_MATRIX_ID_VERSION
|
||||||
- SECRET_MATRIX_SECRET_VERSION
|
- SECRET_MATRIX_SECRET_VERSION
|
||||||
- matrix.svg
|
- matrix.svg
|
||||||
|
@ -1,11 +1,5 @@
|
|||||||
version: "3.8"
|
version: "3.8"
|
||||||
services:
|
services:
|
||||||
app:
|
|
||||||
deploy:
|
|
||||||
labels:
|
|
||||||
- "traefik.http.routers.${STACK_NAME}.middlewares=redirect-matrix-well-known"
|
|
||||||
- "traefik.http.middlewares.redirect-matrix-well-known.redirectregex.regex=^https://(.*)/.well-known/matrix/(.*)"
|
|
||||||
- "traefik.http.middlewares.redirect-matrix-well-known.redirectregex.replacement=https://${MATRIX_DOMAIN}/.well-known/matrix/$$2"
|
|
||||||
worker:
|
worker:
|
||||||
secrets:
|
secrets:
|
||||||
- matrix_id
|
- matrix_id
|
||||||
|
20
compose.yml
20
compose.yml
@ -33,7 +33,7 @@ x-env: &env
|
|||||||
version: '3.8'
|
version: '3.8'
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: ghcr.io/goauthentik/server:2024.6.3
|
image: ghcr.io/goauthentik/server:2024.6.1
|
||||||
command: server
|
command: server
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
@ -71,11 +71,11 @@ services:
|
|||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-frameOptions.headers.customFrameOptionsValue=SAMEORIGIN"
|
- "traefik.http.middlewares.${STACK_NAME}-frameOptions.headers.customFrameOptionsValue=SAMEORIGIN"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-frameOptions.headers.contentSecurityPolicy=frame-ancestors ${X_FRAME_OPTIONS_ALLOW_FROM}"
|
- "traefik.http.middlewares.${STACK_NAME}-frameOptions.headers.contentSecurityPolicy=frame-ancestors ${X_FRAME_OPTIONS_ALLOW_FROM}"
|
||||||
- "coop-cloud.${STACK_NAME}.version=6.5.0+2024.6.3"
|
- "coop-cloud.${STACK_NAME}.version=6.3.1+2024.6.1"
|
||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||||
|
|
||||||
worker:
|
worker:
|
||||||
image: ghcr.io/goauthentik/server:2024.6.3
|
image: ghcr.io/goauthentik/server:2024.6.1
|
||||||
command: worker
|
command: worker
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
@ -90,10 +90,10 @@ services:
|
|||||||
- internal
|
- internal
|
||||||
- proxy
|
- proxy
|
||||||
volumes:
|
volumes:
|
||||||
|
- backups:/backups
|
||||||
- media:/media
|
- media:/media
|
||||||
- /dev/null:/blueprints/default/flow-oobe.yaml
|
- /dev/null:/blueprints/default/flow-oobe.yaml
|
||||||
- templates:/templates
|
- templates:/templates
|
||||||
- certs:/certs
|
|
||||||
configs:
|
configs:
|
||||||
- source: flow_recovery
|
- source: flow_recovery
|
||||||
target: /blueprints/1_flow_recovery.yaml
|
target: /blueprints/1_flow_recovery.yaml
|
||||||
@ -144,13 +144,10 @@ services:
|
|||||||
backupbot.backup: "true"
|
backupbot.backup: "true"
|
||||||
backupbot.backup.pre-hook: "PGPASSWORD=$$(cat /run/secrets/db_password) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /var/lib/postgresql/data/backup.sql"
|
backupbot.backup.pre-hook: "PGPASSWORD=$$(cat /run/secrets/db_password) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /var/lib/postgresql/data/backup.sql"
|
||||||
backupbot.backup.post-hook: "rm -rf /var/lib/postgresql/data/backup.sql"
|
backupbot.backup.post-hook: "rm -rf /var/lib/postgresql/data/backup.sql"
|
||||||
backupbot.backup.volumes.database.path: "backup.sql"
|
backupbot.backup.path: "/var/lib/postgresql/data"
|
||||||
backupbot.backup.volumes.redis: "false"
|
|
||||||
backupbot.restore.post-hook: 'psql -U authentik -d postgres -c "DROP DATABASE authentik WITH (FORCE);" && createdb -U authentik authentik && psql -U authentik -d authentik -f /var/lib/postgresql/data/backup.sql'
|
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:7.4.0-alpine
|
image: redis:7.2.5-alpine
|
||||||
command: --save 60 1 --loglevel warning
|
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
healthcheck:
|
healthcheck:
|
||||||
@ -159,8 +156,6 @@ services:
|
|||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 10
|
retries: 10
|
||||||
start_period: 1m
|
start_period: 1m
|
||||||
volumes:
|
|
||||||
- redis:/data
|
|
||||||
|
|
||||||
secrets:
|
secrets:
|
||||||
db_password:
|
db_password:
|
||||||
@ -185,9 +180,8 @@ networks:
|
|||||||
internal:
|
internal:
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
|
backups:
|
||||||
media:
|
media:
|
||||||
certs:
|
|
||||||
redis:
|
|
||||||
templates:
|
templates:
|
||||||
assets:
|
assets:
|
||||||
database:
|
database:
|
||||||
|
BIN
icons/bbb.jpg
Normal file
BIN
icons/bbb.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 6.7 KiB |
BIN
icons/bbb.png
BIN
icons/bbb.png
Binary file not shown.
Before Width: | Height: | Size: 94 KiB |
Reference in New Issue
Block a user