Compare commits
11
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
306b348961 | ||
|
|
3c1121b7ce | ||
|
|
b0eb1756a3 | ||
|
|
97b9b99e93 | ||
|
|
cf2a5077c9 | ||
|
|
74282d5658 | ||
|
|
ab7716bf1e | ||
|
|
b0cc5a49a1 | ||
|
|
3cca5d2cf3 | ||
|
|
f403648cf6 | ||
|
|
83f724a316 |
+1
-1
@@ -37,7 +37,7 @@ steps:
|
|||||||
from_secret: drone_abra-bot_token
|
from_secret: drone_abra-bot_token
|
||||||
fork: true
|
fork: true
|
||||||
repositories:
|
repositories:
|
||||||
- coop-cloud/auto-recipes-catalogue-json
|
- toolshed/auto-recipes-catalogue-json
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
event: tag
|
event: tag
|
||||||
|
|||||||
+10
-1
@@ -1,5 +1,5 @@
|
|||||||
TYPE=wordpress
|
TYPE=wordpress
|
||||||
TIMEOUT=300
|
#TIMEOUT=300
|
||||||
ENABLE_AUTO_UPDATE=true
|
ENABLE_AUTO_UPDATE=true
|
||||||
COMPOSE_FILE="compose.yml"
|
COMPOSE_FILE="compose.yml"
|
||||||
ENABLE_BACKUPS=true
|
ENABLE_BACKUPS=true
|
||||||
@@ -69,6 +69,10 @@ SECRET_DB_PASSWORD_VERSION=v1
|
|||||||
#SECRET_AUTHENTIK_ID_VERSION=v1
|
#SECRET_AUTHENTIK_ID_VERSION=v1
|
||||||
#LOGIN_TYPE='auto'
|
#LOGIN_TYPE='auto'
|
||||||
|
|
||||||
|
# Matrix .well-known redirect
|
||||||
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.matrix.yml"
|
||||||
|
#MATRIX_DOMAIN=matrix.example.com
|
||||||
|
|
||||||
# Allow remote connections to db
|
# Allow remote connections to db
|
||||||
# 🚩🚩 dangerous, use only for development sites!
|
# 🚩🚩 dangerous, use only for development sites!
|
||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.public-db.yml
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.public-db.yml
|
||||||
@@ -83,3 +87,8 @@ SECRET_DB_PASSWORD_VERSION=v1
|
|||||||
#SECRET_FTP_PASS_VERSION=v1
|
#SECRET_FTP_PASS_VERSION=v1
|
||||||
# You can use a Port between 2220-2225
|
# You can use a Port between 2220-2225
|
||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.ftp-2220.yml"
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.ftp-2220.yml"
|
||||||
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.ftp-2221.yml"
|
||||||
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.ftp-2222.yml"
|
||||||
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.ftp-2223.yml"
|
||||||
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.ftp-2224.yml"
|
||||||
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.ftp-2225.yml"
|
||||||
|
|||||||
@@ -63,6 +63,8 @@ set_authentik(){
|
|||||||
\"endpoint_userinfo\":\"https://$AUTHENTIK_DOMAIN/application/o/userinfo/\",
|
\"endpoint_userinfo\":\"https://$AUTHENTIK_DOMAIN/application/o/userinfo/\",
|
||||||
\"endpoint_token\":\"https://$AUTHENTIK_DOMAIN/application/o/token/\",
|
\"endpoint_token\":\"https://$AUTHENTIK_DOMAIN/application/o/token/\",
|
||||||
\"endpoint_end_session\":\"https://$AUTHENTIK_DOMAIN/application/o/wordpress/end-session/\",
|
\"endpoint_end_session\":\"https://$AUTHENTIK_DOMAIN/application/o/wordpress/end-session/\",
|
||||||
|
\"endpoint_jwks\":\"https://$AUTHENTIK_DOMAIN/application/o/wordpress/jwks/\",
|
||||||
|
\"issuer\":\"https://$AUTHENTIK_DOMAIN/application/o/wordpress/\",
|
||||||
\"acr_values\":\"\",
|
\"acr_values\":\"\",
|
||||||
\"identity_key\":\"preferred_username\",
|
\"identity_key\":\"preferred_username\",
|
||||||
\"no_sslverify\":\"0\",
|
\"no_sslverify\":\"0\",
|
||||||
|
|||||||
@@ -10,3 +10,7 @@ authentik:
|
|||||||
shared_secrets:
|
shared_secrets:
|
||||||
wordpress_secret: authentik_secret
|
wordpress_secret: authentik_secret
|
||||||
wordpress_id: authentik_id
|
wordpress_id: authentik_id
|
||||||
|
matrix:
|
||||||
|
uncomment:
|
||||||
|
- compose.matrix.yml
|
||||||
|
- MATRIX_DOMAIN
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
---
|
||||||
|
version: "3.8"
|
||||||
|
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
deploy:
|
||||||
|
labels:
|
||||||
|
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect-matrix-well-known"
|
||||||
|
- "traefik.http.middlewares.${STACK_NAME}-redirect-matrix-well-known.redirectregex.regex=^https://(.*)/.well-known/matrix/(.*)"
|
||||||
|
- "traefik.http.middlewares.${STACK_NAME}-redirect-matrix-well-known.redirectregex.replacement=https://${MATRIX_DOMAIN}/.well-known/matrix/$$2"
|
||||||
+4
-4
@@ -3,7 +3,7 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: "wordpress:6.7.1"
|
image: "wordpress:6.9.0"
|
||||||
volumes:
|
volumes:
|
||||||
- "wordpress_content:/var/www/html/wp-content/"
|
- "wordpress_content:/var/www/html/wp-content/"
|
||||||
networks:
|
networks:
|
||||||
@@ -61,11 +61,11 @@ services:
|
|||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.regex=^https://(${REDIRECTS})/(.*)"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.regex=^https://(${REDIRECTS})/(.*)"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.replacement=https://${DOMAIN}/$${2}"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.replacement=https://${DOMAIN}/$${2}"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.permanent=true"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.permanent=true"
|
||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
|
||||||
- "coop-cloud.${STACK_NAME}.version=2.13.2+6.7.1"
|
- "coop-cloud.${STACK_NAME}.version=2.17.1+6.9.0"
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: "mariadb:11.6"
|
image: "mariadb:12.1"
|
||||||
volumes:
|
volumes:
|
||||||
- "mariadb:/var/lib/mysql"
|
- "mariadb:/var/lib/mysql"
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
Breaking change for openid plugin: The issuer must be provided, thus the set_authentik function now includes issuer and endpoint_jwks.
|
||||||
Reference in New Issue
Block a user