Compare commits

...

7 Commits

2 changed files with 42 additions and 30 deletions

20
abra.sh
View File

@ -18,12 +18,10 @@ post_install_occ(){
install_apps() {
install_apps="$@"
if [ -z "$install_apps" ]
then
if [ -z "$install_apps" ]; then
install_apps=$APPS
fi
for app in $install_apps
do
for app in $install_apps; do
run_occ "app:install $app"
done
}
@ -35,6 +33,20 @@ set_app_config(){
run_occ "config:app:set $APP $KEY --value '$VALUE'"
}
set_system_config() {
KEY=$1
VALUE=$2
run_occ "config:system:set $KEY --value '$VALUE'"
}
set_trusted_proxies() {
trusted_proxies="$@"
if [ -z "$1" ]; then
trusted_proxies="$TRUSTED_PROXIES"
fi
set_system_config trusted_proxies "$trusted_proxies"
}
install_bbb() {
install_apps bbb
set_app_config bbb app.navigation true

View File

@ -1,7 +1,7 @@
version: "3.8"
services:
web:
image: nginx:1.23.4
image: nginx:1.25.0
configs:
- source: nginx_conf
target: /etc/nginx/nginx.conf
@ -41,7 +41,7 @@ services:
start_period: 5m
app:
image: nextcloud:25.0.5-fpm
image: nextcloud:26.0.2-fpm
depends_on:
- db
configs:
@ -64,7 +64,7 @@ services:
- NEXTCLOUD_ADMIN_USER=${ADMIN_USER}
- NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/admin_password
- NEXTCLOUD_TRUSTED_DOMAINS=${DOMAIN}
- TRUSTED_PROXIES=traefik
- TRUSTED_PROXIES=10.0.0.0/8
- REDIS_HOST=cache
- OVERWRITEPROTOCOL=https
- PHP_MEMORY_LIMIT=1G
@ -86,7 +86,7 @@ services:
failure_action: rollback
order: start-first
labels:
- "coop-cloud.${STACK_NAME}.version=3.3.0+25.0.5-fpm"
- "coop-cloud.${STACK_NAME}.version=4.0.3+26.0.2-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:25.0.5-fpm
image: nextcloud:26.0.2-fpm
volumes:
- nextcloud:/var/www/html/
- nextapps:/var/www/html/custom_apps:cached
@ -110,7 +110,7 @@ services:
entrypoint: /cron.sh
cache:
image: redis:7.0.10-alpine
image: redis:7.0.11-alpine
networks:
- internal
volumes: