ele-media: configure nextcloud memory and upload limit

4 files changed, 21 insertions, 32 deletions

diff --git a/roles/elevate/media/defaults/main.yml b/roles/elevate/media/defaults/main.yml
index c16a38a0..d5a496c1 100644
--- a/roles/elevate/media/defaults/main.yml
+++ b/roles/elevate/media/defaults/main.yml
@@ -14,20 +14,15 @@ elevate_media_nextcloud_db_gid: "801"
 # elevate_media_nextcloud_instance:
 #   ...
 
+# elevate_media_nextcloud_memory_limit: 8G
+# elevate_media_nextcloud_max_upload_size: 20G
 
-## legacy stuff
-
-# nextcloud_memory_limit: 8G
-# nextcloud_max_upload_size: 20G
-
-# nextcloud_app_config:
-#   - app: theming
-#     opts:
-#       - name: name
-#         value: Elevate Media Server
-#       - name: slogan
-#         value: Fileserver for Elevate Staff
-#       - name: url
-#         value: https://elevate.at
-
-# nextcloud_memory_ratio: 0.3
+# elevate_media_nextcloud_app_config:
+# - app: theming
+#   opts:
+#   - name: name
+#     value: Elevate Media Server
+#   - name: slogan
+#     value: Fileserver for Elevate Staff
+#   - name: url
+#     value: https://elevate.at
diff --git a/roles/elevate/media/tasks/nextcloud-config.yml b/roles/elevate/media/tasks/nextcloud-config.yml
index b3795090..6a32baf7 100644
--- a/roles/elevate/media/tasks/nextcloud-config.yml
+++ b/roles/elevate/media/tasks/nextcloud-config.yml
@@ -67,7 +67,7 @@
 
   ## TODO: this is idempotent but flagging change would be nice
 - name: set nextcloud app config
-  loop: "{{ nextcloud_app_config | subelements('opts') }}"
+  loop: "{{ elevate_media_nextcloud_app_config | subelements('opts') }}"
   loop_control:
     label: "{{ item.0.app }}/{{ item.1.name }} = '{{ item.1.value }}'"
   command: 'docker exec -u www-data nextcloud.service /var/www/html/occ config:app:set -n "--value={{ item.1.value }}" {{ item.0.app }} {{ item.1.name }}'
diff --git a/roles/elevate/media/tasks/nextcloud.yml b/roles/elevate/media/tasks/nextcloud.yml
index 1b875f2b..0062bfd6 100644
--- a/roles/elevate/media/tasks/nextcloud.yml
+++ b/roles/elevate/media/tasks/nextcloud.yml
@@ -3,21 +3,6 @@
 - name: basic nextcloud config
   import_tasks: nextcloud-app.yml
 
-# - name: configure nextcloud upload file size limit
-#   loop:
-#   - upload_max_filesize
-#   - post_max_size
-#   lineinfile:
-#     path: /srv/nextcloud/www/.user.ini
-#     regexp: '^{{ item }}='
-#     line: '{{ item }}={{ nextcloud_max_upload_size }}'
-
-# - name: configure nextcloud memory limit
-#   lineinfile:
-#     path: /srv/nextcloud/www/.user.ini
-#     regexp: '^memory_limit='
-#     line: 'memory_limit={{ nextcloud_memory_limit }}'
-
 # - name: basic nextcloud config
 #   import_tasks: nextcloud-config.yml
 
diff --git a/roles/elevate/media/templates/nextcloud-pod-spec-with-mariadb.yml.j2 b/roles/elevate/media/templates/nextcloud-pod-spec-with-mariadb.yml.j2
index cddc55f5..dabbf7d3 100644
--- a/roles/elevate/media/templates/nextcloud-pod-spec-with-mariadb.yml.j2
+++ b/roles/elevate/media/templates/nextcloud-pod-spec-with-mariadb.yml.j2
@@ -9,6 +9,15 @@ containers:
   resources:
     limits:
       memory: "4Gi"
+  env:
+{% if elevate_media_nextcloud_max_upload_size is defined %}
+  - name: PHP_UPLOAD_LIMIT
+    value: "{{ elevate_media_nextcloud_max_upload_size }}"
+{% endif %}
+{% if elevate_media_nextcloud_memory_limit is defined %}
+  - name: PHP_MEMORY_LIMIT
+    value: "{{ elevate_media_nextcloud_memory_limit }}"
+{% endif %}
   volumeMounts:
   - name: nextcloud
     mountPath: /var/www/html