forked from coop-cloud/nextcloud
Compare commits
4 Commits
5.0.0+27.0
...
5.0.1+27.0
Author | SHA1 | Date | |
---|---|---|---|
3a8c203b51 | |||
634a3553b9 | |||
24e9571ba1 | |||
6546a05cf9 |
12
.env.sample
12
.env.sample
@ -21,10 +21,10 @@ EXTRA_VOLUME=/dev/null:/tmp/.dummy
|
||||
|
||||
PHP_MEMORY_LIMIT=1G
|
||||
# fpm-tune, see: https://spot13.com/pmcalculator/
|
||||
FPM_MAX_CHILDREN=131
|
||||
FPM_START_SERVERS=32
|
||||
FPM_MIN_SPARE_SERVERS=32
|
||||
FPM_MAX_SPARE_SERVERS=98
|
||||
FPM_MAX_CHILDREN=16
|
||||
FPM_START_SERVERS=4
|
||||
FPM_MIN_SPARE_SERVERS=4
|
||||
FPM_MAX_SPARE_SERVERS=12
|
||||
|
||||
DEFAULT_QUOTA="10 GB"
|
||||
|
||||
@ -58,5 +58,5 @@ DEFAULT_QUOTA="10 GB"
|
||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.authentik.yml"
|
||||
# AUTHENTIK_USER_PREFIX=authentik
|
||||
# AUTHENTIK_DOMAIN=authentik.example.com
|
||||
# AUTHENTIK_SECRET_NAME=authentik_example_com_nextcloud_secret_v1 # the same as in authentik
|
||||
# AUTHENTIK_ID_NAME=authentik_example_com_nextcloud_id_v1 # the same as in authentik
|
||||
# SECRET_AUTHENTIK_SECRET_VERSION=v1
|
||||
# SECRET_AUTHENTIK_ID_VERSION=v1
|
||||
|
1
abra.sh
1
abra.sh
@ -24,7 +24,6 @@ install_apps() {
|
||||
for app in $install_apps; do
|
||||
run_occ "app:install $app"
|
||||
done
|
||||
exit 0 # fails when app's already installed
|
||||
}
|
||||
|
||||
set_app_config() {
|
||||
|
@ -8,7 +8,7 @@ services:
|
||||
secrets:
|
||||
authentik_secret:
|
||||
external: true
|
||||
name: ${AUTHENTIK_SECRET_NAME}
|
||||
name: ${STACK_NAME}_authentik_secret_${SECRET_AUTHENTIK_SECRET_VERSION}
|
||||
authentik_id:
|
||||
external: true
|
||||
name: ${AUTHENTIK_ID_NAME}
|
||||
name: ${STACK_NAME}_authentik_id_${SECRET_AUTHENTIK_ID_VERSION}
|
||||
|
@ -41,7 +41,7 @@ services:
|
||||
start_period: 5m
|
||||
|
||||
app:
|
||||
image: nextcloud:27.0.0-fpm
|
||||
image: nextcloud:27.0.1-fpm
|
||||
depends_on:
|
||||
- db
|
||||
configs:
|
||||
@ -86,7 +86,7 @@ services:
|
||||
failure_action: rollback
|
||||
order: start-first
|
||||
labels:
|
||||
- "coop-cloud.${STACK_NAME}.version=5.0.0+27.0.0-fpm"
|
||||
- "coop-cloud.${STACK_NAME}.version=5.0.1+27.0.1-fpm"
|
||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||
- "backupbot.backup=true"
|
||||
- "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/"
|
||||
@ -98,7 +98,7 @@ services:
|
||||
start_period: 5m
|
||||
|
||||
cron:
|
||||
image: nextcloud:27.0.0-fpm
|
||||
image: nextcloud:27.0.1-fpm
|
||||
volumes:
|
||||
- nextcloud:/var/www/html/
|
||||
- nextapps:/var/www/html/custom_apps:cached
|
||||
|
1
release/next
Normal file
1
release/next
Normal file
@ -0,0 +1 @@
|
||||
The authentik secrets need to be inserted again, as nextcloud is not sharing the secret with authentik any more.
|
Reference in New Issue
Block a user