From cccf21805ea291812b9d1bcc5d1e4cd851c292d6 Mon Sep 17 00:00:00 2001 From: szaimen Date: Sat, 12 Nov 2022 12:17:20 +0000 Subject: [PATCH] Yaml updates Signed-off-by: GitHub --- manual-install/latest-arm64.yml | 8 ++++++-- manual-install/latest.yml | 8 ++++++-- manual-install/sample.conf | 6 +++++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/manual-install/latest-arm64.yml b/manual-install/latest-arm64.yml index bffb2441..6b6198db 100644 --- a/manual-install/latest-arm64.yml +++ b/manual-install/latest-arm64.yml @@ -58,7 +58,7 @@ services: - nextcloud_aio_nextcloud:/var/www/html:rw - ${NEXTCLOUD_DATADIR}:/mnt/ncdata:rw - ${NEXTCLOUD_MOUNT}:${NEXTCLOUD_MOUNT}:rw - - ${TRUSTED_CACERTS_DIR}:/usr/local/share/ca-certificates:ro + - ${NEXTCLOUD_TRUSTED_CACERTS_DIR}:/usr/local/share/ca-certificates:ro environment: - POSTGRES_HOST=nextcloud-aio-database - POSTGRES_PASSWORD=${DATABASE_PASSWORD} @@ -89,10 +89,14 @@ services: - IMAGINARY_ENABLED=${IMAGINARY_ENABLED} - IMAGINARY_HOST=nextcloud-aio-imaginary - PHP_UPLOAD_LIMIT=${NEXTCLOUD_UPLOAD_LIMIT} + - PHP_MEMORY_LIMIT=${NEXTCLOUD_MEMORY_LIMIT} - FULLTEXTSEARCH_ENABLED=${FULLTEXTSEARCH_ENABLED} - FULLTEXTSEARCH_HOST=nextcloud-aio-fulltextsearch - PHP_MAX_TIME=${NEXTCLOUD_MAX_TIME} - - TRUSTED_CACERTS_DIR=${TRUSTED_CACERTS_DIR} + - TRUSTED_CACERTS_DIR=${NEXTCLOUD_TRUSTED_CACERTS_DIR} + - STARTUP_APPS=${NEXTCLOUD_STARTUP_APPS} + - ADDITIONAL_APKS=${NEXTCLOUD_ADDITIONAL_APKS} + - ADDITIONAL_PHP_EXTENSIONS=${NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS} stop_grace_period: 10s restart: unless-stopped networks: diff --git a/manual-install/latest.yml b/manual-install/latest.yml index 0d652f68..02300f94 100644 --- a/manual-install/latest.yml +++ b/manual-install/latest.yml @@ -59,7 +59,7 @@ services: - nextcloud_aio_nextcloud:/var/www/html:rw - ${NEXTCLOUD_DATADIR}:/mnt/ncdata:rw - ${NEXTCLOUD_MOUNT}:${NEXTCLOUD_MOUNT}:rw - - ${TRUSTED_CACERTS_DIR}:/usr/local/share/ca-certificates:ro + - ${NEXTCLOUD_TRUSTED_CACERTS_DIR}:/usr/local/share/ca-certificates:ro environment: - POSTGRES_HOST=nextcloud-aio-database - POSTGRES_PASSWORD=${DATABASE_PASSWORD} @@ -92,10 +92,14 @@ services: - IMAGINARY_ENABLED=${IMAGINARY_ENABLED} - IMAGINARY_HOST=nextcloud-aio-imaginary - PHP_UPLOAD_LIMIT=${NEXTCLOUD_UPLOAD_LIMIT} + - PHP_MEMORY_LIMIT=${NEXTCLOUD_MEMORY_LIMIT} - FULLTEXTSEARCH_ENABLED=${FULLTEXTSEARCH_ENABLED} - FULLTEXTSEARCH_HOST=nextcloud-aio-fulltextsearch - PHP_MAX_TIME=${NEXTCLOUD_MAX_TIME} - - TRUSTED_CACERTS_DIR=${TRUSTED_CACERTS_DIR} + - TRUSTED_CACERTS_DIR=${NEXTCLOUD_TRUSTED_CACERTS_DIR} + - STARTUP_APPS=${NEXTCLOUD_STARTUP_APPS} + - ADDITIONAL_APKS=${NEXTCLOUD_ADDITIONAL_APKS} + - ADDITIONAL_PHP_EXTENSIONS=${NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS} stop_grace_period: 10s restart: unless-stopped networks: diff --git a/manual-install/sample.conf b/manual-install/sample.conf index d8fc73a6..54ae4aff 100644 --- a/manual-install/sample.conf +++ b/manual-install/sample.conf @@ -11,10 +11,15 @@ FULLTEXTSEARCH_ENABLED=no # Setting this to "yes" enables the option in 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_ADDITIONAL_APKS=imagemagick # This allows to add additional packages to the Nextcloud container permanently. Default is imagemagick but can be overwritten by modifying this value. +NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS=imagick # This allows to add additional php extensions to the Nextcloud container permanently. Default is imagick but can be overwritten by modifying this value. 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_MEMORY_LIMIT=512M # This allows to change the PHP memory 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_STARTUP_APPS=twofactor_totp deck tasks calendar contacts apporder # Allows to modify the Nextcloud apps that are installed on starting AIO the first time +NEXTCLOUD_TRUSTED_CACERTS_DIR=/usr/local/share/ca-certificates/my-custom-ca # Nextcloud container will trust all the Certification Authorities, whose certificates are included in the given directory. 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! @@ -23,6 +28,5 @@ SIGNALING_SECRET= # TODO! This needs to be a unique and good password! TALK_ENABLED=yes # Setting this to "yes" enables the option in Nextcloud automatically. TALK_PORT=3478 # This allows to adjust the port that the talk container is using. TIMEZONE=Europe/Berlin # TODO! This is the timezone that your containers will use. -TRUSTED_CACERTS_DIR=/path/to/my/cacerts # Nextcloud container will trust all the Certification Authorities, whose certificates are included in the given directory. TURN_SECRET= # TODO! This needs to be a unique and good password! UPDATE_NEXTCLOUD_APPS=no # When setting to yes, it will automatically update all installed Nextcloud apps upon container startup on saturdays.