From 04abdbed9e5e8f2cc28ae15f09a127331e42dcf8 Mon Sep 17 00:00:00 2001 From: szaimen Date: Mon, 5 Sep 2022 12:19:49 +0000 Subject: [PATCH] Yaml updates Signed-off-by: GitHub --- manual-install/latest-arm64.yml | 34 +++++++++++++++++++++++++++++++ manual-install/latest.yml | 36 ++++++++++++++++++++++++++++++++- manual-install/sample.conf | 4 ++++ 3 files changed, 73 insertions(+), 1 deletion(-) diff --git a/manual-install/latest-arm64.yml b/manual-install/latest-arm64.yml index 7649fe38..a9753125 100644 --- a/manual-install/latest-arm64.yml +++ b/manual-install/latest-arm64.yml @@ -47,6 +47,8 @@ services: depends_on: - nextcloud-aio-database - nextcloud-aio-redis + - nextcloud-aio-fulltextsearch + - nextcloud-aio-imaginary image: nextcloud/aio-nextcloud:latest-arm64 volumes: - nextcloud_aio_nextcloud:/var/www/html:rw @@ -76,6 +78,12 @@ services: - UPDATE_NEXTCLOUD_APPS=${UPDATE_NEXTCLOUD_APPS} - TZ=${TIMEZONE} - TALK_PORT=${TALK_PORT} + - IMAGINARY_ENABLED=${IMAGINARY_ENABLED} + - IMAGINARY_HOST=nextcloud-aio-imaginary + - PHP_UPLOAD_LIMIT=${NEXTCLOUD_UPLOAD_LIMIT} + - FULLTEXTSEARCH_ENABLED=${FULLTEXTSEARCH_ENABLED} + - FULLTEXTSEARCH_HOST=nextcloud-aio-fulltextsearch + - PHP_MAX_TIME=${NEXTCLOUD_MAX_TIME} stop_grace_period: 10s restart: unless-stopped networks: @@ -123,6 +131,30 @@ services: networks: - nextcloud-aio + nextcloud-aio-imaginary: + container_name: nextcloud-aio-imaginary + image: nextcloud/aio-imaginary:latest-arm64 + environment: + - TZ=${TIMEZONE} + stop_grace_period: 10s + restart: unless-stopped + networks: + - nextcloud-aio + + nextcloud-aio-fulltextsearch: + container_name: nextcloud-aio-fulltextsearch + image: nextcloud/aio-fulltextsearch:latest-arm64 + environment: + - TZ=${TIMEZONE} + - discovery.type=single-node + - ES_JAVA_OPTS=-Xms1024M -Xmx1024M + volumes: + - nextcloud_aio_elasticsearch:/usr/share/elasticsearch/data:rw + stop_grace_period: 10s + restart: unless-stopped + networks: + - nextcloud-aio + volumes: nextcloud_aio_apache: name: nextcloud_aio_apache @@ -130,6 +162,8 @@ volumes: name: nextcloud_aio_database nextcloud_aio_database_dump: name: nextcloud_aio_database_dump + nextcloud_aio_elasticsearch: + name: nextcloud_aio_elasticsearch nextcloud_aio_nextcloud: name: nextcloud_aio_nextcloud nextcloud_aio_nextcloud_data: diff --git a/manual-install/latest.yml b/manual-install/latest.yml index d7ce9797..ee7e220c 100644 --- a/manual-install/latest.yml +++ b/manual-install/latest.yml @@ -6,7 +6,6 @@ services: depends_on: - nextcloud-aio-onlyoffice - nextcloud-aio-collabora - - nextcloud-aio-clamav - nextcloud-aio-talk - nextcloud-aio-nextcloud image: nextcloud/aio-apache:latest @@ -50,6 +49,9 @@ services: depends_on: - nextcloud-aio-database - nextcloud-aio-redis + - nextcloud-aio-clamav + - nextcloud-aio-fulltextsearch + - nextcloud-aio-imaginary image: nextcloud/aio-nextcloud:latest volumes: - nextcloud_aio_nextcloud:/var/www/html:rw @@ -84,6 +86,12 @@ services: - UPDATE_NEXTCLOUD_APPS=${UPDATE_NEXTCLOUD_APPS} - TZ=${TIMEZONE} - TALK_PORT=${TALK_PORT} + - IMAGINARY_ENABLED=${IMAGINARY_ENABLED} + - IMAGINARY_HOST=nextcloud-aio-imaginary + - PHP_UPLOAD_LIMIT=${NEXTCLOUD_UPLOAD_LIMIT} + - FULLTEXTSEARCH_ENABLED=${FULLTEXTSEARCH_ENABLED} + - FULLTEXTSEARCH_HOST=nextcloud-aio-fulltextsearch + - PHP_MAX_TIME=${NEXTCLOUD_MAX_TIME} stop_grace_period: 10s restart: unless-stopped networks: @@ -157,6 +165,30 @@ services: restart: unless-stopped networks: - nextcloud-aio + + nextcloud-aio-imaginary: + container_name: nextcloud-aio-imaginary + image: nextcloud/aio-imaginary:latest + environment: + - TZ=${TIMEZONE} + stop_grace_period: 10s + restart: unless-stopped + networks: + - nextcloud-aio + + nextcloud-aio-fulltextsearch: + container_name: nextcloud-aio-fulltextsearch + image: nextcloud/aio-fulltextsearch:latest + environment: + - TZ=${TIMEZONE} + - discovery.type=single-node + - ES_JAVA_OPTS=-Xms1024M -Xmx1024M + volumes: + - nextcloud_aio_elasticsearch:/usr/share/elasticsearch/data:rw + stop_grace_period: 10s + restart: unless-stopped + networks: + - nextcloud-aio volumes: nextcloud_aio_apache: @@ -167,6 +199,8 @@ volumes: name: nextcloud_aio_database nextcloud_aio_database_dump: name: nextcloud_aio_database_dump + nextcloud_aio_elasticsearch: + name: nextcloud_aio_elasticsearch nextcloud_aio_nextcloud: name: nextcloud_aio_nextcloud nextcloud_aio_onlyoffice: diff --git a/manual-install/sample.conf b/manual-install/sample.conf index 4aadd825..bdaa4780 100644 --- a/manual-install/sample.conf +++ b/manual-install/sample.conf @@ -5,11 +5,15 @@ CLAMAV_ENABLED=no # Setting this to "yes" enables the option in Nextclo COLLABORA_DICTIONARIES=de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru # You can change this in order to enable other dictionaries for collabora COLLABORA_ENABLED=yes # Setting this to "yes" enables the option in Nextcloud automatically. DATABASE_PASSWORD= # TODO! This needs to be a unique and good password! +FULLTEXTSEARCH_ENABLED=no # Setting this to "yes" enables the option in Nextcloud automatically. +IMAGINARY_ENABLED=no # Setting this to "yes" enables the option in Nextcloud automatically. JANUS_API_KEY= # TODO! This needs to be a unique and good password! NC_DOMAIN=yourdomain.com # TODO! Needs to be changed to the domain that you want to use for Nextcloud. NEXTCLOUD_DATADIR=nextcloud_aio_nextcloud_data # You can change this to e.g. "/mnt/ncdata" to map it to a location on your host. It needs to be adjusted before the first startup and never afterwards! +NEXTCLOUD_MAX_TIME=3600 # This allows to change the upload time limit of the Nextcloud container NEXTCLOUD_MOUNT=/mnt/ # This allows the Nextcloud container to access directories on the host. It must never be equal to the value of NEXTCLOUD_DATADIR! NEXTCLOUD_PASSWORD= # TODO! This is the password of the initially created Nextcloud admin with username "admin". +NEXTCLOUD_UPLOAD_LIMIT=10G # This allows to change the upload limit of the Nextcloud container ONLYOFFICE_ENABLED=no # Setting this to "yes" enables the option in Nextcloud automatically. ONLYOFFICE_SECRET= # TODO! This needs to be a unique and good password! REDIS_PASSWORD= # TODO! This needs to be a unique and good password!