forked from coop-cloud/nextcloud
Compare commits
71 Commits
2.1.2+24.0
...
main
Author | SHA1 | Date |
---|---|---|
Christian Galo | cc47e2b531 | |
Christian Galo | 9d2ec0f0b5 | |
Christian Galo | 907d73ea92 | |
Christian Galo | 392b859110 | |
Christian Galo | 827e03bc52 | |
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 | |
Philipp Rothmann | e996b5c057 | |
Philipp Rothmann | 0aabef8f7b | |
Philipp Rothmann | 2be42d0a84 | |
Philipp Rothmann | e76454c4fd | |
Philipp Rothmann | ec39fd5fed | |
yksflip | 16ad6c22ea |
25
.drone.yml
25
.drone.yml
|
@ -1,25 +0,0 @@
|
||||||
---
|
|
||||||
kind: pipeline
|
|
||||||
name: deploy to swarm-test.autonomic.zone
|
|
||||||
steps:
|
|
||||||
- name: deployment
|
|
||||||
image: decentral1se/stack-ssh-deploy:latest
|
|
||||||
settings:
|
|
||||||
host: swarm-test.autonomic.zone
|
|
||||||
stack: nextcloud
|
|
||||||
generate_secrets: true
|
|
||||||
purge: true
|
|
||||||
deploy_key:
|
|
||||||
from_secret: drone_ssh_swarm_test
|
|
||||||
environment:
|
|
||||||
DOMAIN: nextcloud.swarm-test.autonomic.zone
|
|
||||||
STACK_NAME: nextcloud
|
|
||||||
LETS_ENCRYPT_ENV: production
|
|
||||||
ADMIN_USER: foobar
|
|
||||||
SECRET_DB_PASSWORD_VERSION: v1
|
|
||||||
SECRET_DB_ROOT_PASSWORD_VERSION: v1
|
|
||||||
SECRET_ADMIN_PASSWORD_VERSION: v1
|
|
||||||
EXTRA_VOLUME: "/dev/null:/tmp/.dummy"
|
|
||||||
trigger:
|
|
||||||
branch:
|
|
||||||
- main
|
|
18
.env.sample
18
.env.sample
|
@ -1,18 +0,0 @@
|
||||||
TYPE=nextcloud
|
|
||||||
|
|
||||||
DOMAIN=nextcloud.example.com
|
|
||||||
## Domain aliases
|
|
||||||
#EXTRA_DOMAINS=', `www.nextcloud.example.com`'
|
|
||||||
LETS_ENCRYPT_ENV=production
|
|
||||||
|
|
||||||
COMPOSE_FILE="compose.yml"
|
|
||||||
COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
|
|
||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml"
|
|
||||||
|
|
||||||
ADMIN_USER=admin
|
|
||||||
|
|
||||||
SECRET_DB_ROOT_PASSWORD_VERSION=v1
|
|
||||||
SECRET_DB_PASSWORD_VERSION=v1
|
|
||||||
SECRET_ADMIN_PASSWORD_VERSION=v1
|
|
||||||
|
|
||||||
EXTRA_VOLUME=/dev/null:/tmp/.dummy
|
|
|
@ -1 +1 @@
|
||||||
/.envrc
|
.env
|
|
@ -1,5 +0,0 @@
|
||||||
{
|
|
||||||
"shellcheck.customArgs": [
|
|
||||||
"--shell=bash"
|
|
||||||
]
|
|
||||||
}
|
|
184
README.md
184
README.md
|
@ -1,192 +1,24 @@
|
||||||
# Nextcloud
|
# Nextcloud
|
||||||
|
|
||||||
[![Build Status](https://drone.autonomic.zone/api/badges/coop-cloud/nextcloud/status.svg)](https://drone.autonomic.zone/coop-cloud/nextcloud)
|
Wiki Cafe's configuration for a Nextcloud deployment. Originally slimmed down from an `abra` [recipe](https://git.coopcloud.tech/coop-cloud/nextcloud) by [Co-op Cloud](https://coopcloud.tech/).
|
||||||
|
|
||||||
Fully automated luxury Nextcloud via docker-swarm.
|
|
||||||
|
|
||||||
<!-- metadata -->
|
## Deploying the app with Docker Swarm
|
||||||
* **Category**: Apps
|
|
||||||
* **Status**: 2, beta
|
|
||||||
* **Image**: [`nextcloud`](https://hub.docker.com/_/nextcloud), 4, upstream
|
|
||||||
* **Healthcheck**: Yes
|
|
||||||
* **Backups**: No
|
|
||||||
* **Email**: 3
|
|
||||||
* **Tests**: 2
|
|
||||||
* **SSO**: 1 (OAuth)
|
|
||||||
<!-- endmetadata -->
|
|
||||||
|
|
||||||
## Basic usage
|
Set the environment variables from the .env file during the shell session.
|
||||||
|
|
||||||
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?
|
|
||||||
|
|
||||||
- Delete the dashboard app since it is so corporate
|
|
||||||
- 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)
|
|
||||||
|
|
||||||
## Running `occ`
|
|
||||||
|
|
||||||
`abra app run --user www-data YOURAPPDOMAIN app occ user:list --help`
|
|
||||||
|
|
||||||
## Upgrading Nextcloud apps
|
|
||||||
|
|
||||||
`abra app run --user www-data YOURAPPDOMAIN app occ app:update --all`
|
|
||||||
|
|
||||||
## How do I fix a Nextcloud version snafu?
|
|
||||||
|
|
||||||
`Exception: Updates between multiple major versions and downgrades are unsupported.`
|
|
||||||
|
|
||||||
Solution:
|
|
||||||
|
|
||||||
- Look at log files to determine the old Nextcloud version
|
|
||||||
- Change your local `~/.abra/recipes/nextcloud/compose.yml` to the highest minor
|
|
||||||
version in the old version -- e.g. choose `22.2.5` for `22`, if you're
|
|
||||||
upgrading to `23`.
|
|
||||||
- Then, do one of (both bad):
|
|
||||||
1. `abra app deploy --chaos ...`, then `app run` to go in and manually lower the version number in PHP (shell in, `apt install vim-core && vi version.php`), then try `php ./occ upgrade`
|
|
||||||
2. `abra app undeploy ...`, `abra volume rm`, CAREFULLY only choose the volume
|
|
||||||
ENDING `_nextcloud`, then `abra app deploy --chaos ...`, then edit the
|
|
||||||
`compose.yml` to add `entrypoint: ['tail', '-f', '/dev/null']` to `app`,
|
|
||||||
then `app deploy --chaos` again, then `app run --user=www-data ... app bash` to get in and run `./occ maintenance:repair`, and `./occ upgrade`.
|
|
||||||
- Change `compose.yml` to the new version number; `git checkout compose.yml`
|
|
||||||
- `abra app deploy --force`
|
|
||||||
- This wasn't even multiplle major versions was it 😾
|
|
||||||
|
|
||||||
## How do I integrate with Keycloak SSO?
|
|
||||||
|
|
||||||
Use [this plugin](https://github.com/pulsejet/nextcloud-oidc-login). Unlike the plugin it's forked from, there is no configuration UI, so you'll need to edit `/var/www/html/config/config.php`:
|
|
||||||
|
|
||||||
```
|
```
|
||||||
'oidc_login_client_id' => 'nextcloud',
|
set -a && source .env && set +a
|
||||||
'oidc_login_client_secret' => 'mysecret',
|
|
||||||
'oidc_login_provider_url' => 'https://example.com/auth/realms/myrealm',
|
|
||||||
'oidc_login_disable_registration' => false,
|
|
||||||
'oidc_login_hide_password_form' => true,
|
|
||||||
'oidc_login_button_text' => 'Log in with your myssodomain',
|
|
||||||
'oidc_login_default_group' => 'mygroup',
|
|
||||||
'oidc_login_attributes' =>
|
|
||||||
array (
|
|
||||||
'id' => 'sub',
|
|
||||||
'name' => 'name',
|
|
||||||
'mail' => 'email',
|
|
||||||
),
|
|
||||||
'oidc_create_groups' => true,
|
|
||||||
```
|
```
|
||||||
|
|
||||||
You can use [this trick](https://janikvonrotz.ch/2020/10/20/openid-connect-with-nextcloud-and-keycloak/) (see "Cryptic Usernames" work-around) to get proper usernames.
|
Set the secrets.
|
||||||
|
|
||||||
If you ever need to change the realm, you'll need to reset the cache with:
|
|
||||||
|
|
||||||
```
|
```
|
||||||
docker exec -u www-data <container-id> php occ config:app:delete oidc_login last_updated_well_known
|
printf "SECRET_HERE" | docker secret create SECRET_NAME -
|
||||||
docker exec -u www-data <container-id> php occ config:app:delete oidc_login last_updated_jwks
|
|
||||||
```
|
```
|
||||||
|
|
||||||
## How do I enable multiple SSO login buttons?
|
Deploy using the `-c` flag to specify one or multiple compose files.
|
||||||
|
|
||||||
We've been able to get this setup by using the [social login](https://apps.nextcloud.com/apps/sociallogin) plugin.
|
|
||||||
|
|
||||||
If using Keycloak, you'll want to do [this trick](https://janikvonrotz.ch/2020/10/20/openid-connect-with-nextcloud-and-keycloak/) also.
|
|
||||||
|
|
||||||
## How can I customise the CSS?
|
|
||||||
|
|
||||||
There is some basic stuff in the admin settings.
|
|
||||||
|
|
||||||
To go a little deeper, you can use [this handy app](https://apps.nextcloud.com/apps/theming_customcss).
|
|
||||||
|
|
||||||
Here is an example CSS config which hides the local login and makes space for a central image:
|
|
||||||
|
|
||||||
```css
|
|
||||||
#body-login .wrapper main form[name="login"],
|
|
||||||
#body-login .wrapper main form[name="login"] ~ a {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#body-login .logo {
|
|
||||||
visibility: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
#body-login #alternative-logins a.button[href*="oidc"] {
|
|
||||||
background: #233b4a;
|
|
||||||
color: #fff;
|
|
||||||
transition: all 0.2s ease-in-out;
|
|
||||||
}
|
|
||||||
#body-login #alternative-logins a.button[href*="oidc"]:hover {
|
|
||||||
background: linear-gradient(-35deg, #233b4a 40%, #486c83 100%);
|
|
||||||
}
|
|
||||||
|
|
||||||
#body-login #alternative-logins a.button[href*="/sociallogin/oauth/google"] {
|
|
||||||
border: 0;
|
|
||||||
color: #db4437 !important;
|
|
||||||
background-color: #fff;
|
|
||||||
}
|
|
||||||
|
|
||||||
#body-login
|
|
||||||
#alternative-logins
|
|
||||||
a.button[href*="/sociallogin/oauth/google"]::before {
|
|
||||||
width: 25px;
|
|
||||||
background-color: #db4437;
|
|
||||||
border-radius: 100%;
|
|
||||||
background-size: 60%;
|
|
||||||
background-position: center;
|
|
||||||
height: 25px;
|
|
||||||
vertical-align: middle;
|
|
||||||
margin-right: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#body-login main {
|
|
||||||
padding: 50vh 0 0 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#body-login a[href*="#body-login"] {
|
|
||||||
visibility: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
#body-login footer a,
|
|
||||||
#body-login footer p {
|
|
||||||
color: #233b4a;
|
|
||||||
}
|
|
||||||
|
|
||||||
#body-login footer a:hover {
|
|
||||||
color: #fff;
|
|
||||||
}
|
|
||||||
|
|
||||||
#body-login footer p.info {
|
|
||||||
text-shadow: none;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
[nextcloud-docker]: https://hub.docker.com/_/nextcloud/
|
|
||||||
[`abra`]: https://git.autonomic.zone/autonomic-cooperative/abra
|
|
||||||
[`coop-cloud/traefik`]: https://git.autonomic.zone/coop-cloud/traefik
|
|
||||||
|
|
||||||
## Using [`previewgenerator`](https://github.com/nextcloud/previewgenerator) app
|
|
||||||
|
|
||||||
> Beware, this appp has been known to not work...
|
|
||||||
|
|
||||||
After you install, enable etc. then you need to run the generation (**warning**: it can take a long time!):
|
|
||||||
|
|
||||||
```
|
```
|
||||||
abra app run <domain> app bash -u www-data
|
docker stack deploy nextcloud -c compose.yaml -c compose.mariadb.yaml -c compose.smtp.yaml
|
||||||
./occ preview:generate-all
|
|
||||||
```
|
```
|
||||||
|
|
||||||
To set up the cron to run again, there is [no clear solution in the context of
|
|
||||||
containers](https://github.com/nextcloud/previewgenerator/issues/1). So, a
|
|
||||||
pretty dodgy hack is to run it from the system directly:
|
|
||||||
|
|
||||||
```
|
|
||||||
root@foo.com /etc/cron.hourly $ cat foo-com-preview-generate
|
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
docker exec -u www-data $(docker ps -f name=foo_com_app -q) ./occ preview:pre-generate
|
|
||||||
```
|
|
||||||
|
|
||||||
This app will improve performance of image browsing at the cost of storage space.
|
|
||||||
|
|
105
abra.sh
105
abra.sh
|
@ -1,105 +0,0 @@
|
||||||
export FPM_TUNE_VERSION=v4
|
|
||||||
export NGINX_CONF_VERSION=v2
|
|
||||||
export MY_CNF_VERSION=v4
|
|
||||||
|
|
||||||
NC_APP_DIR="app:/var/www/html"
|
|
||||||
|
|
||||||
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() {
|
|
||||||
# Copied _abra_backup_dir to make UX better on restore and backup
|
|
||||||
{
|
|
||||||
abra__src_="$1"
|
|
||||||
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_="-"
|
|
||||||
abra__dst_=$NC_APP_DIR
|
|
||||||
}
|
|
||||||
|
|
||||||
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() {
|
|
||||||
# warning "Restoring the database is on a existing app and not a new one has not been tested. Use with caution."
|
|
||||||
# next_maintenance_on
|
|
||||||
# # 3wc: unlike abra_backup_db, we can assume abra__service_ will be 'db' if we
|
|
||||||
# # got this far..
|
|
||||||
|
|
||||||
# # 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
|
|
||||||
# }
|
|
|
@ -1,5 +1,3 @@
|
||||||
version: "3.8"
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
environment:
|
environment:
|
||||||
|
@ -28,13 +26,28 @@ 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
|
||||||
file: my-tune.cnf
|
file: my-tune.cnf
|
||||||
|
|
||||||
|
secrets:
|
||||||
|
db_root_password:
|
||||||
|
external: true
|
||||||
|
name: ${STACK_NAME}_db_root_password
|
||||||
|
db_password:
|
||||||
|
external: true
|
||||||
|
name: ${STACK_NAME}_db_password
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
mariadb:
|
mariadb:
|
|
@ -1,38 +0,0 @@
|
||||||
version: '3.8'
|
|
||||||
|
|
||||||
services:
|
|
||||||
app:
|
|
||||||
entrypoint: "sh -c 'sleep 10 && /entrypoint.sh php-fpm'" # tries to mitigate this error with postgres https://github.com/nextcloud/docker/issues/1204
|
|
||||||
environment:
|
|
||||||
- POSTGRES_HOST=db
|
|
||||||
- POSTGRES_DB=nextcloud
|
|
||||||
- POSTGRES_USER=nextcloud
|
|
||||||
- POSTGRES_PASSWORD_FILE=/run/secrets/db_password
|
|
||||||
- NEXTCLOUD_UPDATE=1
|
|
||||||
|
|
||||||
db:
|
|
||||||
image: "postgres:12"
|
|
||||||
volumes:
|
|
||||||
- "postgres:/var/lib/postgresql/data"
|
|
||||||
networks:
|
|
||||||
- internal
|
|
||||||
environment:
|
|
||||||
POSTGRES_USER: nextcloud
|
|
||||||
POSTGRES_PASSWORD_FILE: /run/secrets/db_password
|
|
||||||
POSTGRES_DB: nextcloud
|
|
||||||
secrets:
|
|
||||||
- db_password
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "pg_isready"]
|
|
||||||
interval: 10s
|
|
||||||
timeout: 5s
|
|
||||||
retries: 5
|
|
||||||
deploy:
|
|
||||||
labels:
|
|
||||||
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.post-hook: "rm -rf /tmp/backup"
|
|
||||||
backupbot.backup.path: "/tmp/backup/"
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
postgres:
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
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
|
|
@ -1,11 +1,12 @@
|
||||||
version: "3.8"
|
|
||||||
services:
|
services:
|
||||||
web:
|
web:
|
||||||
image: nginx:1.23.1
|
image: nginx:1.26.0
|
||||||
configs:
|
configs:
|
||||||
- source: nginx_conf
|
- source: nginx_conf
|
||||||
target: /etc/nginx/nginx.conf
|
target: /etc/nginx/nginx.conf
|
||||||
environment:
|
environment:
|
||||||
|
- X_FRAME_OPTIONS_ALLOW_FROM
|
||||||
|
- X_FRAME_OPTIONS_ENABLED
|
||||||
- DOMAIN
|
- DOMAIN
|
||||||
- STACK_NAME
|
- STACK_NAME
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -31,31 +32,48 @@ 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}"
|
||||||
|
- "caddy=${DOMAIN}"
|
||||||
|
- "caddy.reverse_proxy={{upstreams 80}}"
|
||||||
|
- "caddy.tls.on_demand="
|
||||||
|
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.3-fpm
|
image: nextcloud:29.0.0-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
|
||||||
|
target: /custom-entrypoint.sh
|
||||||
|
mode: 555
|
||||||
|
entrypoint: /custom-entrypoint.sh
|
||||||
secrets:
|
secrets:
|
||||||
- db_password
|
- db_password
|
||||||
- admin_password
|
- admin_password
|
||||||
environment:
|
environment:
|
||||||
|
- APPS
|
||||||
|
- X_FRAME_OPTIONS_ALLOW_FROM
|
||||||
|
- X_FRAME_OPTIONS_ENABLED
|
||||||
- DOMAIN
|
- DOMAIN
|
||||||
- STACK_NAME
|
- STACK_NAME
|
||||||
- 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
|
||||||
|
@ -69,13 +87,17 @@ services:
|
||||||
failure_action: rollback
|
failure_action: rollback
|
||||||
order: start-first
|
order: start-first
|
||||||
labels:
|
labels:
|
||||||
- "coop-cloud.${STACK_NAME}.version=2.1.2+24.0.3-fpm"
|
|
||||||
- "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.3-fpm
|
image: nextcloud:29.0.0-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
|
||||||
|
@ -87,22 +109,24 @@ services:
|
||||||
entrypoint: /cron.sh
|
entrypoint: /cron.sh
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
image: redis:7.0.4-alpine
|
image: redis:7.2.4-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:
|
|
||||||
external: true
|
|
||||||
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
|
||||||
admin_password:
|
admin_password:
|
||||||
external: true
|
external: true
|
||||||
name: ${STACK_NAME}_admin_password_${SECRET_ADMIN_PASSWORD_VERSION}
|
name: ${STACK_NAME}_admin_password
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
nextcloud:
|
nextcloud:
|
||||||
|
@ -111,14 +135,20 @@ volumes:
|
||||||
nextconfig:
|
nextconfig:
|
||||||
redis:
|
redis:
|
||||||
|
|
||||||
|
|
||||||
configs:
|
configs:
|
||||||
nginx_conf:
|
nginx_conf:
|
||||||
name: ${STACK_NAME}_nginx_${NGINX_CONF_VERSION}
|
name: ${STACK_NAME}_nginx
|
||||||
file: nginx.conf.tmpl
|
file: nginx.conf.tmpl
|
||||||
template_driver: golang
|
template_driver: golang
|
||||||
fpm_tune:
|
fpm_tune:
|
||||||
name: ${STACK_NAME}_fpm_tune_${FPM_TUNE_VERSION}
|
name: ${STACK_NAME}_fpm_tune
|
||||||
file: fpm-tune.ini
|
file: fpm-tune.ini
|
||||||
|
template_driver: golang
|
||||||
|
entrypoint:
|
||||||
|
name: ${STACK_NAME}_entrypoint
|
||||||
|
file: entrypoint.sh.tmpl
|
||||||
|
template_driver: golang
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
|
@ -0,0 +1,41 @@
|
||||||
|
#!/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
|
||||||
|
# see this issue with postgres db https://github.com/nextcloud/docker/issues/1204
|
||||||
|
|
||||||
|
{{ if eq (env "X_FRAME_OPTIONS_ENABLED") "1" }}
|
||||||
|
if ! [[ $(grep {{ env "X_FRAME_OPTIONS_ALLOW_FROM" }} lib/public/AppFramework/Http/ContentSecurityPolicy.php) ]]; then
|
||||||
|
sed -i "91 a\\\t\t'{{ env "X_FRAME_OPTIONS_ALLOW_FROM" }}', " lib/public/AppFramework/Http/ContentSecurityPolicy.php
|
||||||
|
fi
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
|
# Required for healthcheck
|
||||||
|
which cgi-fcgi > /dev/null || (apt-get update && apt-get install -y libfcgi-bin)
|
||||||
|
|
||||||
|
|
||||||
|
/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" }}
|
||||||
|
|
|
@ -11,6 +11,9 @@ events {
|
||||||
|
|
||||||
http {
|
http {
|
||||||
include /etc/nginx/mime.types;
|
include /etc/nginx/mime.types;
|
||||||
|
types {
|
||||||
|
application/javascript js mjs;
|
||||||
|
}
|
||||||
default_type application/octet-stream;
|
default_type application/octet-stream;
|
||||||
|
|
||||||
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
||||||
|
@ -41,6 +44,7 @@ http {
|
||||||
# could take several months.
|
# could take several months.
|
||||||
#add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
|
#add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
|
||||||
|
|
||||||
|
|
||||||
# set max upload size
|
# set max upload size
|
||||||
client_max_body_size 512M;
|
client_max_body_size 512M;
|
||||||
fastcgi_buffers 64 4K;
|
fastcgi_buffers 64 4K;
|
||||||
|
@ -58,13 +62,19 @@ http {
|
||||||
#pagespeed off;
|
#pagespeed off;
|
||||||
|
|
||||||
# HTTP response headers borrowed from Nextcloud `.htaccess`
|
# HTTP response headers borrowed from Nextcloud `.htaccess`
|
||||||
add_header Referrer-Policy "no-referrer" always;
|
add_header Referrer-Policy "no-referrer" always;
|
||||||
add_header X-Content-Type-Options "nosniff" always;
|
add_header X-Content-Type-Options "nosniff" always;
|
||||||
add_header X-Download-Options "noopen" always;
|
add_header X-Download-Options "noopen" always;
|
||||||
|
add_header X-Permitted-Cross-Domain-Policies "none" always;
|
||||||
|
add_header X-Robots-Tag "noindex, nofollow" always;
|
||||||
|
add_header X-XSS-Protection "1; mode=block" always;
|
||||||
|
|
||||||
|
{{ if eq (env "X_FRAME_OPTIONS_ENABLED") "1" }}
|
||||||
|
add_header Content-Security-Policy "frame-ancestors {{ env "X_FRAME_OPTIONS_ALLOW_FROM" }} {{ env "DOMAIN" }}";
|
||||||
|
{{ else }}
|
||||||
add_header X-Frame-Options "SAMEORIGIN" always;
|
add_header X-Frame-Options "SAMEORIGIN" always;
|
||||||
add_header X-Permitted-Cross-Domain-Policies "none" always;
|
{{ end }}
|
||||||
add_header X-Robots-Tag "none" always;
|
|
||||||
add_header X-XSS-Protection "1; mode=block" always;
|
|
||||||
|
|
||||||
# Remove X-Powered-By, which is an information leak
|
# Remove X-Powered-By, which is an information leak
|
||||||
fastcgi_hide_header X-Powered-By;
|
fastcgi_hide_header X-Powered-By;
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
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"
|
|
||||||
COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
|
|
||||||
```
|
|
|
@ -1,9 +0,0 @@
|
||||||
{
|
|
||||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
|
||||||
"ignoreDeps": [
|
|
||||||
"mariadb:10.6"
|
|
||||||
],
|
|
||||||
"extends": [
|
|
||||||
"config:base"
|
|
||||||
]
|
|
||||||
}
|
|
Loading…
Reference in New Issue