forked from coop-cloud/nextcloud
Compare commits
56 Commits
Author | SHA1 | Date | |
---|---|---|---|
85e5070b8d | |||
36615bc097 | |||
a3cd6741eb | |||
cb453e884d | |||
267f3cbb78 | |||
b0c4f06af1 | |||
750477a409 | |||
7a7da21544 | |||
d72a8fdcdb | |||
7aa4e15034 | |||
|
0c5b05957c | ||
d8cb3719e2 | |||
bbc834a62d | |||
da8f7fb447 | |||
ee2c5a2b42 | |||
182a42ff1f | |||
5a397ce63e | |||
ccb54f34d4 | |||
3143e99572 | |||
9859907d4b | |||
6c0fa9c12d | |||
a3c99a72bf | |||
c94ffed09d | |||
7a863573c9 | |||
c930bbcf56 | |||
a13e7a509c | |||
0f9aba3e9e | |||
eb3e2486ce | |||
2b4e63ef31 | |||
c056687849 | |||
180c269337 | |||
7eea2e0785 | |||
be915272b4 | |||
9be859db25 | |||
97e1d72604 | |||
8a1fae2bac | |||
ce817e3928 | |||
7a64d3c6a7 | |||
bb781e654b | |||
cb5cd5f7b2 | |||
0a3e943b26 | |||
4f1aaf5d1d | |||
019b71fde1 | |||
7527399da0 | |||
94e84122ed | |||
0d9ab936a0 | |||
09ec6f842c | |||
b5d40aa428 | |||
eead80b60a | |||
24670cdb6b | |||
7e4ab9288c | |||
199bf61300 | |||
99514b5991 | |||
eefb14e150 | |||
a34e100bd7 | |||
24ca6b22bc |
@ -22,6 +22,8 @@ steps:
|
|||||||
NGINX_CONF_VERSION: v1
|
NGINX_CONF_VERSION: v1
|
||||||
MY_CNF_VERSION: v1
|
MY_CNF_VERSION: v1
|
||||||
ENTRYPOINT_VERSION: v1
|
ENTRYPOINT_VERSION: v1
|
||||||
|
CRONTAB_VERSION: v1
|
||||||
|
PG_BACKUP_VERSION: v2
|
||||||
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
|
||||||
@ -43,7 +45,7 @@ steps:
|
|||||||
from_secret: drone_abra-bot_token
|
from_secret: drone_abra-bot_token
|
||||||
fork: true
|
fork: true
|
||||||
repositories:
|
repositories:
|
||||||
- coop-cloud/auto-recipes-catalogue-json
|
- toolshed/auto-recipes-catalogue-json
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
event: tag
|
event: tag
|
||||||
|
41
.env.sample
41
.env.sample
@ -1,6 +1,7 @@
|
|||||||
TYPE=nextcloud
|
TYPE=nextcloud
|
||||||
TIMEOUT=900
|
TIMEOUT=900
|
||||||
ENABLE_AUTO_UPDATE=true
|
ENABLE_AUTO_UPDATE=true
|
||||||
|
ENABLE_BACKUPS=true
|
||||||
|
|
||||||
DOMAIN=nextcloud.example.com
|
DOMAIN=nextcloud.example.com
|
||||||
## Domain aliases
|
## Domain aliases
|
||||||
@ -11,6 +12,8 @@ COMPOSE_FILE="compose.yml"
|
|||||||
COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
|
COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
|
||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml"
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml"
|
||||||
|
|
||||||
|
#MAX_DB_CONNECTIONS=500
|
||||||
|
|
||||||
ADMIN_USER=admin
|
ADMIN_USER=admin
|
||||||
|
|
||||||
SECRET_DB_ROOT_PASSWORD_VERSION=v1
|
SECRET_DB_ROOT_PASSWORD_VERSION=v1
|
||||||
@ -42,23 +45,39 @@ DEFAULT_QUOTA="10 GB"
|
|||||||
# MAIL_DOMAIN=
|
# MAIL_DOMAIN=
|
||||||
# SECRET_SMTP_PASSWORD_VERSION=v1
|
# SECRET_SMTP_PASSWORD_VERSION=v1
|
||||||
|
|
||||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yml"
|
## Customization
|
||||||
# APPS="calendar sociallogin onlyoffice"
|
# THEMING_COLOR=
|
||||||
#
|
# THEMING_SLOGAN=
|
||||||
# ONLYOFFICE_URL=https://onlyoffice.example.com
|
# COPY_ASSETS="flow_background.jpg|app:/var/www/html/themes/"
|
||||||
# SECRET_ONLYOFFICE_JWT_VERSION=v1
|
# COPY_ASSETS="$COPY_ASSETS icon_left_brand.svg|app:/var/www/html/themes/"
|
||||||
#
|
# COPY_ASSETS="$COPY_ASSETS icon.png|app:/var/www/html/themes/"
|
||||||
|
|
||||||
|
# APPS="calendar"
|
||||||
|
|
||||||
# COLLABORA_URL=https://collabora.example.com
|
# COLLABORA_URL=https://collabora.example.com
|
||||||
#
|
|
||||||
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.onlyoffice.yml"
|
||||||
|
# ONLYOFFICE_URL=https://onlyoffice.example.com
|
||||||
|
# APPS="$APPS onlyoffice"
|
||||||
|
# SECRET_ONLYOFFICE_JWT_VERSION=v1
|
||||||
|
|
||||||
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.bbb.yml"
|
||||||
# BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash!
|
# BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash!
|
||||||
# SECRET_BBB_SECRET_VERSION=v1
|
# SECRET_BBB_SECRET_VERSION=v1
|
||||||
#
|
|
||||||
# OCC_CMDS="app:disable dashboard"
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.whiteboard.yml"
|
||||||
# OCC_CMDS="$OCC_CMDS|config:app:set sociallogin auto_create_groups --value 1"
|
# APPS="$APPS whiteboard"
|
||||||
# OCC_CMDS="$OCC_CMDS|config:app:set sociallogin hide_default_login --value 1"
|
# SECRET_WHITEBOARD_JWT_VERSION=v1
|
||||||
|
|
||||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.authentik.yml"
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.authentik.yml"
|
||||||
|
# APPS="$APPS sociallogin"
|
||||||
# AUTHENTIK_USER_PREFIX=authentik
|
# AUTHENTIK_USER_PREFIX=authentik
|
||||||
# AUTHENTIK_DOMAIN=authentik.example.com
|
# AUTHENTIK_DOMAIN=authentik.example.com
|
||||||
# SECRET_AUTHENTIK_SECRET_VERSION=v1
|
# SECRET_AUTHENTIK_SECRET_VERSION=v1
|
||||||
# SECRET_AUTHENTIK_ID_VERSION=v1
|
# SECRET_AUTHENTIK_ID_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.fulltextsearch.yml"
|
||||||
|
#SECRET_ELASTICSEARCH_PASSWORD_VERSION=v1
|
||||||
|
58
README.md
58
README.md
@ -6,10 +6,10 @@ Fully automated luxury Nextcloud via docker-swarm.
|
|||||||
|
|
||||||
<!-- metadata -->
|
<!-- metadata -->
|
||||||
* **Category**: Apps
|
* **Category**: Apps
|
||||||
* **Status**: 2, beta
|
* **Status**: 5
|
||||||
* **Image**: [`nextcloud`](https://hub.docker.com/_/nextcloud), 4, upstream
|
* **Image**: [`nextcloud`](https://hub.docker.com/_/nextcloud), 4, upstream
|
||||||
* **Healthcheck**: Yes
|
* **Healthcheck**: Yes
|
||||||
* **Backups**: No
|
* **Backups**: Yes
|
||||||
* **Email**: 3
|
* **Email**: 3
|
||||||
* **Tests**: 2
|
* **Tests**: 2
|
||||||
* **SSO**: 1 (OAuth)
|
* **SSO**: 1 (OAuth)
|
||||||
@ -17,7 +17,6 @@ Fully automated luxury Nextcloud via docker-swarm.
|
|||||||
|
|
||||||
## Quick start
|
## Quick start
|
||||||
|
|
||||||
|
|
||||||
* `abra app new nextcloud`
|
* `abra app new nextcloud`
|
||||||
* `abra app config <app-name>`
|
* `abra app config <app-name>`
|
||||||
* `abra app secret insert <app-name> smtp_password v1 <SMTP_PASSWORD>`
|
* `abra app secret insert <app-name> smtp_password v1 <SMTP_PASSWORD>`
|
||||||
@ -88,7 +87,12 @@ OCC_CMDS="app:disable dashboard"
|
|||||||
|
|
||||||
- Configure a `defaultapp` in your `config.php` or use [apporder](https://apps.nextcloud.com/apps/apporder)
|
- Configure a `defaultapp` in your `config.php` or use [apporder](https://apps.nextcloud.com/apps/apporder)
|
||||||
|
|
||||||
## Upgrading Nextcloud apps
|
## Upgrading Nextcloud
|
||||||
|
Upgrading Nextcloud can be a hair raising experiance. They [don't support downgrading](https://docs.nextcloud.com/server/latest/admin_manual/maintenance/upgrade.html) even for minor versions.
|
||||||
|
|
||||||
|
Many of us have found that jumping major versions when upgrading is also a bad idea. We have however found that it's ok to skip minor version upgrades and go to the last minor version before a major version (e.g. 24.0.0 to 24.9.9 before going to 25.0.0). To extra cautious just upgrade one release at a time. Read the release notes and check your logs.
|
||||||
|
|
||||||
|
## Upgrading Nextcloud apps (plug-ins)
|
||||||
|
|
||||||
`abra app cmd <app-name> app run_occ '"app:update --all"'`
|
`abra app cmd <app-name> app run_occ '"app:update --all"'`
|
||||||
|
|
||||||
@ -244,3 +248,49 @@ docker exec -u www-data $(docker ps -f name=foo_com_app -q) ./occ preview:pre-ge
|
|||||||
```
|
```
|
||||||
|
|
||||||
This app will improve performance of image browsing at the cost of storage space.
|
This app will improve performance of image browsing at the cost of storage space.
|
||||||
|
|
||||||
|
## Fulltextsearch using elasticsearch
|
||||||
|
|
||||||
|
1. Uncomment the following lines in your env file:
|
||||||
|
```
|
||||||
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.fulltextsearch.yml"
|
||||||
|
#SECRET_ELASTICSEARCH_PASSWORD_VERSION=v1
|
||||||
|
```
|
||||||
|
|
||||||
|
2. Generate the secret for elasticsearch:
|
||||||
|
```bash
|
||||||
|
abra app secret generate <domain> elasticsearch_password v1
|
||||||
|
```
|
||||||
|
|
||||||
|
3. Deploy your app:
|
||||||
|
```bash
|
||||||
|
abra app deploy <domain>
|
||||||
|
```
|
||||||
|
|
||||||
|
4. Install the apps and configure them:
|
||||||
|
```
|
||||||
|
abra app cmd <domain> app install_fulltextsearch
|
||||||
|
```
|
||||||
|
|
||||||
|
5. You might need to configure the files_fulltextsearch app. run this command to check its settings:
|
||||||
|
```
|
||||||
|
abra app cmd <domain> app run_occ '"config:list files_fulltextsearch"
|
||||||
|
```
|
||||||
|
|
||||||
|
6. You can check if the nextcloud can connect to elasticsearch:
|
||||||
|
```
|
||||||
|
abra app cmd <domain> app run_occ '"fulltextsearch:test"'
|
||||||
|
```
|
||||||
|
|
||||||
|
And you can populate the index manually and check if any errors occur:
|
||||||
|
```
|
||||||
|
abra app cmd <domain> app run_occ '"fulltextsearch:index"'
|
||||||
|
```
|
||||||
|
|
||||||
|
### Troubleshooting fulltextsearch
|
||||||
|
|
||||||
|
The fulltextsearch plugin might be stuck with this error: "Index is already running". In that case the following command can get things runing again:
|
||||||
|
|
||||||
|
```
|
||||||
|
abra app run <domain> db /bin/sh -- -c 'echo "delete from oc_fulltextsearch_ticks;" | mariadb -u root -p$(cat /run/secrets/db_root_password) nextcloud'
|
||||||
|
```
|
||||||
|
66
abra.sh
66
abra.sh
@ -1,9 +1,12 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
export FPM_TUNE_VERSION=v5
|
export FPM_TUNE_VERSION=v5
|
||||||
export NGINX_CONF_VERSION=v4
|
export NGINX_CONF_VERSION=v7
|
||||||
export MY_CNF_VERSION=v4
|
export MY_CNF_VERSION=v5
|
||||||
export ENTRYPOINT_VERSION=v3
|
export ENTRYPOINT_VERSION=v3
|
||||||
|
export ENTRYPOINT_WHITEBOARD_VERSION=v1
|
||||||
|
export CRONTAB_VERSION=v1
|
||||||
|
export PG_BACKUP_VERSION=v2
|
||||||
|
|
||||||
run_occ() {
|
run_occ() {
|
||||||
su -p www-data -s /bin/sh -c "/var/www/html/occ $@"
|
su -p www-data -s /bin/sh -c "/var/www/html/occ $@"
|
||||||
@ -51,6 +54,27 @@ set_logfile_stdout() {
|
|||||||
set_system_config logfile '/dev/stdout'
|
set_system_config logfile '/dev/stdout'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
customize() {
|
||||||
|
if [ -z "$1" ]
|
||||||
|
then
|
||||||
|
echo "Usage: ... customize <assets_path>"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
asset_dir=$1
|
||||||
|
for asset in $COPY_ASSETS; do
|
||||||
|
source=$(echo $asset | cut -d "|" -f1)
|
||||||
|
target=$(echo $asset | cut -d "|" -f2)
|
||||||
|
echo copy $source to $target
|
||||||
|
abra app cp $APP_NAME $asset_dir/$source $target
|
||||||
|
done
|
||||||
|
|
||||||
|
abra app cmd -T $APP_NAME app set_app_config theming color \"$THEMING_COLOR\"
|
||||||
|
abra app cmd -T $APP_NAME app set_app_config theming slogan \"$THEMING_SLOGAN\"
|
||||||
|
abra app cmd -T $APP_NAME app run_occ '"theming:config background \"/var/www/html/themes/flow_background.jpg\""'
|
||||||
|
abra app cmd -T $APP_NAME app run_occ '"theming:config logo \"/var/www/html/themes/icon_left_brand.svg\""'
|
||||||
|
abra app cmd -T $APP_NAME app run_occ '"theming:config logoheader \"/var/www/html/themes/icon.png\""'
|
||||||
|
}
|
||||||
|
|
||||||
install_bbb() {
|
install_bbb() {
|
||||||
install_apps bbb
|
install_apps bbb
|
||||||
set_app_config bbb app.navigation true
|
set_app_config bbb app.navigation true
|
||||||
@ -70,6 +94,23 @@ install_collabora() {
|
|||||||
set_app_config richdocuments wopi_url "$COLLABORA_URL"
|
set_app_config richdocuments wopi_url "$COLLABORA_URL"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
install_whiteboard() {
|
||||||
|
install_apps whiteboard
|
||||||
|
set_app_config whiteboard collabBackendUrl "https://${DOMAIN}/whiteboard"
|
||||||
|
set_app_config whiteboard jwt_secret_key "$(cat /run/secrets/whiteboard_jwt)"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
install_fulltextsearch() {
|
||||||
|
install_apps fulltextsearch
|
||||||
|
install_apps fulltextsearch_elasticsearch
|
||||||
|
install_apps files_fulltextsearch
|
||||||
|
set_app_config fulltextsearch search_platform "OCA\\FullTextSearch_Elasticsearch\\Platform\\ElasticSearchPlatform"
|
||||||
|
set_app_config fulltextsearch_elasticsearch elastic_host "http://elastic:$(cat /run/secrets/elasticsearch_password)@elasticsearch:9200/"
|
||||||
|
set_app_config fulltextsearch_elasticsearch elastic_index "nextcloud"
|
||||||
|
set_app_config files_fulltextsearch files_local "1"
|
||||||
|
}
|
||||||
|
|
||||||
set_default_quota() {
|
set_default_quota() {
|
||||||
set_app_config files default_quota "$DEFAULT_QUOTA"
|
set_app_config files default_quota "$DEFAULT_QUOTA"
|
||||||
}
|
}
|
||||||
@ -78,6 +119,7 @@ set_authentik() {
|
|||||||
install_apps sociallogin
|
install_apps sociallogin
|
||||||
AUTHENTIK_SECRET=$(cat /run/secrets/authentik_secret)
|
AUTHENTIK_SECRET=$(cat /run/secrets/authentik_secret)
|
||||||
AUTHENTIK_ID=$(cat /run/secrets/authentik_id)
|
AUTHENTIK_ID=$(cat /run/secrets/authentik_id)
|
||||||
|
set_system_config logo_url https://$AUTHENTIK_DOMAIN
|
||||||
set_app_config sociallogin custom_providers "
|
set_app_config sociallogin custom_providers "
|
||||||
{
|
{
|
||||||
\"custom_oidc\":[
|
\"custom_oidc\":[
|
||||||
@ -88,7 +130,7 @@ set_authentik() {
|
|||||||
\"tokenUrl\": \"https://$AUTHENTIK_DOMAIN/application/o/token/\",
|
\"tokenUrl\": \"https://$AUTHENTIK_DOMAIN/application/o/token/\",
|
||||||
\"displayNameClaim\":\"preferred_username\",
|
\"displayNameClaim\":\"preferred_username\",
|
||||||
\"userInfoUrl\": \"https://$AUTHENTIK_DOMAIN/application/o/userinfo/\",
|
\"userInfoUrl\": \"https://$AUTHENTIK_DOMAIN/application/o/userinfo/\",
|
||||||
\"logoutUrl\": \"https://$AUTHENTIK_DOMAIN/if/session-end/nextcloud/\",
|
\"logoutUrl\": \"https://$AUTHENTIK_DOMAIN/application/o/nextcloud/end-session/\",
|
||||||
\"clientId\":\"$AUTHENTIK_ID\",
|
\"clientId\":\"$AUTHENTIK_ID\",
|
||||||
\"clientSecret\":\"$AUTHENTIK_SECRET\",
|
\"clientSecret\":\"$AUTHENTIK_SECRET\",
|
||||||
\"scope\":\"openid profile email nextcloud\",
|
\"scope\":\"openid profile email nextcloud\",
|
||||||
@ -110,3 +152,21 @@ set_authentik() {
|
|||||||
run_occ 'config:system:set allow_user_to_change_display_name --value=false'
|
run_occ 'config:system:set allow_user_to_change_display_name --value=false'
|
||||||
run_occ 'config:system:set lost_password_link --value=disabled'
|
run_occ 'config:system:set lost_password_link --value=disabled'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
disable_skeletondirectory() {
|
||||||
|
run_occ "config:system:set skeletondirectory --value ''"
|
||||||
|
}
|
||||||
|
|
||||||
|
set_windowsfriendly_filenames() {
|
||||||
|
run_occ 'config:system:set forbidden_filename_characters 0 --value=?'
|
||||||
|
run_occ 'config:system:set forbidden_filename_characters 1 --value=\<'
|
||||||
|
run_occ 'config:system:set forbidden_filename_characters 2 --value=\>'
|
||||||
|
run_occ 'config:system:set forbidden_filename_characters 3 --value=:'
|
||||||
|
run_occ 'config:system:set forbidden_filename_characters 4 --value=*'
|
||||||
|
run_occ 'config:system:set forbidden_filename_characters 5 --value=\|'
|
||||||
|
run_occ 'config:system:set forbidden_filename_characters 6 --value=\"'
|
||||||
|
}
|
||||||
|
|
||||||
|
upgrade_mariadb() {
|
||||||
|
mariadb-upgrade -p`cat /run/secrets/db_root_password`
|
||||||
|
}
|
24
alaconnect.yml
Normal file
24
alaconnect.yml
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
authentik:
|
||||||
|
uncomment:
|
||||||
|
- compose.authentik.yml
|
||||||
|
- AUTHENTIK_USER_PREFIX
|
||||||
|
- AUTHENTIK_DOMAIN
|
||||||
|
- SECRET_AUTHENTIK_SECRET_VERSION
|
||||||
|
- SECRET_AUTHENTIK_ID_VERSION
|
||||||
|
initial-hooks:
|
||||||
|
- app set_authentik
|
||||||
|
shared_secrets:
|
||||||
|
nextcloud_secret: authentik_secret
|
||||||
|
nextcloud_id: authentik_id
|
||||||
|
onlyoffice:
|
||||||
|
uncomment:
|
||||||
|
- compose.onlyoffice.yml
|
||||||
|
- ONLYOFFICE_URL
|
||||||
|
- SECRET_ONLYOFFICE_JWT_VERSION
|
||||||
|
initial-hooks:
|
||||||
|
- app install_onlyoffice
|
||||||
|
collabora:
|
||||||
|
uncomment:
|
||||||
|
- COLLABORA_URL
|
||||||
|
initial-hooks:
|
||||||
|
- app install_collabora
|
12
compose.bbb.yml
Normal file
12
compose.bbb.yml
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
version: "3.8"
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
secrets:
|
||||||
|
- bbb_secret
|
||||||
|
environment:
|
||||||
|
- BBB_URL
|
||||||
|
|
||||||
|
secrets:
|
||||||
|
bbb_secret:
|
||||||
|
external: true
|
||||||
|
name: ${STACK_NAME}_bbb_secret_${SECRET_BBB_SECRET_VERSION}
|
55
compose.fulltextsearch.yml
Normal file
55
compose.fulltextsearch.yml
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
version: "3.8"
|
||||||
|
|
||||||
|
services:
|
||||||
|
elasticsearch:
|
||||||
|
image: "docker.elastic.co/elasticsearch/elasticsearch:8.17.2"
|
||||||
|
environment:
|
||||||
|
- cluster.name=docker-cluster
|
||||||
|
- bootstrap.memory_lock=true
|
||||||
|
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
|
||||||
|
- discovery.type=single-node
|
||||||
|
# Disable authentication and ssl completely
|
||||||
|
# - xpack.security.enabled=false
|
||||||
|
# Use this to enable Basic Authentication:
|
||||||
|
- xpack.security.enabled=true
|
||||||
|
- xpack.security.http.ssl.enabled=false
|
||||||
|
- ELASTIC_PASSWORD_FILE=/var/run/secrets/elasticsearch_password
|
||||||
|
ulimits:
|
||||||
|
memlock:
|
||||||
|
soft: -1
|
||||||
|
hard: -1
|
||||||
|
volumes:
|
||||||
|
- elasticsearch:/usr/share/elasticsearch/data
|
||||||
|
networks:
|
||||||
|
- internal
|
||||||
|
secrets:
|
||||||
|
- source: elasticsearch_password
|
||||||
|
uid: "1000"
|
||||||
|
gid: "1000"
|
||||||
|
mode: 0600
|
||||||
|
|
||||||
|
searchindexer:
|
||||||
|
image: nextcloud:30.0.6-fpm
|
||||||
|
volumes:
|
||||||
|
- nextcloud:/var/www/html/
|
||||||
|
- nextapps:/var/www/html/custom_apps:cached
|
||||||
|
- nextdata:/var/www/html/data:cached
|
||||||
|
- nextconfig:/var/www/html/config:cached
|
||||||
|
- ${EXTRA_VOLUME}
|
||||||
|
networks:
|
||||||
|
- internal
|
||||||
|
entrypoint: su -p www-data -s /bin/sh -c '/var/www/html/occ fulltextsearch:live'
|
||||||
|
|
||||||
|
# Add the secret to the app service so it is avaiable in the
|
||||||
|
# install_fulltextsearch command
|
||||||
|
app:
|
||||||
|
secrets:
|
||||||
|
- elasticsearch_password
|
||||||
|
|
||||||
|
secrets:
|
||||||
|
elasticsearch_password:
|
||||||
|
external: true
|
||||||
|
name: ${STACK_NAME}_elasticsearch_password_${SECRET_ELASTICSEARCH_PASSWORD_VERSION}
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
elasticsearch:
|
@ -9,12 +9,13 @@ services:
|
|||||||
- MYSQL_PASSWORD_FILE=/run/secrets/db_password
|
- MYSQL_PASSWORD_FILE=/run/secrets/db_password
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: "mariadb:10.5"
|
image: "mariadb:11.4"
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_DATABASE=nextcloud
|
- MYSQL_DATABASE=nextcloud
|
||||||
- MYSQL_USER=nextcloud
|
- MYSQL_USER=nextcloud
|
||||||
- MYSQL_PASSWORD_FILE=/run/secrets/db_password
|
- MYSQL_PASSWORD_FILE=/run/secrets/db_password
|
||||||
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
|
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
|
||||||
|
- MAX_DB_CONNECTIONS=${MAX_DB_CONNECTIONS:-100}
|
||||||
configs:
|
configs:
|
||||||
- source: my_tune
|
- source: my_tune
|
||||||
target: /etc/mysql/conf.d/my-tune.cnf
|
target: /etc/mysql/conf.d/my-tune.cnf
|
||||||
@ -27,12 +28,11 @@ services:
|
|||||||
- internal
|
- internal
|
||||||
deploy:
|
deploy:
|
||||||
labels:
|
labels:
|
||||||
backupbot.backup: "true"
|
backupbot.backup.pre-hook: 'mariadb-dump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" nextcloud > /var/lib/mysql/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.volumes.mariadb.path: "backup.sql"
|
||||||
backupbot.backup.post-hook: "rm -rf /var/lib/mysql/backup.sql"
|
backupbot.restore.post-hook: 'mariadb -u root -p"$$(cat /run/secrets/db_root_password)" nextcloud < /var/lib/mysql/backup.sql'
|
||||||
backupbot.backup.path: "/var/lib/mysql/backup.sql"
|
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", 'mysqladmin -p"$$(cat /run/secrets/db_root_password)" ping']
|
test: ["CMD-SHELL", 'mariadb-admin -p"$$(cat /run/secrets/db_root_password)" ping']
|
||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 10
|
retries: 10
|
||||||
@ -41,6 +41,12 @@ configs:
|
|||||||
my_tune:
|
my_tune:
|
||||||
name: ${STACK_NAME}_my_cnf_${MY_CNF_VERSION}
|
name: ${STACK_NAME}_my_cnf_${MY_CNF_VERSION}
|
||||||
file: my-tune.cnf
|
file: my-tune.cnf
|
||||||
|
template_driver: golang
|
||||||
|
|
||||||
|
secrets:
|
||||||
|
db_root_password:
|
||||||
|
external: true
|
||||||
|
name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
mariadb:
|
mariadb:
|
||||||
|
@ -3,16 +3,10 @@ services:
|
|||||||
app:
|
app:
|
||||||
secrets:
|
secrets:
|
||||||
- onlyoffice_jwt
|
- onlyoffice_jwt
|
||||||
- bbb_secret
|
|
||||||
environment:
|
environment:
|
||||||
- APPS
|
|
||||||
- ONLYOFFICE_URL
|
- ONLYOFFICE_URL
|
||||||
- BBB_URL
|
|
||||||
|
|
||||||
secrets:
|
secrets:
|
||||||
onlyoffice_jwt:
|
onlyoffice_jwt:
|
||||||
external: true
|
external: true
|
||||||
name: ${STACK_NAME}_onlyoffice_jwt_${SECRET_ONLYOFFICE_JWT_VERSION}
|
name: ${STACK_NAME}_onlyoffice_jwt_${SECRET_ONLYOFFICE_JWT_VERSION}
|
||||||
bbb_secret:
|
|
||||||
external: true
|
|
||||||
name: ${STACK_NAME}_bbb_secret_${SECRET_BBB_SECRET_VERSION}
|
|
@ -10,7 +10,8 @@ services:
|
|||||||
- NEXTCLOUD_UPDATE=1
|
- NEXTCLOUD_UPDATE=1
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: "postgres:12"
|
image: "postgres:13"
|
||||||
|
command: -c "max_connections=${MAX_DB_CONNECTIONS:-100}"
|
||||||
volumes:
|
volumes:
|
||||||
- "postgres:/var/lib/postgresql/data"
|
- "postgres:/var/lib/postgresql/data"
|
||||||
networks:
|
networks:
|
||||||
@ -28,10 +29,18 @@ services:
|
|||||||
retries: 5
|
retries: 5
|
||||||
deploy:
|
deploy:
|
||||||
labels:
|
labels:
|
||||||
backupbot.backup: "true"
|
backupbot.backup.pre-hook: "/pg_backup.sh backup"
|
||||||
backupbot.backup.pre-hook: "PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /var/lib/postgresql/data/backup.sql"
|
backupbot.backup.volumes.postgres.path: "backup.sql"
|
||||||
backupbot.backup.post-hook: "rm -rf /var/lib/postgresql/data/backup.sql"
|
backupbot.restore.post-hook: '/pg_backup.sh restore'
|
||||||
backupbot.backup.path: "/var/lib/postgresql/data/"
|
configs:
|
||||||
|
- source: pg_backup
|
||||||
|
target: /pg_backup.sh
|
||||||
|
mode: 0555
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
postgres:
|
postgres:
|
||||||
|
|
||||||
|
configs:
|
||||||
|
pg_backup:
|
||||||
|
name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION}
|
||||||
|
file: pg_backup.sh
|
||||||
|
44
compose.whiteboard.yml
Normal file
44
compose.whiteboard.yml
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
version: "3.8"
|
||||||
|
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
secrets:
|
||||||
|
- whiteboard_jwt
|
||||||
|
|
||||||
|
whiteboard:
|
||||||
|
image: ghcr.io/nextcloud-releases/whiteboard:v1.0.5
|
||||||
|
deploy:
|
||||||
|
labels:
|
||||||
|
- traefik.enable=true
|
||||||
|
- traefik.docker.network=proxy
|
||||||
|
- traefik.http.services.${STACK_NAME}_whiteboard.loadbalancer.server.port=3002
|
||||||
|
- traefik.http.routers.${STACK_NAME}_whiteboard.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS}) && PathPrefix(`/whiteboard`)
|
||||||
|
- traefik.http.routers.${STACK_NAME}_whiteboard.entrypoints=web-secure
|
||||||
|
- traefik.http.routers.${STACK_NAME}_whiteboard.tls.certresolver=${LETS_ENCRYPT_ENV}
|
||||||
|
- traefik.http.middlewares.${STACK_NAME}_whiteboard-stripprefix.stripprefix.prefixes=/whiteboard
|
||||||
|
- traefik.http.routers.${STACK_NAME}_whiteboard.middlewares=${STACK_NAME}_whiteboard-stripprefix
|
||||||
|
configs:
|
||||||
|
- source: entrypoint_whiteboard
|
||||||
|
target: /custom-entrypoint.sh
|
||||||
|
entrypoint: ["sh", "/custom-entrypoint.sh"]
|
||||||
|
user: root
|
||||||
|
networks:
|
||||||
|
- proxy
|
||||||
|
ports:
|
||||||
|
- 3002:3002
|
||||||
|
secrets:
|
||||||
|
- whiteboard_jwt
|
||||||
|
environment:
|
||||||
|
- NEXTCLOUD_URL=https://$DOMAIN
|
||||||
|
- JWT_SECRET_KEY_FILE=/run/secrets/whiteboard_jwt
|
||||||
|
|
||||||
|
secrets:
|
||||||
|
whiteboard_jwt:
|
||||||
|
external: true
|
||||||
|
name: ${STACK_NAME}_whiteboard_jwt_${SECRET_WHITEBOARD_JWT_VERSION}
|
||||||
|
|
||||||
|
configs:
|
||||||
|
entrypoint_whiteboard:
|
||||||
|
name: ${STACK_NAME}_entrypoint_whiteboard_${ENTRYPOINT_WHITEBOARD_VERSION}
|
||||||
|
file: entrypoint.whiteboard.sh.tmpl
|
||||||
|
template_driver: golang
|
26
compose.yml
26
compose.yml
@ -1,7 +1,7 @@
|
|||||||
version: "3.8"
|
version: "3.8"
|
||||||
services:
|
services:
|
||||||
web:
|
web:
|
||||||
image: nginx:1.25.3
|
image: nginx:1.27.4
|
||||||
depends_on:
|
depends_on:
|
||||||
- app
|
- app
|
||||||
configs:
|
configs:
|
||||||
@ -46,7 +46,7 @@ services:
|
|||||||
start_period: 5m
|
start_period: 5m
|
||||||
|
|
||||||
app:
|
app:
|
||||||
image: nextcloud:27.1.3-fpm
|
image: nextcloud:30.0.6-fpm
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
configs:
|
configs:
|
||||||
@ -91,10 +91,12 @@ services:
|
|||||||
failure_action: rollback
|
failure_action: rollback
|
||||||
order: start-first
|
order: start-first
|
||||||
labels:
|
labels:
|
||||||
- "coop-cloud.${STACK_NAME}.version=5.1.0+27.1.3-fpm"
|
- "coop-cloud.${STACK_NAME}.version=11.3.0+30.0.6-fpm"
|
||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||||
- "backupbot.backup=true"
|
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
||||||
- "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/"
|
- "backupbot.backup.volumes.redis=false"
|
||||||
|
#- "backupbot.backup.volumes.nextcloud=false"
|
||||||
|
|
||||||
healthcheck:
|
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"']
|
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
|
interval: 30s
|
||||||
@ -103,7 +105,7 @@ services:
|
|||||||
start_period: 15m
|
start_period: 15m
|
||||||
|
|
||||||
cron:
|
cron:
|
||||||
image: nextcloud:27.1.3-fpm
|
image: nextcloud:30.0.6-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
|
||||||
@ -113,9 +115,13 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
entrypoint: /cron.sh
|
entrypoint: /cron.sh
|
||||||
|
configs:
|
||||||
|
- source: crontab
|
||||||
|
target: /var/spool/cron/crontabs/www-data
|
||||||
|
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
image: redis:7.2.3-alpine
|
image: redis:7.4.2-alpine
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
volumes:
|
volumes:
|
||||||
@ -127,9 +133,6 @@ services:
|
|||||||
retries: 20
|
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_PASSWORD_VERSION}
|
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
|
||||||
@ -158,6 +161,9 @@ configs:
|
|||||||
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
|
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
|
||||||
file: entrypoint.sh.tmpl
|
file: entrypoint.sh.tmpl
|
||||||
template_driver: golang
|
template_driver: golang
|
||||||
|
crontab:
|
||||||
|
name: ${STACK_NAME}_crontab_${CRONTAB_VERSION}
|
||||||
|
file: crontab
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
|
1
crontab
Normal file
1
crontab
Normal file
@ -0,0 +1 @@
|
|||||||
|
*/5 * * * * php -d memory_limit=1G -f /var/www/html/cron.php
|
6
entrypoint.whiteboard.sh.tmpl
Normal file
6
entrypoint.whiteboard.sh.tmpl
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
|
export JWT_SECRET_KEY=$(cat /run/secrets/whiteboard_jwt)
|
||||||
|
|
||||||
|
exec npm run server:start
|
@ -13,7 +13,7 @@ key_buffer_size = 16M
|
|||||||
innodb_log_file_size = 256M
|
innodb_log_file_size = 256M
|
||||||
long_query_time = 1
|
long_query_time = 1
|
||||||
max_allowed_packet = 256M
|
max_allowed_packet = 256M
|
||||||
max_connections = 100
|
max_connections = {{ env "MAX_DB_CONNECTIONS" }}
|
||||||
max_heap_table_size = 64M
|
max_heap_table_size = 64M
|
||||||
max_user_connections = 0
|
max_user_connections = 0
|
||||||
myisam_recover_options = BACKUP
|
myisam_recover_options = BACKUP
|
||||||
|
@ -11,6 +11,10 @@ events {
|
|||||||
|
|
||||||
http {
|
http {
|
||||||
include /etc/nginx/mime.types;
|
include /etc/nginx/mime.types;
|
||||||
|
# See https://github.com/nextcloud/forms/issues/1838#issuecomment-1860497200
|
||||||
|
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" '
|
||||||
@ -59,12 +63,12 @@ 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-Permitted-Cross-Domain-Policies "none" always;
|
||||||
add_header X-Robots-Tag "none" always;
|
add_header X-Robots-Tag "noindex, nofollow" always;
|
||||||
add_header X-XSS-Protection "1; mode=block" always;
|
add_header X-XSS-Protection "1; mode=block" always;
|
||||||
|
|
||||||
{{ if eq (env "X_FRAME_OPTIONS_ENABLED") "1" }}
|
{{ if eq (env "X_FRAME_OPTIONS_ENABLED") "1" }}
|
||||||
add_header Content-Security-Policy "frame-ancestors {{ env "X_FRAME_OPTIONS_ALLOW_FROM" }} {{ env "DOMAIN" }}";
|
add_header Content-Security-Policy "frame-ancestors {{ env "X_FRAME_OPTIONS_ALLOW_FROM" }} {{ env "DOMAIN" }}";
|
||||||
@ -132,6 +136,9 @@ http {
|
|||||||
# then Nginx will encounter an infinite rewriting loop when it prepends `/index.php`
|
# then Nginx will encounter an infinite rewriting loop when it prepends `/index.php`
|
||||||
# to the URI, resulting in a HTTP 500 error response.
|
# to the URI, resulting in a HTTP 500 error response.
|
||||||
location ~ \.php(?:$|/) {
|
location ~ \.php(?:$|/) {
|
||||||
|
# Required for legacy support
|
||||||
|
rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode(_arm64)?\/proxy) /index.php$request_uri;
|
||||||
|
|
||||||
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
|
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
|
||||||
set $path_info $fastcgi_path_info;
|
set $path_info $fastcgi_path_info;
|
||||||
|
|
||||||
|
34
pg_backup.sh
Normal file
34
pg_backup.sh
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
BACKUP_FILE='/var/lib/postgresql/data/backup.sql'
|
||||||
|
|
||||||
|
function backup {
|
||||||
|
export PGPASSWORD=$(cat /run/secrets/db_password)
|
||||||
|
pg_dump -U ${POSTGRES_USER} ${POSTGRES_DB} > $BACKUP_FILE
|
||||||
|
}
|
||||||
|
|
||||||
|
function restore {
|
||||||
|
cd /var/lib/postgresql/data/
|
||||||
|
restore_config(){
|
||||||
|
# Restore allowed connections
|
||||||
|
cat pg_hba.conf.bak > pg_hba.conf
|
||||||
|
su postgres -c 'pg_ctl reload'
|
||||||
|
}
|
||||||
|
# Don't allow any other connections than local
|
||||||
|
cp pg_hba.conf pg_hba.conf.bak
|
||||||
|
echo "local all all trust" > pg_hba.conf
|
||||||
|
su postgres -c 'pg_ctl reload'
|
||||||
|
trap restore_config EXIT INT TERM
|
||||||
|
|
||||||
|
# Recreate Database
|
||||||
|
psql -U ${POSTGRES_USER} -d postgres -c "DROP DATABASE ${POSTGRES_DB} WITH (FORCE);"
|
||||||
|
createdb -U ${POSTGRES_USER} ${POSTGRES_DB}
|
||||||
|
psql -U ${POSTGRES_USER} -d ${POSTGRES_DB} -1 -f $BACKUP_FILE
|
||||||
|
|
||||||
|
trap - EXIT INT TERM
|
||||||
|
restore_config
|
||||||
|
}
|
||||||
|
|
||||||
|
$@
|
1
release/10.0.0+30.0.4-fpm
Normal file
1
release/10.0.0+30.0.4-fpm
Normal file
@ -0,0 +1 @@
|
|||||||
|
https://docs.nextcloud.com/server/latest/admin_manual/release_notes/upgrade_to_30.html
|
4
release/11.0.0+30.0.4-fpm
Normal file
4
release/11.0.0+30.0.4-fpm
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
Upgrades mariadb from 10.5 to 11.4
|
||||||
|
NOTE: If your Nextcloud instance is using mariadb, after running this update you MUST run the database upgrade command:
|
||||||
|
`abra app command nextcloud.yourserver.org db upgrade_mariadb`
|
||||||
|
More info: https://mariadb.com/kb/en/upgrading-from-mariadb-10-11-to-mariadb-11-4/
|
1
release/8.0.0+29.0.1-fpm
Normal file
1
release/8.0.0+29.0.1-fpm
Normal file
@ -0,0 +1 @@
|
|||||||
|
BREAKING CHANGE: compose.apps.yml is now split for bbb and onlyoffice, configs must be updated
|
1
release/9.1.0+29.0.5-fpm
Normal file
1
release/9.1.0+29.0.5-fpm
Normal file
@ -0,0 +1 @@
|
|||||||
|
Added automated customization options. Config needs to be updated to be able to use it.
|
Loading…
x
Reference in New Issue
Block a user