forked from coop-cloud/nextcloud
Compare commits
2 Commits
4.0.1+26.0
...
authentik_
Author | SHA1 | Date | |
---|---|---|---|
97be5543f9 | |||
212559c8fc |
@ -1,6 +1,4 @@
|
|||||||
TYPE=nextcloud
|
TYPE=nextcloud
|
||||||
TIMEOUT=500
|
|
||||||
ENABLE_AUTO_UPDATE=true
|
|
||||||
|
|
||||||
DOMAIN=nextcloud.example.com
|
DOMAIN=nextcloud.example.com
|
||||||
## Domain aliases
|
## Domain aliases
|
||||||
|
@ -120,7 +120,7 @@ Use [this plugin](https://github.com/pulsejet/nextcloud-oidc-login). Unlike the
|
|||||||
```
|
```
|
||||||
'oidc_login_client_id' => 'nextcloud',
|
'oidc_login_client_id' => 'nextcloud',
|
||||||
'oidc_login_client_secret' => 'mysecret',
|
'oidc_login_client_secret' => 'mysecret',
|
||||||
'oidc_login_provider_url' => 'https://example.com/realms/myrealm',
|
'oidc_login_provider_url' => 'https://example.com/auth/realms/myrealm',
|
||||||
'oidc_login_disable_registration' => false,
|
'oidc_login_disable_registration' => false,
|
||||||
'oidc_login_hide_password_form' => true,
|
'oidc_login_hide_password_form' => true,
|
||||||
'oidc_login_button_text' => 'Log in with your myssodomain',
|
'oidc_login_button_text' => 'Log in with your myssodomain',
|
||||||
|
25
abra.sh
25
abra.sh
@ -18,10 +18,12 @@ post_install_occ() {
|
|||||||
|
|
||||||
install_apps(){
|
install_apps(){
|
||||||
install_apps="$@"
|
install_apps="$@"
|
||||||
if [ -z "$install_apps" ]; then
|
if [ -z "$install_apps" ]
|
||||||
|
then
|
||||||
install_apps=$APPS
|
install_apps=$APPS
|
||||||
fi
|
fi
|
||||||
for app in $install_apps; do
|
for app in $install_apps
|
||||||
|
do
|
||||||
run_occ "app:install $app"
|
run_occ "app:install $app"
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
@ -33,20 +35,6 @@ set_app_config() {
|
|||||||
run_occ "config:app:set $APP $KEY --value '$VALUE'"
|
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_bbb(){
|
||||||
install_apps bbb
|
install_apps bbb
|
||||||
set_app_config bbb app.navigation true
|
set_app_config bbb app.navigation true
|
||||||
@ -62,7 +50,7 @@ install_onlyoffice() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
set_default_quota(){
|
set_default_quota(){
|
||||||
set_app_config files default_quota "$DEFAULT_QUOTA"
|
set_app_config files default_quota '"$DEFAULT_QUOTA"'
|
||||||
}
|
}
|
||||||
|
|
||||||
set_authentik(){
|
set_authentik(){
|
||||||
@ -87,8 +75,7 @@ set_authentik() {
|
|||||||
\"style\":\"openid\",
|
\"style\":\"openid\",
|
||||||
\"defaultGroup\":\"\",
|
\"defaultGroup\":\"\",
|
||||||
\"groupMapping\": {
|
\"groupMapping\": {
|
||||||
\"admin\": \"admin\",
|
\"admin\": \"admin\"
|
||||||
\"authentik Admins\": \"admin\"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
13
compose.yml
13
compose.yml
@ -1,7 +1,7 @@
|
|||||||
version: "3.8"
|
version: "3.8"
|
||||||
services:
|
services:
|
||||||
web:
|
web:
|
||||||
image: nginx:1.24.0
|
image: nginx:1.23.3
|
||||||
configs:
|
configs:
|
||||||
- source: nginx_conf
|
- source: nginx_conf
|
||||||
target: /etc/nginx/nginx.conf
|
target: /etc/nginx/nginx.conf
|
||||||
@ -41,7 +41,7 @@ services:
|
|||||||
start_period: 5m
|
start_period: 5m
|
||||||
|
|
||||||
app:
|
app:
|
||||||
image: nextcloud:26.0.1-fpm
|
image: nextcloud:25.0.4-fpm
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
configs:
|
configs:
|
||||||
@ -64,7 +64,7 @@ services:
|
|||||||
- NEXTCLOUD_ADMIN_USER=${ADMIN_USER}
|
- NEXTCLOUD_ADMIN_USER=${ADMIN_USER}
|
||||||
- NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/admin_password
|
- NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/admin_password
|
||||||
- NEXTCLOUD_TRUSTED_DOMAINS=${DOMAIN}
|
- NEXTCLOUD_TRUSTED_DOMAINS=${DOMAIN}
|
||||||
- TRUSTED_PROXIES=10.0.0.0/8
|
- TRUSTED_PROXIES=traefik
|
||||||
- REDIS_HOST=cache
|
- REDIS_HOST=cache
|
||||||
- OVERWRITEPROTOCOL=https
|
- OVERWRITEPROTOCOL=https
|
||||||
- PHP_MEMORY_LIMIT=1G
|
- PHP_MEMORY_LIMIT=1G
|
||||||
@ -86,8 +86,7 @@ services:
|
|||||||
failure_action: rollback
|
failure_action: rollback
|
||||||
order: start-first
|
order: start-first
|
||||||
labels:
|
labels:
|
||||||
- "coop-cloud.${STACK_NAME}.version=4.0.1+26.0.1-fpm"
|
- "coop-cloud.${STACK_NAME}.version=3.1.2+25.0.4-fpm"
|
||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
|
||||||
- "backupbot.backup=true"
|
- "backupbot.backup=true"
|
||||||
- "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/"
|
- "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
@ -98,7 +97,7 @@ services:
|
|||||||
start_period: 5m
|
start_period: 5m
|
||||||
|
|
||||||
cron:
|
cron:
|
||||||
image: nextcloud:26.0.1-fpm
|
image: nextcloud:25.0.4-fpm
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html/
|
- nextcloud:/var/www/html/
|
||||||
- nextapps:/var/www/html/custom_apps:cached
|
- nextapps:/var/www/html/custom_apps:cached
|
||||||
@ -110,7 +109,7 @@ services:
|
|||||||
entrypoint: /cron.sh
|
entrypoint: /cron.sh
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
image: redis:7.0.11-alpine
|
image: redis:7.0.9-alpine
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
If the authentik configuration should be handled by abra add the following to the env:
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
And run:
|
|
||||||
|
|
||||||
abra app cmd <app-name> app set_authentik
|
|
Reference in New Issue
Block a user