From 962a7d596bc16a74ab875eeb76ac9a1ee5f03fb6 Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Thu, 17 Oct 2024 16:22:20 +0300 Subject: [PATCH 1/2] nextcloud: fix cron --- ix-dev/stable/nextcloud/app.yaml | 2 +- .../nextcloud/templates/docker-compose.yaml | 4 +- .../templates/test_values/basic-values.yaml | 4 +- .../templates/test_values/https-values.yaml | 4 +- .../templates/test_values/no-cron-values.yaml | 50 +++++++++++++++++++ .../test_values/same-vol-values.yaml | 4 +- 6 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 ix-dev/stable/nextcloud/templates/test_values/no-cron-values.yaml diff --git a/ix-dev/stable/nextcloud/app.yaml b/ix-dev/stable/nextcloud/app.yaml index 25b0a0cf7e..cb7450fede 100644 --- a/ix-dev/stable/nextcloud/app.yaml +++ b/ix-dev/stable/nextcloud/app.yaml @@ -67,4 +67,4 @@ sources: - https://github.com/truenas/charts/tree/master/charts/nextcloud title: Nextcloud train: stable -version: 1.3.19 +version: 1.3.20 diff --git a/ix-dev/stable/nextcloud/templates/docker-compose.yaml b/ix-dev/stable/nextcloud/templates/docker-compose.yaml index 4a204f365b..7fa9039bba 100644 --- a/ix-dev/stable/nextcloud/templates/docker-compose.yaml +++ b/ix-dev/stable/nextcloud/templates/docker-compose.yaml @@ -303,6 +303,7 @@ services: {% endif %} volumes: {{ volume_mounts.items | tojson }} +{% if values.nextcloud.cron.enabled %} {# See later if we want allow running custom commands on cron. #} {{ values.consts.cron_container_name }}: user: "0:0" @@ -316,7 +317,7 @@ services: - -c command: - | - echo "{{ values.nextcloud.schedule }} php -f /var/www/html/cron.php" > /var/spool/cron/crontabs/www-data || { echo "Failed to create crontab"; exit 1; } + echo "{{ values.nextcloud.cron.schedule }} php -f /var/www/html/cron.php" > /var/spool/cron/crontabs/www-data || { echo "Failed to create crontab"; exit 1; } /cron.sh || { echo "Failed to run cron"; exit 1; } configs: - source: occ @@ -341,6 +342,7 @@ services: {% set cron_test = "pidof busybox > /dev/null" %} healthcheck: {{ ix_lib.base.healthchecks.check_health(cron_test) | tojson }} volumes: {{ volume_mounts.items | tojson }} +{% endif %} {% set resource_without_gpus = ix_lib.base.utils.copy_dict(values.resources) %} {% do resource_without_gpus.pop("gpus", None) %} diff --git a/ix-dev/stable/nextcloud/templates/test_values/basic-values.yaml b/ix-dev/stable/nextcloud/templates/test_values/basic-values.yaml index d8b92d00f1..3dced05521 100644 --- a/ix-dev/stable/nextcloud/templates/test_values/basic-values.yaml +++ b/ix-dev/stable/nextcloud/templates/test_values/basic-values.yaml @@ -22,7 +22,9 @@ nextcloud: php_memory_limit: 512 op_cache_memory_consumption: 128 max_execution_time: 30 - schedule: "*/5 * * * *" + cron: + enabled: true + schedule: "*/5 * * * *" additional_envs: [] network: web_port: 8080 diff --git a/ix-dev/stable/nextcloud/templates/test_values/https-values.yaml b/ix-dev/stable/nextcloud/templates/test_values/https-values.yaml index 9cf3ce9f17..72c4ec674d 100644 --- a/ix-dev/stable/nextcloud/templates/test_values/https-values.yaml +++ b/ix-dev/stable/nextcloud/templates/test_values/https-values.yaml @@ -20,7 +20,9 @@ nextcloud: php_memory_limit: 512 op_cache_memory_consumption: 128 max_execution_time: 30 - schedule: "*/5 * * * *" + cron: + enabled: true + schedule: "*/5 * * * *" additional_envs: [] network: web_port: 8080 diff --git a/ix-dev/stable/nextcloud/templates/test_values/no-cron-values.yaml b/ix-dev/stable/nextcloud/templates/test_values/no-cron-values.yaml new file mode 100644 index 0000000000..3dced05521 --- /dev/null +++ b/ix-dev/stable/nextcloud/templates/test_values/no-cron-values.yaml @@ -0,0 +1,50 @@ +resources: + limits: + cpus: 2.0 + memory: 4096 + +nextcloud: + admin_user: admin + admin_password: password + apt_packages: + - ffmpeg + - smbclient + - ocrmypdf + tesseract_languages: + - eng + - chi-sim + host: localhost:8080 + data_dir_path: /var/www/html/data + redis_password: password + db_user: nextcloud + db_password: password + php_upload_limit: 3 + php_memory_limit: 512 + op_cache_memory_consumption: 128 + max_execution_time: 30 + cron: + enabled: true + schedule: "*/5 * * * *" + additional_envs: [] +network: + web_port: 8080 + certificate_id: + nginx: + proxy_timeout: 60 + use_different_access_port: false + +storage: + is_data_in_the_same_volume: false + data: + type: volume + auto_permissions: true + volume_name: nextcloud-data + html: + type: volume + auto_permissions: true + volume_name: nextcloud-html + postgres_data: + type: volume + auto_permissions: true + volume_name: nextcloud-postgres-data + additional_storage: [] diff --git a/ix-dev/stable/nextcloud/templates/test_values/same-vol-values.yaml b/ix-dev/stable/nextcloud/templates/test_values/same-vol-values.yaml index 2852cdfef6..ef73c47716 100644 --- a/ix-dev/stable/nextcloud/templates/test_values/same-vol-values.yaml +++ b/ix-dev/stable/nextcloud/templates/test_values/same-vol-values.yaml @@ -18,7 +18,9 @@ nextcloud: php_memory_limit: 512 op_cache_memory_consumption: 128 max_execution_time: 30 - schedule: "*/5 * * * *" + cron: + enabled: true + schedule: "*/5 * * * *" additional_envs: [] network: web_port: 8080 From 05eab60d99a6c37041be5c31c9e72683a7b68bdd Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Thu, 17 Oct 2024 16:26:52 +0300 Subject: [PATCH 2/2] bump --- ix-dev/stable/nextcloud/app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ix-dev/stable/nextcloud/app.yaml b/ix-dev/stable/nextcloud/app.yaml index 7be405dcb6..c3cb18e836 100644 --- a/ix-dev/stable/nextcloud/app.yaml +++ b/ix-dev/stable/nextcloud/app.yaml @@ -66,4 +66,4 @@ sources: - https://github.com/truenas/charts/tree/master/charts/nextcloud title: Nextcloud train: stable -version: 1.3.20 +version: 1.3.21