Compare commits

...

33 Commits

Author SHA1 Message Date
6b79ac67c1 chore: publish 9.1.0+29.0.5-fpm release 2024-09-30 16:21:02 +02:00
a5bb4e9252 fix function 2024-09-30 14:10:40 +02:00
514c313a94 Merge branch 'add-theming' of ssh://git.coopcloud.tech:2222/coop-cloud/nextcloud into add-theming 2024-09-30 14:07:44 +02:00
a537d0797f fix function 2024-09-30 14:07:38 +02:00
97dffc3d3e set logo url 2024-09-30 11:35:57 +02:00
4878c76065 2024-09-27 22:18:37 +02:00
c94ffed09d chore: publish 9.0.0+29.0.5-fpm release 2024-08-26 18:11:43 +01:00
7a863573c9 Merge pull request 'add abra command for disabling the skeleton directory' (#42) from Apfelwurm/nextcloud:main into main
Reviewed-on: coop-cloud/nextcloud#42
Reviewed-by: decentral1se <decentral1se@noreply.git.coopcloud.tech>
2024-07-21 15:56:43 +00:00
c930bbcf56 chore: publish 8.0.1+29.0.3-fpm release 2024-07-19 18:51:54 +02:00
a13e7a509c add abra command for disabling the skeleton directory 2024-07-19 17:58:06 +02:00
0f9aba3e9e alaconnect: replace 'execute' with 'initial-hooks' 2024-07-15 13:57:58 +02:00
eb3e2486ce chore: publish 8.0.0+29.0.1-fpm release 2024-06-19 18:53:22 +02:00
2b4e63ef31 Reapply "split bbb and onlyoffice compose.yml"
This reverts commit 180c269337.
2024-06-19 18:36:05 +02:00
c056687849 chore: publish 7.0.3+29.0.1-fpm release 2024-06-19 18:35:19 +02:00
180c269337 Revert "split bbb and onlyoffice compose.yml"
This reverts commit 9be859db25.
Accidentally introduced a breaking change into a patch release
2024-06-19 18:34:02 +02:00
7eea2e0785 chore: publish 7.0.2+29.0.1-fpm release 2024-06-19 16:42:46 +02:00
be915272b4 fix multi-file downloads, see https://github.com/nextcloud/server/issues/42617#issuecomment-1881958718 2024-06-19 16:41:55 +02:00
9be859db25 split bbb and onlyoffice compose.yml 2024-06-19 15:40:27 +02:00
97e1d72604 Revert "wip split config"
This reverts commit 8a1fae2bac.
2024-06-14 16:00:14 +02:00
8a1fae2bac wip split config 2024-06-06 17:14:50 +02:00
3wc
ce817e3928 chore: publish 7.0.1+29.0.1-fpm release 2024-06-01 15:05:05 -05:00
7a64d3c6a7 add alakazam integration file alaconnect.yml 2024-05-13 17:30:26 +02:00
3wc
bb781e654b chore: publish 7.0.0+29.0.0-fpm release 2024-05-12 14:08:32 -03:00
cb5cd5f7b2 fix release note 5.0.1+27.0.1-fpm 2024-05-08 11:05:05 +02:00
3wc
0a3e943b26 chore: publish 6.0.4+28.0.5-fpm release 2024-05-07 19:31:54 -03:00
3wc
4f1aaf5d1d Increase memory limit for cron
Re coop-cloud/nextcloud#41
2024-05-07 19:30:49 -03:00
3wc
019b71fde1 chore: publish 6.0.3+28.0.5-fpm release 2024-05-07 15:18:19 -03:00
3wc
7527399da0 Add mjs as a mimetype for javascript 2024-05-07 15:18:19 -03:00
3wc
94e84122ed chore: publish 6.0.2+28.0.5-fpm release 2024-05-07 15:18:19 -03:00
0d9ab936a0 fulltextsearch: rename and update image 2024-05-07 15:18:19 -03:00
09ec6f842c update to 28.0.5 2024-04-30 15:50:17 +02:00
3wc
b5d40aa428 Update metadata 2024-03-30 15:48:50 -03:00
eead80b60a add env MAX_DB_CONNECTIONS to set the database connection limit 2024-02-27 09:47:26 +01:00
16 changed files with 118 additions and 31 deletions

View File

@ -11,6 +11,8 @@ COMPOSE_FILE="compose.yml"
COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
#COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml"
#MAX_DB_CONNECTIONS=500
ADMIN_USER=admin
SECRET_DB_ROOT_PASSWORD_VERSION=v1
@ -42,26 +44,35 @@ DEFAULT_QUOTA="10 GB"
# 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
#
## Customization
# THEMING_COLOR=
# THEMING_SLOGAN=
# COPY_ASSETS="flow_background.jpg|app:/var/www/html/themes/background.jpg"
# COPY_ASSETS="$COPY_ASSETS icon_left_brand.svg|app:/var/www/html/themes/logo.svg"
# COPY_ASSETS="$COPY_ASSETS icon.png|app:/web/dist/assets/icons/icon.png"
# APPS="calendar"
# 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!
# 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"
# APPS="$APPS sociallogin"
# AUTHENTIK_USER_PREFIX=authentik
# AUTHENTIK_DOMAIN=authentik.example.com
# SECRET_AUTHENTIK_SECRET_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

View File

@ -6,10 +6,10 @@ Fully automated luxury Nextcloud via docker-swarm.
<!-- metadata -->
* **Category**: Apps
* **Status**: 2, beta
* **Status**: 5
* **Image**: [`nextcloud`](https://hub.docker.com/_/nextcloud), 4, upstream
* **Healthcheck**: Yes
* **Backups**: No
* **Backups**: Yes
* **Email**: 3
* **Tests**: 2
* **SSO**: 1 (OAuth)
@ -17,7 +17,6 @@ Fully automated luxury Nextcloud via docker-swarm.
## Quick start
* `abra app new nextcloud`
* `abra app config <app-name>`
* `abra app secret insert <app-name> smtp_password v1 <SMTP_PASSWORD>`

31
abra.sh
View File

@ -1,9 +1,10 @@
#!/bin/bash
export FPM_TUNE_VERSION=v5
export NGINX_CONF_VERSION=v5
export MY_CNF_VERSION=v4
export NGINX_CONF_VERSION=v7
export MY_CNF_VERSION=v5
export ENTRYPOINT_VERSION=v3
export CRONTAB_VERSION=v1
run_occ() {
su -p www-data -s /bin/sh -c "/var/www/html/occ $@"
@ -51,6 +52,27 @@ set_logfile_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_apps bbb
set_app_config bbb app.navigation true
@ -88,6 +110,7 @@ set_authentik() {
install_apps sociallogin
AUTHENTIK_SECRET=$(cat /run/secrets/authentik_secret)
AUTHENTIK_ID=$(cat /run/secrets/authentik_id)
set_system_config logo_url https://$AUTHENTIK_DOMAIN
set_app_config sociallogin custom_providers "
{
\"custom_oidc\":[
@ -120,3 +143,7 @@ set_authentik() {
run_occ 'config:system:set allow_user_to_change_display_name --value=false'
run_occ 'config:system:set lost_password_link --value=disabled'
}
disable_skeletondirectory() {
run_occ "config:system:set skeletondirectory --value ''"
}

24
alaconnect.yml Normal file
View 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
View 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}

View File

@ -2,7 +2,7 @@ version: "3.8"
services:
elasticsearch:
image: "docker.elastic.co/elasticsearch/elasticsearch:8.11.3"
image: "docker.elastic.co/elasticsearch/elasticsearch:8.15.0"
environment:
- cluster.name=docker-cluster
- bootstrap.memory_lock=true
@ -29,7 +29,7 @@ services:
mode: 0600
searchindexer:
image: nextcloud:27.1.3-fpm
image: nextcloud:29.0.5-fpm
volumes:
- nextcloud:/var/www/html/
- nextapps:/var/www/html/custom_apps:cached

View File

@ -15,6 +15,7 @@ services:
- MYSQL_USER=nextcloud
- MYSQL_PASSWORD_FILE=/run/secrets/db_password
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
- MAX_DB_CONNECTIONS=${MAX_DB_CONNECTIONS:-100}
configs:
- source: my_tune
target: /etc/mysql/conf.d/my-tune.cnf
@ -41,6 +42,7 @@ configs:
my_tune:
name: ${STACK_NAME}_my_cnf_${MY_CNF_VERSION}
file: my-tune.cnf
template_driver: golang
secrets:
db_root_password:

View File

@ -3,16 +3,10 @@ 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}

View File

@ -10,7 +10,8 @@ services:
- NEXTCLOUD_UPDATE=1
db:
image: "postgres:12"
image: "postgres:13"
command: -c "max_connections=${MAX_DB_CONNECTIONS:-100}"
volumes:
- "postgres:/var/lib/postgresql/data"
networks:

View File

@ -1,7 +1,7 @@
version: "3.8"
services:
web:
image: nginx:1.25.3
image: nginx:1.27.1
depends_on:
- app
configs:
@ -46,7 +46,7 @@ services:
start_period: 5m
app:
image: nextcloud:28.0.2-fpm
image: nextcloud:29.0.5-fpm
depends_on:
- db
configs:
@ -91,7 +91,7 @@ services:
failure_action: rollback
order: start-first
labels:
- "coop-cloud.${STACK_NAME}.version=6.0.1+28.0.2-fpm"
- "coop-cloud.${STACK_NAME}.version=9.1.0+29.0.5-fpm"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
- "backupbot.backup=true"
- "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/"
@ -103,7 +103,7 @@ services:
start_period: 15m
cron:
image: nextcloud:28.0.2-fpm
image: nextcloud:29.0.5-fpm
volumes:
- nextcloud:/var/www/html/
- nextapps:/var/www/html/custom_apps:cached
@ -113,9 +113,13 @@ services:
networks:
- internal
entrypoint: /cron.sh
configs:
- source: crontab
target: /var/spool/cron/crontabs/www-data
cache:
image: redis:7.2.4-alpine
image: redis:7.4.0-alpine
networks:
- internal
volumes:
@ -155,6 +159,9 @@ configs:
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
file: entrypoint.sh.tmpl
template_driver: golang
crontab:
name: ${STACK_NAME}_crontab_${CRONTAB_VERSION}
file: crontab
networks:
proxy:

1
crontab Normal file
View File

@ -0,0 +1 @@
*/5 * * * * php -d memory_limit=1G -f /var/www/html/cron.php

View File

@ -13,7 +13,7 @@ key_buffer_size = 16M
innodb_log_file_size = 256M
long_query_time = 1
max_allowed_packet = 256M
max_connections = 100
max_connections = {{ env "MAX_DB_CONNECTIONS" }}
max_heap_table_size = 64M
max_user_connections = 0
myisam_recover_options = BACKUP

View File

@ -11,6 +11,10 @@ events {
http {
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;
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
@ -132,6 +136,9 @@ http {
# then Nginx will encounter an infinite rewriting loop when it prepends `/index.php`
# to the URI, resulting in a HTTP 500 error response.
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)(/.*)$;
set $path_info $fastcgi_path_info;

1
release/8.0.0+29.0.1-fpm Normal file
View 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
View File

@ -0,0 +1 @@
Added automated customization options. Config needs to be updated to be able to use it.