Compare commits

..

4 Commits

Author SHA1 Message Date
5ee0547315 add shellscript 2022-08-04 18:29:38 +02:00
801e0a0762 chore: publish 2.1.0+24.0.0-fpm release
Some checks failed
continuous-integration/drone/push Build is failing
2022-05-18 11:12:59 +02:00
01f610d02f chore: publish 2.0.0+23.0.4-fpm release
Some checks failed
continuous-integration/drone/push Build is failing
2022-05-18 10:49:30 +02:00
12eea19cab add postgres db (#26)
Some checks failed
continuous-integration/drone/push Build is failing
This PR moves the db service into two override files `compose.mariadb.yml` and `compose.postgres.yml`.

Existing installations need to add:
```
COMPOSE_FILE="compose.yml"
COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
```
to their .env file to ensure mariadb is still used.

Co-authored-by: Philipp Rothmann <philipprothmann@posteo.de>
Reviewed-on: #26
2022-05-18 08:36:26 +00:00
3 changed files with 61 additions and 6 deletions

View File

@ -1,7 +1,7 @@
version: "3.8"
services:
web:
image: nginx:1.20.0
image: nginx:1.21.6
configs:
- source: nginx_conf
target: /etc/nginx/nginx.conf
@ -33,7 +33,7 @@ services:
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
app:
image: nextcloud:23.0.3-fpm
image: nextcloud:24.0.0-fpm
depends_on:
- db
configs:
@ -69,13 +69,13 @@ services:
failure_action: rollback
order: start-first
labels:
- "coop-cloud.${STACK_NAME}.version=2.0.0+23.0.3-fpm"
- "coop-cloud.${STACK_NAME}.version=2.1.0+24.0.0-fpm"
- "backupbot.backup=true"
- "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/"
cron:
image: nextcloud:23.0.3-fpm
image: nextcloud:24.0.0-fpm
volumes:
- nextcloud:/var/www/html/
- nextapps:/var/www/html/custom_apps:cached
@ -87,7 +87,7 @@ services:
entrypoint: /cron.sh
cache:
image: redis:6.2.5-alpine
image: redis:7.0.0-alpine
networks:
- internal
volumes:

55
configure_nextcloud.sh Executable file
View File

@ -0,0 +1,55 @@
#!/bin/bash
set -eu
app_name=$1
domain=$2
secret=$3
sub_occ(){
abra app run --user www-data $app_name app /var/www/html/occ "$@"
}
# Install apps
sub_occ app:install calendar || true
sub_occ app:install sociallogin || true
sub_occ app:install onlyoffice || true
# Disable Dashboard
sub_occ app:disable dashboard || true
# Configure SSO
sub_occ config:app:set sociallogin custom_providers --value="
{
\"custom_oidc\": [
{
\"name\": \"authentik\",
\"title\": \"Login\",
\"authorizeUrl\": \"https://$domain/application/o/authorize/\",
\"tokenUrl\": \"https://$domain/application/o/token/\",
\"displayNameClaim\": \"preferred_username\",
\"userInfoUrl\": \"https://$domain/application/o/userinfo/\",
\"logoutUrl\": \"https://$domain/application/o/nextcloud/end-session/\",
\"clientId\": \"nextcloud\",
\"clientSecret\": \"$secret\",
\"scope\": \"openid profile email nextcloud\",
\"groupsClaim\": \"nextcloud_groups\",
\"style\": \"openid\",
\"defaultGroup\": \"\",
\"groupMapping\": {
\"admin\": \"admin\"
}
}
]
}"
sub_occ config:app:set sociallogin update_profile_on_login --value 1
sub_occ config:app:set sociallogin auto_create_groups --value 1
sub_occ config:app:set sociallogin hide_default_login --value 1
sub_occ config:system:set allow_user_to_change_display_name --value=false
sub_occ config:system:set lost_password_link --value=disabled
sub_occ config:system:set social_login_auto_redirect --value=true
abra app run --user www-data $app_name app cat config/config.php

View File

@ -1,4 +1,4 @@
2.0.0 introduces a minor nextcloud update to 23.0.3 and moves the database service to a seperate override.yml file to support different database types (mariadb / postgres). This might break your installation. Please add the following snippet to your config .env to ensure the right db is used:
2.0.0 introduces a minor nextcloud update to 23.0.4 and moves the database service to a seperate override.yml file to support different database types (mariadb / postgres). This might break your installation. Please add the following snippet to your config .env to ensure the right db is used:
```
COMPOSE_FILE="compose.yml"