forked from coop-cloud/nextcloud
Compare commits
60 Commits
e996b5c057
...
b58b00d679
Author | SHA1 | Date |
---|---|---|
3wc | b58b00d679 | |
3wc | e0b09908d9 | |
Philipp Rothmann | 47565b5e2b | |
Moritz | 571d9feb56 | |
Moritz | 5803a2356f | |
Philipp Rothmann | d94a750958 | |
Philipp Rothmann | c3a4826636 | |
Philipp Rothmann | e80e58433c | |
Philipp Rothmann | 8de526606f | |
Philipp Rothmann | 5f592e299e | |
Philipp Rothmann | 183becfd87 | |
Philipp Rothmann | 4714122197 | |
Philipp Rothmann | 41b7868713 | |
Philipp Rothmann | e33f1c12ae | |
Philipp Rothmann | abac635267 | |
3wc | 06cf73d438 | |
KawaiiPunk | 088f9ff9e5 | |
Philipp Rothmann | 09e60aaa49 | |
Philipp Rothmann | bdcdbf5e41 | |
Philipp Rothmann | 8fdad4c913 | |
3wc | af18ec0637 | |
3wc | 83a45a477c | |
Moritz | 90728de1ea | |
Moritz | f77ab17a69 | |
Moritz | a4d32b5b90 | |
3wc | 77997c00a4 | |
Moritz | 2e9098c9ba | |
Moritz | 9955dce2a8 | |
Moritz | 5ccda65459 | |
Moritz | e62e8dea6d | |
Moritz | 36037c4475 | |
3wc | d19cb857ba | |
3wc | a9e8b2e2bd | |
3wc | 70c441ea70 | |
Moritz | 8673aadbf3 | |
Moritz | ca19cf5732 | |
Moritz | 002531ea84 | |
Moritz | cc89f448f2 | |
3wc | e3e66cb732 | |
moritz | b08bb5903f | |
Moritz | 92bc8b0b68 | |
Philipp Rothmann | b863452e9d | |
Philipp Rothmann | af7bbe23d6 | |
Philipp Rothmann | 968552ea4c | |
Philipp Rothmann | 6185853ad3 | |
Philipp Rothmann | 61e63f403b | |
Moritz | 69fa1b9aed | |
Moritz | 1fd97150f7 | |
Moritz | e19504af56 | |
Philipp Rothmann | 94558d4055 | |
3wc | 54bb36a111 | |
decentral1se | e5aafdae8b | |
3wc | 2c8df2ad17 | |
Philipp Rothmann | 95b902f7ab | |
Moritz | 8a3283e398 | |
3wc | aef52ab967 | |
3wc | 17c3cb6ac0 | |
Moritz | 827cb16964 | |
Moritz | 992992d678 | |
Moritz | 20f0a45baf |
26
.drone.yml
26
.drone.yml
|
@ -3,7 +3,7 @@ kind: pipeline
|
||||||
name: deploy to swarm-test.autonomic.zone
|
name: deploy to swarm-test.autonomic.zone
|
||||||
steps:
|
steps:
|
||||||
- name: deployment
|
- name: deployment
|
||||||
image: decentral1se/stack-ssh-deploy:latest
|
image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
|
||||||
settings:
|
settings:
|
||||||
host: swarm-test.autonomic.zone
|
host: swarm-test.autonomic.zone
|
||||||
stack: nextcloud
|
stack: nextcloud
|
||||||
|
@ -11,15 +11,39 @@ steps:
|
||||||
purge: true
|
purge: true
|
||||||
deploy_key:
|
deploy_key:
|
||||||
from_secret: drone_ssh_swarm_test
|
from_secret: drone_ssh_swarm_test
|
||||||
|
networks:
|
||||||
|
- proxy
|
||||||
environment:
|
environment:
|
||||||
DOMAIN: nextcloud.swarm-test.autonomic.zone
|
DOMAIN: nextcloud.swarm-test.autonomic.zone
|
||||||
STACK_NAME: nextcloud
|
STACK_NAME: nextcloud
|
||||||
LETS_ENCRYPT_ENV: production
|
LETS_ENCRYPT_ENV: production
|
||||||
ADMIN_USER: foobar
|
ADMIN_USER: foobar
|
||||||
|
FPM_TUNE_VERSION: v1
|
||||||
|
NGINX_CONF_VERSION: v1
|
||||||
|
MY_CNF_VERSION: v1
|
||||||
|
ENTRYPOINT_VERSION: v1
|
||||||
SECRET_DB_PASSWORD_VERSION: v1
|
SECRET_DB_PASSWORD_VERSION: v1
|
||||||
SECRET_DB_ROOT_PASSWORD_VERSION: v1
|
SECRET_DB_ROOT_PASSWORD_VERSION: v1
|
||||||
SECRET_ADMIN_PASSWORD_VERSION: v1
|
SECRET_ADMIN_PASSWORD_VERSION: v1
|
||||||
|
SECRET_ONLYOFFICE_JWT_VERSION: v1
|
||||||
|
SECRET_BBB_SECRET_VERSION: v1
|
||||||
EXTRA_VOLUME: "/dev/null:/tmp/.dummy"
|
EXTRA_VOLUME: "/dev/null:/tmp/.dummy"
|
||||||
trigger:
|
trigger:
|
||||||
branch:
|
branch:
|
||||||
- main
|
- main
|
||||||
|
---
|
||||||
|
kind: pipeline
|
||||||
|
name: generate recipe catalogue
|
||||||
|
steps:
|
||||||
|
- name: release a new version
|
||||||
|
image: plugins/downstream
|
||||||
|
settings:
|
||||||
|
server: https://build.coopcloud.tech
|
||||||
|
token:
|
||||||
|
from_secret: drone_abra-bot_token
|
||||||
|
fork: true
|
||||||
|
repositories:
|
||||||
|
- coop-cloud/auto-recipes-catalogue-json
|
||||||
|
|
||||||
|
trigger:
|
||||||
|
event: tag
|
||||||
|
|
43
.env.sample
43
.env.sample
|
@ -1,6 +1,8 @@
|
||||||
TYPE=nextcloud
|
TYPE=nextcloud
|
||||||
|
TIMEOUT=500
|
||||||
|
ENABLE_AUTO_UPDATE=true
|
||||||
|
|
||||||
DOMAIN={{ .Domain }}
|
DOMAIN=nextcloud.example.com
|
||||||
## Domain aliases
|
## Domain aliases
|
||||||
#EXTRA_DOMAINS=', `www.nextcloud.example.com`'
|
#EXTRA_DOMAINS=', `www.nextcloud.example.com`'
|
||||||
LETS_ENCRYPT_ENV=production
|
LETS_ENCRYPT_ENV=production
|
||||||
|
@ -17,5 +19,44 @@ SECRET_ADMIN_PASSWORD_VERSION=v1
|
||||||
|
|
||||||
EXTRA_VOLUME=/dev/null:/tmp/.dummy
|
EXTRA_VOLUME=/dev/null:/tmp/.dummy
|
||||||
|
|
||||||
|
PHP_MEMORY_LIMIT=1G
|
||||||
|
# fpm-tune, see: https://spot13.com/pmcalculator/
|
||||||
|
FPM_MAX_CHILDREN=16
|
||||||
|
FPM_START_SERVERS=4
|
||||||
|
FPM_MIN_SPARE_SERVERS=4
|
||||||
|
FPM_MAX_SPARE_SERVERS=12
|
||||||
|
|
||||||
|
DEFAULT_QUOTA="10 GB"
|
||||||
|
|
||||||
# X_FRAME_OPTIONS_ENABLED=1
|
# X_FRAME_OPTIONS_ENABLED=1
|
||||||
# X_FRAME_OPTIONS_ALLOW_FROM=embedding-site.example.org
|
# X_FRAME_OPTIONS_ALLOW_FROM=embedding-site.example.org
|
||||||
|
|
||||||
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
|
||||||
|
# See https://github.com/nextcloud/docker#auto-configuration-via-environment-variables for default values
|
||||||
|
# SMTP_AUTHTYPE=
|
||||||
|
# SMTP_HOST=
|
||||||
|
# SMTP_SECURE=
|
||||||
|
# SMTP_NAME=
|
||||||
|
# SMTP_PORT=
|
||||||
|
# MAIL_FROM_ADDRESS=
|
||||||
|
# MAIL_DOMAIN=
|
||||||
|
# SECRET_SMTP_PASSWORD_VERSION=v1
|
||||||
|
|
||||||
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yml"
|
||||||
|
# APPS="calendar sociallogin onlyoffice"
|
||||||
|
#
|
||||||
|
# ONLYOFFICE_URL=https://onlyoffice.example.com
|
||||||
|
# SECRET_ONLYOFFICE_JWT_VERSION=v1
|
||||||
|
#
|
||||||
|
# BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash!
|
||||||
|
# SECRET_BBB_SECRET_VERSION=v1
|
||||||
|
#
|
||||||
|
# OCC_CMDS="app:disable dashboard"
|
||||||
|
# OCC_CMDS="$OCC_CMDS|config:app:set sociallogin auto_create_groups --value 1"
|
||||||
|
# OCC_CMDS="$OCC_CMDS|config:app:set sociallogin hide_default_login --value 1"
|
||||||
|
|
||||||
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.authentik.yml"
|
||||||
|
# AUTHENTIK_USER_PREFIX=authentik
|
||||||
|
# AUTHENTIK_DOMAIN=authentik.example.com
|
||||||
|
# SECRET_AUTHENTIK_SECRET_VERSION=v1
|
||||||
|
# SECRET_AUTHENTIK_ID_VERSION=v1
|
||||||
|
|
84
README.md
84
README.md
|
@ -15,29 +15,83 @@ Fully automated luxury Nextcloud via docker-swarm.
|
||||||
* **SSO**: 1 (OAuth)
|
* **SSO**: 1 (OAuth)
|
||||||
<!-- endmetadata -->
|
<!-- endmetadata -->
|
||||||
|
|
||||||
## Basic usage
|
## Quick start
|
||||||
|
|
||||||
1. Set up Docker Swarm and [`abra`]
|
|
||||||
2. Deploy [`coop-cloud/traefik`]
|
|
||||||
3. `abra app new nextcloud --secrets` (optionally with `--pass` if you'd like
|
|
||||||
to save secrets in `pass`)
|
|
||||||
4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to
|
|
||||||
your Docker swarm box
|
|
||||||
5. `abra app YOURAPPDOMAIN deploy`
|
|
||||||
|
|
||||||
## How do I customise the default home page when logging in?
|
* `abra app new nextcloud`
|
||||||
|
* `abra app config <app-name>`
|
||||||
|
* `abra app secret insert <app-name> smtp_password v1 <SMTP_PASSWORD>`
|
||||||
|
* `abra app secret generate -a <app-name>`
|
||||||
|
* `abra app deploy <app-name>`
|
||||||
|
|
||||||
- Delete the dashboard app since it is so corporate
|
### Onlyoffice Integration
|
||||||
- Follow [these docs](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/default_files_configuration.html) to set the default files list for each user in the Files app
|
|
||||||
- Configure a `defaultapp` in your `config.php` or use [apporder](https://apps.nextcloud.com/apps/apporder)
|
`abra app config <app-name>`
|
||||||
|
Configure the following envs:
|
||||||
|
```
|
||||||
|
COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yml"
|
||||||
|
ONLYOFFICE_URL=https://onlyoffice.example.com
|
||||||
|
SECRET_ONLYOFFICE_JWT_VERSION=v1
|
||||||
|
```
|
||||||
|
|
||||||
|
`abra app secret insert <app-name> onlyoffice_jwt v1 <jwt_secret>`
|
||||||
|
`abra app cmd <app-name> app install_onlyoffice`
|
||||||
|
|
||||||
|
### BBB Integration
|
||||||
|
|
||||||
|
`abra app config <app-name>`
|
||||||
|
Configure the following envs:
|
||||||
|
```
|
||||||
|
COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yml"
|
||||||
|
BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash!
|
||||||
|
SECRET_BBB_SECRET_VERSION=v1
|
||||||
|
```
|
||||||
|
|
||||||
|
`abra app secret insert <app-name> bbb_secret v1 <bbb_secret>`
|
||||||
|
`abra app cmd <app-name> app install_bbb`
|
||||||
|
|
||||||
|
### Authentik Integration
|
||||||
|
|
||||||
|
|
||||||
|
`abra app config <app-name>`
|
||||||
|
Configure the following envs:
|
||||||
|
```
|
||||||
|
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
|
||||||
|
```
|
||||||
|
|
||||||
|
`abra app cmd <app-name> app set_authentik`
|
||||||
|
|
||||||
|
### Disable Dashboard
|
||||||
|
|
||||||
|
Disable dashboard app since it is so corporate:
|
||||||
|
|
||||||
|
`abra app config <app-name>`
|
||||||
|
Configure the following envs:
|
||||||
|
```
|
||||||
|
OCC_CMDS="app:disable dashboard"
|
||||||
|
```
|
||||||
|
`abra app cmd <app-name> app post_install_occ`
|
||||||
|
|
||||||
## Running `occ`
|
## Running `occ`
|
||||||
|
|
||||||
`abra app run --user www-data YOURAPPDOMAIN app occ user:list --help`
|
`abra app cmd <app-name> app run_occ '"user:list --help"'`
|
||||||
|
|
||||||
|
## Default user files
|
||||||
|
|
||||||
|
- Follow [these docs](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/default_files_configuration.html) to set the default files list for each user in the Files app
|
||||||
|
|
||||||
|
## Default App
|
||||||
|
|
||||||
|
- Configure a `defaultapp` in your `config.php` or use [apporder](https://apps.nextcloud.com/apps/apporder)
|
||||||
|
|
||||||
## Upgrading Nextcloud apps
|
## Upgrading Nextcloud apps
|
||||||
|
|
||||||
`abra app run --user www-data YOURAPPDOMAIN app occ app:update --all`
|
`abra app cmd <app-name> app run_occ '"app:update --all"'`
|
||||||
|
|
||||||
|
|
||||||
## How do I fix a Nextcloud version snafu?
|
## How do I fix a Nextcloud version snafu?
|
||||||
|
|
||||||
|
@ -66,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/auth/realms/myrealm',
|
'oidc_login_provider_url' => 'https://example.com/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',
|
||||||
|
|
193
abra.sh
193
abra.sh
|
@ -1,106 +1,107 @@
|
||||||
export FPM_TUNE_VERSION=v4
|
#!/bin/bash
|
||||||
|
|
||||||
|
export FPM_TUNE_VERSION=v5
|
||||||
export NGINX_CONF_VERSION=v4
|
export NGINX_CONF_VERSION=v4
|
||||||
export MY_CNF_VERSION=v4
|
export MY_CNF_VERSION=v4
|
||||||
export ENTRYPOINT_VERSION=v2
|
export ENTRYPOINT_VERSION=v3
|
||||||
|
|
||||||
NC_APP_DIR="app:/var/www/html"
|
run_occ() {
|
||||||
|
su -p www-data -s /bin/sh -c "/var/www/html/occ $@"
|
||||||
sub_occ(){
|
|
||||||
# shellcheck disable=SC2034
|
|
||||||
abra__service_="app"
|
|
||||||
# shellcheck disable=SC2034
|
|
||||||
abra___user="www-data"
|
|
||||||
sub_app_run php /var/www/html/occ "$@"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_backup_app() {
|
post_install_occ() {
|
||||||
# Copied _abra_backup_dir to make UX better on restore and backup
|
IFS='|' read -ra CMD <<<"$OCC_CMDS"
|
||||||
|
for cmd in "${CMD[@]}"; do
|
||||||
|
run_occ "$cmd"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
install_apps() {
|
||||||
|
install_apps="$@"
|
||||||
|
if [ -z "$install_apps" ]; then
|
||||||
|
install_apps=$APPS
|
||||||
|
fi
|
||||||
|
for app in $install_apps; do
|
||||||
|
run_occ "app:install $app"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
set_app_config() {
|
||||||
|
APP=$1
|
||||||
|
KEY=$2
|
||||||
|
VALUE=$3
|
||||||
|
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"
|
||||||
|
}
|
||||||
|
|
||||||
|
set_logfile_stdout() {
|
||||||
|
set_system_config logfile '/dev/stdout'
|
||||||
|
}
|
||||||
|
|
||||||
|
install_bbb() {
|
||||||
|
install_apps bbb
|
||||||
|
set_app_config bbb app.navigation true
|
||||||
|
set_app_config bbb api.url "$BBB_URL"
|
||||||
|
set_app_config bbb api.secret "$(cat /run/secrets/bbb_secret)"
|
||||||
|
}
|
||||||
|
|
||||||
|
install_onlyoffice() {
|
||||||
|
install_apps onlyoffice
|
||||||
|
set_app_config onlyoffice DocumentServerUrl "$ONLYOFFICE_URL"
|
||||||
|
set_app_config onlyoffice jwt_secret "$(cat /run/secrets/onlyoffice_jwt)"
|
||||||
|
set_app_config onlyoffice customizationForcesave true
|
||||||
|
}
|
||||||
|
|
||||||
|
set_default_quota() {
|
||||||
|
set_app_config files default_quota "$DEFAULT_QUOTA"
|
||||||
|
}
|
||||||
|
|
||||||
|
set_authentik() {
|
||||||
|
install_apps sociallogin
|
||||||
|
AUTHENTIK_SECRET=$(cat /run/secrets/authentik_secret)
|
||||||
|
AUTHENTIK_ID=$(cat /run/secrets/authentik_id)
|
||||||
|
set_app_config sociallogin custom_providers "
|
||||||
{
|
{
|
||||||
abra__src_="$1"
|
\"custom_oidc\":[
|
||||||
abra__dst_="-"
|
|
||||||
}
|
|
||||||
|
|
||||||
# shellcheck disable=SC2154
|
|
||||||
FILENAME="$(basename "$1").tar"
|
|
||||||
|
|
||||||
debug "Copying '$1' to '$FILENAME'"
|
|
||||||
|
|
||||||
silence
|
|
||||||
mkdir -p /tmp/abra
|
|
||||||
sub_app_cp > /tmp/abra/$FILENAME
|
|
||||||
unsilence
|
|
||||||
}
|
|
||||||
|
|
||||||
next_maintenance_on() {
|
|
||||||
silence
|
|
||||||
sub_occ maintenance:mode --on > /dev/null
|
|
||||||
unsilence
|
|
||||||
debug "Nextcloud maintenance mode enabled"
|
|
||||||
}
|
|
||||||
|
|
||||||
next_maintenance_off() {
|
|
||||||
silence
|
|
||||||
sub_occ maintenance:mode --off > /dev/null
|
|
||||||
unsilence
|
|
||||||
debug "Nextcloud maintenance mode disabled"
|
|
||||||
}
|
|
||||||
|
|
||||||
abra_backup_app() {
|
|
||||||
# shellcheck disable=SC2154
|
|
||||||
ARK_FILENAME="$ABRA_BACKUP_DIR/${abra__app_}_app_$(date +%F).tar.gz"
|
|
||||||
# Cant be FILENAME as that gets changed by something
|
|
||||||
next_maintenance_on
|
|
||||||
_backup_app $NC_APP_DIR/config
|
|
||||||
_backup_app $NC_APP_DIR/data
|
|
||||||
_backup_app $NC_APP_DIR/themes
|
|
||||||
# Combine archives
|
|
||||||
tar -Af /tmp/abra/config.tar /tmp/abra/data.tar
|
|
||||||
tar -Af /tmp/abra/config.tar /tmp/abra/themes.tar
|
|
||||||
gzip /tmp/abra/config.tar -c > "$ARK_FILENAME"
|
|
||||||
rm /tmp/abra/*.tar
|
|
||||||
success "Backed up 'app' to $ARK_FILENAME"
|
|
||||||
next_maintenance_off
|
|
||||||
}
|
|
||||||
|
|
||||||
abra_backup_db() {
|
|
||||||
next_maintenance_on
|
|
||||||
_abra_backup_mysql "db" "nextcloud"
|
|
||||||
next_maintenance_off
|
|
||||||
}
|
|
||||||
|
|
||||||
abra_backup() {
|
|
||||||
abra_backup_app && abra_backup_db
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
abra_restore_app() {
|
|
||||||
next_maintenance_on
|
|
||||||
# shellcheck disable=SC2034
|
|
||||||
{
|
{
|
||||||
abra__src_="-"
|
\"name\":\"$AUTHENTIK_USER_PREFIX\",
|
||||||
abra__dst_=$NC_APP_DIR
|
\"title\":\"authentik\",
|
||||||
|
\"authorizeUrl\": \"https://$AUTHENTIK_DOMAIN/application/o/authorize/\",
|
||||||
|
\"tokenUrl\": \"https://$AUTHENTIK_DOMAIN/application/o/token/\",
|
||||||
|
\"displayNameClaim\":\"preferred_username\",
|
||||||
|
\"userInfoUrl\": \"https://$AUTHENTIK_DOMAIN/application/o/userinfo/\",
|
||||||
|
\"logoutUrl\": \"https://$AUTHENTIK_DOMAIN/if/session-end/nextcloud/\",
|
||||||
|
\"clientId\":\"$AUTHENTIK_ID\",
|
||||||
|
\"clientSecret\":\"$AUTHENTIK_SECRET\",
|
||||||
|
\"scope\":\"openid profile email nextcloud\",
|
||||||
|
\"groupsClaim\":\"nextcloud_groups\",
|
||||||
|
\"style\":\"openid\",
|
||||||
|
\"defaultGroup\":\"\",
|
||||||
|
\"groupMapping\": {
|
||||||
|
\"admin\": \"admin\",
|
||||||
|
\"authentik Admins\": \"admin\"
|
||||||
}
|
}
|
||||||
|
|
||||||
zcat "$@" | sub_app_cp
|
|
||||||
|
|
||||||
next_maintenance_off
|
|
||||||
sub_occ files:scan --all > /dev/null # Needs to be run in normal mode
|
|
||||||
success "Restored 'app'"
|
|
||||||
}
|
}
|
||||||
|
]
|
||||||
|
}"
|
||||||
|
|
||||||
# abra_restore_db() {
|
set_app_config sociallogin update_profile_on_login 1
|
||||||
# warning "Restoring the database is on a existing app and not a new one has not been tested. Use with caution."
|
set_app_config sociallogin auto_create_groups 1
|
||||||
# next_maintenance_on
|
set_app_config sociallogin hide_default_login 1
|
||||||
# # 3wc: unlike abra_backup_db, we can assume abra__service_ will be 'db' if we
|
run_occ 'config:system:set social_login_auto_redirect --value true'
|
||||||
# # got this far..
|
run_occ 'config:system:set allow_user_to_change_display_name --value=false'
|
||||||
|
run_occ 'config:system:set lost_password_link --value=disabled'
|
||||||
# # shellcheck disable=SC2034
|
}
|
||||||
# abra___no_tty="true"
|
|
||||||
|
|
||||||
# DB_PASSWORD=$(sub_app_run cat /run/secrets/db_password)
|
|
||||||
|
|
||||||
# zcat "$@" | sub_app_run mysql -u root -p"$DB_PASSWORD" wordpress
|
|
||||||
|
|
||||||
# success "Restored 'db'"
|
|
||||||
# next_maintenance_off
|
|
||||||
# }
|
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
version: "3.8"
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
secrets:
|
||||||
|
- onlyoffice_jwt
|
||||||
|
- bbb_secret
|
||||||
|
environment:
|
||||||
|
- APPS
|
||||||
|
- ONLYOFFICE_URL
|
||||||
|
- BBB_URL
|
||||||
|
|
||||||
|
secrets:
|
||||||
|
onlyoffice_jwt:
|
||||||
|
external: true
|
||||||
|
name: ${STACK_NAME}_onlyoffice_jwt_${SECRET_ONLYOFFICE_JWT_VERSION}
|
||||||
|
bbb_secret:
|
||||||
|
external: true
|
||||||
|
name: ${STACK_NAME}_bbb_secret_${SECRET_BBB_SECRET_VERSION}
|
|
@ -0,0 +1,14 @@
|
||||||
|
version: "3.8"
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
secrets:
|
||||||
|
- authentik_secret
|
||||||
|
- authentik_id
|
||||||
|
|
||||||
|
secrets:
|
||||||
|
authentik_secret:
|
||||||
|
external: true
|
||||||
|
name: ${STACK_NAME}_authentik_secret_${SECRET_AUTHENTIK_SECRET_VERSION}
|
||||||
|
authentik_id:
|
||||||
|
external: true
|
||||||
|
name: ${STACK_NAME}_authentik_id_${SECRET_AUTHENTIK_ID_VERSION}
|
|
@ -28,9 +28,15 @@ services:
|
||||||
deploy:
|
deploy:
|
||||||
labels:
|
labels:
|
||||||
backupbot.backup: "true"
|
backupbot.backup: "true"
|
||||||
backupbot.backup.pre-hook: 'mkdir -p /tmp/backup/ && mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" nextcloud > /tmp/backup/backup.sql'
|
backupbot.backup.pre-hook: 'mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" nextcloud > /var/lib/mysql/backup.sql'
|
||||||
backupbot.backup.post-hook: "rm -rf /tmp/backup"
|
backupbot.backup.post-hook: "rm -rf /var/lib/mysql/backup.sql"
|
||||||
backupbot.backup.path: "/tmp/backup/"
|
backupbot.backup.path: "/var/lib/mysql/backup.sql"
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", 'mysqladmin -p"$$(cat /run/secrets/db_root_password)" ping']
|
||||||
|
interval: 30s
|
||||||
|
timeout: 10s
|
||||||
|
retries: 10
|
||||||
|
start_period: 1m
|
||||||
configs:
|
configs:
|
||||||
my_tune:
|
my_tune:
|
||||||
name: ${STACK_NAME}_my_cnf_${MY_CNF_VERSION}
|
name: ${STACK_NAME}_my_cnf_${MY_CNF_VERSION}
|
||||||
|
|
|
@ -22,16 +22,16 @@ services:
|
||||||
secrets:
|
secrets:
|
||||||
- db_password
|
- db_password
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "pg_isready"]
|
test: ["CMD-SHELL", "pg_isready", "-U", "nextcloud"]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 5
|
retries: 5
|
||||||
deploy:
|
deploy:
|
||||||
labels:
|
labels:
|
||||||
backupbot.backup: "true"
|
backupbot.backup: "true"
|
||||||
backupbot.backup.pre-hook: "mkdir -p /tmp/backup/ && PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /tmp/backup/backup.sql"
|
backupbot.backup.pre-hook: "PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /var/lib/postgresql/data/backup.sql"
|
||||||
backupbot.backup.post-hook: "rm -rf /tmp/backup"
|
backupbot.backup.post-hook: "rm -rf /var/lib/postgresql/data/backup.sql"
|
||||||
backupbot.backup.path: "/tmp/backup/"
|
backupbot.backup.path: "/var/lib/postgresql/data/"
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
postgres:
|
postgres:
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
version: "3.8"
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
secrets:
|
||||||
|
- smtp_password
|
||||||
|
environment:
|
||||||
|
- SMTP_AUTHTYPE
|
||||||
|
- SMTP_HOST
|
||||||
|
- SMTP_SECURE
|
||||||
|
- SMTP_NAME
|
||||||
|
- SMTP_PORT
|
||||||
|
- SMTP_PASSWORD_FILE=/run/secrets/smtp_password
|
||||||
|
- MAIL_FROM_ADDRESS
|
||||||
|
- MAIL_DOMAIN
|
||||||
|
|
||||||
|
secrets:
|
||||||
|
smtp_password:
|
||||||
|
external: true
|
||||||
|
name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
|
48
compose.yml
48
compose.yml
|
@ -1,7 +1,7 @@
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
services:
|
services:
|
||||||
web:
|
web:
|
||||||
image: nginx:1.23.1
|
image: nginx:1.25.1
|
||||||
configs:
|
configs:
|
||||||
- source: nginx_conf
|
- source: nginx_conf
|
||||||
target: /etc/nginx/nginx.conf
|
target: /etc/nginx/nginx.conf
|
||||||
|
@ -33,14 +33,20 @@ services:
|
||||||
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", 'curl -s -N curl -Ns localhost/status.php | grep "installed\":true"']
|
||||||
|
interval: 30s
|
||||||
|
timeout: 10s
|
||||||
|
retries: 10
|
||||||
|
start_period: 5m
|
||||||
|
|
||||||
app:
|
app:
|
||||||
image: nextcloud:24.0.6-fpm
|
image: nextcloud:27.0.1-fpm
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
configs:
|
configs:
|
||||||
- source: fpm_tune
|
- source: fpm_tune
|
||||||
target: /usr/local/etc/php-fpm.d/fpm-tune.conf
|
target: /usr/local/etc/php-fpm.d/zzz-fpm-tune.conf
|
||||||
- source: entrypoint
|
- source: entrypoint
|
||||||
target: /custom-entrypoint.sh
|
target: /custom-entrypoint.sh
|
||||||
mode: 555
|
mode: 555
|
||||||
|
@ -49,6 +55,8 @@ services:
|
||||||
- db_password
|
- db_password
|
||||||
- admin_password
|
- admin_password
|
||||||
environment:
|
environment:
|
||||||
|
- APPS
|
||||||
|
- OCC_CMDS
|
||||||
- X_FRAME_OPTIONS_ALLOW_FROM
|
- X_FRAME_OPTIONS_ALLOW_FROM
|
||||||
- X_FRAME_OPTIONS_ENABLED
|
- X_FRAME_OPTIONS_ENABLED
|
||||||
- DOMAIN
|
- DOMAIN
|
||||||
|
@ -56,14 +64,15 @@ 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=traefik
|
- TRUSTED_PROXIES=10.0.0.0/8
|
||||||
- REDIS_HOST=cache
|
- REDIS_HOST=cache
|
||||||
- SMTP_HOST
|
|
||||||
- MAIL_FROM_ADDRESS
|
|
||||||
- MAIL_DOMAIN
|
|
||||||
- SMTP_AUTHTYPE=PLAIN
|
|
||||||
- OVERWRITEPROTOCOL=https
|
- OVERWRITEPROTOCOL=https
|
||||||
- PHP_MEMORY_LIMIT=1G
|
- PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT:-1G}
|
||||||
|
- FPM_MAX_CHILDREN=${FPM_MAX_CHILDREN:-131}
|
||||||
|
- FPM_START_SERVERS=${FPM_START_SERVERS:-32}
|
||||||
|
- FPM_MIN_SPARE_SERVERS=${FPM_MIN_SPARE_SERVERS:-32}
|
||||||
|
- FPM_MAX_SPARE_SERVERS=${FPM_MAX_SPARE_SERVERS:-98}
|
||||||
|
- DEFAULT_QUOTA
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html/
|
- nextcloud:/var/www/html/
|
||||||
- nextapps:/var/www/html/custom_apps:cached
|
- nextapps:/var/www/html/custom_apps:cached
|
||||||
|
@ -77,12 +86,19 @@ services:
|
||||||
failure_action: rollback
|
failure_action: rollback
|
||||||
order: start-first
|
order: start-first
|
||||||
labels:
|
labels:
|
||||||
- "coop-cloud.${STACK_NAME}.version=2.1.4+24.0.6-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=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:
|
||||||
|
test: ["CMD-SHELL", 'SCRIPT_NAME=status SCRIPT_FILENAME=/var/www/html/status.php REQUEST_METHOD=GET cgi-fcgi -bind -connect 127.0.0.1:9000 | grep "installed\":true"']
|
||||||
|
interval: 30s
|
||||||
|
timeout: 10s
|
||||||
|
retries: 10
|
||||||
|
start_period: 5m
|
||||||
|
|
||||||
cron:
|
cron:
|
||||||
image: nextcloud:24.0.6-fpm
|
image: nextcloud:27.0.1-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
|
||||||
|
@ -94,11 +110,16 @@ services:
|
||||||
entrypoint: /cron.sh
|
entrypoint: /cron.sh
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
image: redis:7.0.5-alpine
|
image: redis:7.0.12-alpine
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
volumes:
|
volumes:
|
||||||
- "redis:/data"
|
- "redis:/data"
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "redis-cli", "ping"]
|
||||||
|
interval: 3s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 20
|
||||||
|
|
||||||
secrets:
|
secrets:
|
||||||
db_root_password:
|
db_root_password:
|
||||||
|
@ -106,7 +127,7 @@ secrets:
|
||||||
name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
|
name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
|
||||||
db_password:
|
db_password:
|
||||||
external: true
|
external: true
|
||||||
name: ${STACK_NAME}_db_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
|
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
|
||||||
admin_password:
|
admin_password:
|
||||||
external: true
|
external: true
|
||||||
name: ${STACK_NAME}_admin_password_${SECRET_ADMIN_PASSWORD_VERSION}
|
name: ${STACK_NAME}_admin_password_${SECRET_ADMIN_PASSWORD_VERSION}
|
||||||
|
@ -127,6 +148,7 @@ configs:
|
||||||
fpm_tune:
|
fpm_tune:
|
||||||
name: ${STACK_NAME}_fpm_tune_${FPM_TUNE_VERSION}
|
name: ${STACK_NAME}_fpm_tune_${FPM_TUNE_VERSION}
|
||||||
file: fpm-tune.ini
|
file: fpm-tune.ini
|
||||||
|
template_driver: golang
|
||||||
entrypoint:
|
entrypoint:
|
||||||
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
|
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
|
||||||
file: entrypoint.sh.tmpl
|
file: entrypoint.sh.tmpl
|
||||||
|
|
|
@ -1,5 +1,30 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
file_env() {
|
||||||
|
local var="$1"
|
||||||
|
local fileVar="${var}_FILE"
|
||||||
|
local def="${2:-}"
|
||||||
|
|
||||||
|
if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
|
||||||
|
echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
local val="$def"
|
||||||
|
if [ "${!var:-}" ]; then
|
||||||
|
val="${!var}"
|
||||||
|
elif [ "${!fileVar:-}" ]; then
|
||||||
|
val="$(< "${!fileVar}")"
|
||||||
|
fi
|
||||||
|
|
||||||
|
export "$var"="$val"
|
||||||
|
unset "$fileVar"
|
||||||
|
}
|
||||||
|
|
||||||
|
file_env "SMTP_PASSWORD"
|
||||||
|
|
||||||
echo "Giving the db container some time to come up"; sleep 20
|
echo "Giving the db container some time to come up"; sleep 20
|
||||||
# see this issue with postgres db https://github.com/nextcloud/docker/issues/1204
|
# see this issue with postgres db https://github.com/nextcloud/docker/issues/1204
|
||||||
|
|
||||||
|
@ -9,4 +34,8 @@ if ! [[ $(grep {{ env "X_FRAME_OPTIONS_ALLOW_FROM" }} lib/public/AppFramework/Ht
|
||||||
fi
|
fi
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
|
# Required for healthcheck
|
||||||
|
which cgi-fcgi > /dev/null || (apt-get update && apt-get install -y libfcgi-bin)
|
||||||
|
|
||||||
|
|
||||||
/entrypoint.sh php-fpm
|
/entrypoint.sh php-fpm
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
pm = dynamic
|
pm = dynamic
|
||||||
pm.max_children = 131
|
pm.max_children = {{ env "FPM_MAX_CHILDREN" }}
|
||||||
pm.start_servers = 32
|
pm.start_servers = {{ env "FPM_START_SERVERS" }}
|
||||||
pm.min_spare_servers = 32
|
pm.min_spare_servers = {{ env "FPM_MIN_SPARE_SERVERS" }}
|
||||||
pm.max_spare_servers = 98
|
pm.max_spare_servers = {{ env "FPM_MAX_SPARE_SERVERS" }}
|
||||||
|
|
|
@ -0,0 +1,57 @@
|
||||||
|
|
||||||
|
## FPM Tune
|
||||||
|
|
||||||
|
The fpm-tune.ini settings are now configurable by `.env`. Please add this to your servers configs:
|
||||||
|
|
||||||
|
```
|
||||||
|
# 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
|
||||||
|
```
|
||||||
|
|
||||||
|
## SMTP
|
||||||
|
|
||||||
|
Add SMTP Config to your .env file:
|
||||||
|
|
||||||
|
```
|
||||||
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
|
||||||
|
# See https://github.com/nextcloud/docker#auto-configuration-via-environment-variables for default values
|
||||||
|
# SMTP_AUTHTYPE=
|
||||||
|
# SMTP_HOST=
|
||||||
|
# SMTP_SECURE=
|
||||||
|
# SMTP_NAME=
|
||||||
|
# SMTP_PORT=
|
||||||
|
# MAIL_FROM_ADDRESS=
|
||||||
|
# MAIL_DOMAIN=
|
||||||
|
# SECRET_SMTP_PASSWORD_VERSION=v1
|
||||||
|
abra app secret insert example.com smtp_password v1 example_password
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
|
## Post Deploy Commands
|
||||||
|
|
||||||
|
Some Apps can also be managed with abra app cmd!
|
||||||
|
|
||||||
|
```
|
||||||
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yml"
|
||||||
|
# APPS="calendar sociallogin onlyoffice"
|
||||||
|
abra app cmd example.com app install_apps
|
||||||
|
# ONLYOFFICE_URL=https://onlyoffice.example.com
|
||||||
|
# SECRET_ONLYOFFICE_JWT_VERSION=v1
|
||||||
|
abra app secret insert example.com onlyoffice_jwt v1 example_password
|
||||||
|
abra app cmd example.com app install_onlyoffice
|
||||||
|
# BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash!
|
||||||
|
# SECRET_BBB_SECRET_VERSION=v1
|
||||||
|
abra app secret insert example.com bbb_secret v1 example_password
|
||||||
|
abra app cmd example.com app install_bbb
|
||||||
|
```
|
||||||
|
|
||||||
|
## Set Quota
|
||||||
|
|
||||||
|
```
|
||||||
|
# DEFAULT_QUOTA="10 GB"
|
||||||
|
abra app cmd example.com app set_default_quota
|
||||||
|
```
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
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
|
|
@ -0,0 +1 @@
|
||||||
|
The authentik secrets need to be inserted again, as nextcloud is not sharing the secret with authentik any more.
|
Loading…
Reference in New Issue