opencloud: v4 update

ix-dev/community/opencloud/app.yaml

@@ -1,4 +1,4 @@
-app_version: 3.7.0
+app_version: 4.0.1
 capabilities: []
 categories:
 - storage
@@ -34,7 +34,7 @@ screenshots: []
 sources:
 - https://docs.opencloud.eu/
 - https://github.com/OpenCloud/OpenCloud
-- https://hub.docker.com/r/opencloudeu/opencloud-rolling
+- https://hub.docker.com/r/opencloudeu/opencloud
 title: OpenCloud
 train: community
-version: 1.0.25
+version: 1.0.26

ix-dev/community/opencloud/ix_values.yaml

@@ -1,7 +1,7 @@
 images:
   image:
-    repository: opencloudeu/opencloud-rolling
-    tag: 3.7.0
+    repository: opencloudeu/opencloud
+    tag: 4.0.1
   container_utils_image:
     repository: ixsystems/container-utils
     tag: 1.0.2
@@ -116,37 +116,3 @@ consts:
     fi
     echo "Starting OpenCloud..."
     opencloud server
-
-  csp_config:
-    # By default, deny all content sources
-    default-src:
-      - "'none'"
-    child-src:
-      - "'self'"
-    connect-src:
-      - "'self'"
-      - "blob:"
-    font-src:
-      - "'self'"
-    frame-ancestors:
-      - "'self'"
-    frame-src:
-      - "'self'"
-      - "blob:"
-    img-src:
-      - "'self'"
-      - "data:"
-      - "blob:"
-    manifest-src:
-      - "'self'"
-    media-src:
-      - "'self'"
-    object-src:
-      - "'self'"
-      - "blob:"
-    script-src:
-      - "'self'"
-      - "'unsafe-inline'"
-    style-src:
-      - "'self'"
-      - "'unsafe-inline'"

ix-dev/community/opencloud/questions.yaml

@@ -267,18 +267,7 @@ questions:
             Example: `'unsafe-eval'`
           schema:
             type: list
-            default:
-              - directive: connect-src
-                items:
-                  - value: https://raw.githubusercontent.com/opencloud-eu/awesome-apps/
-                  - value: https://update.opencloud.eu/
-              - directive: frame-src
-                items:
-                  - value: https://embed.diagrams.net/
-              - directive: img-src
-                items:
-                  - value: https://raw.githubusercontent.com/opencloud-eu/awesome-apps/
-                  - value: https://tile.openstreetmap.org/
+            default: []
             items:
               - variable: csp_entry
                 label: Content Security Policy Entry

ix-dev/community/opencloud/templates/docker-compose.yaml

@@ -5,12 +5,9 @@
 {% set perm_container = tpl.deps.perms(values.consts.perms_container_name) %}
 {% set perms_config = {"uid": values.run_as.user, "gid": values.run_as.group, "mode": "check"} %}
 
-{% set csp = namespace(x={}) %}
 {% set extra_services = namespace(x=["notifications"]) %}
 
-{% for key, values in values.consts.csp_config.items() %}
-  {% do csp.x.update({key: values}) %}
-{% endfor %}
+{% set csp = namespace(x={}) %}
 {% for x in values.opencloud.additional_csp %}
   {% set list_items = x['items'] | map(attribute="value") | list %}
   {% set values = csp.x.get(x.directive, []) + list_items %}
@@ -137,7 +134,7 @@
   {% do csp.x.update({key: values | unique | list}) %}
 {% endfor %}
 {% set csp_yaml = tpl.funcs.to_yaml({"directives": csp.x}) %}
-{% set csp_notes = "Generated CSP File:\n\n```yaml\n%s```"|format(csp_yaml) %}
+{% set csp_notes = "CSP Rules that are added on top of the OpenCloud Defaults:\n\n```yaml\n%s```"|format(csp_yaml) %}
 {% set body.x = "%s\n\n%s"|format(body.x, csp_notes) %}
 
 {% do c1.configs.add("csp", csp_yaml, values.consts.csp_config_path) %}

ix-dev/community/opencloud/templates/test_values/basic-values.yaml

@@ -38,18 +38,7 @@ opencloud:
     arcade: true
     maps: true
     importer: true
-  additional_csp:
-    - directive: connect-src
-      items:
-        - value: https://raw.githubusercontent.com/opencloud-eu/awesome-apps/
-        - value: https://update.opencloud.eu/
-    - directive: frame-src
-      items:
-        - value: https://embed.diagrams.net/
-    - directive: img-src
-      items:
-        - value: https://raw.githubusercontent.com/opencloud-eu/awesome-apps/
-        - value: https://tile.openstreetmap.org/
+  additional_csp: []
   additional_envs:
     - name: OC_LOG_PRETTY
       value: "true"

ix-dev/community/opencloud/templates/test_values/https-values.yaml

@@ -38,18 +38,7 @@ opencloud:
     arcade: true
     maps: true
     importer: true
-  additional_csp:
-    - directive: connect-src
-      items:
-        - value: https://raw.githubusercontent.com/opencloud-eu/awesome-apps/
-        - value: https://update.opencloud.eu/
-    - directive: frame-src
-      items:
-        - value: https://embed.diagrams.net/
-    - directive: img-src
-      items:
-        - value: https://raw.githubusercontent.com/opencloud-eu/awesome-apps/
-        - value: https://tile.openstreetmap.org/
+  additional_csp: []
   additional_envs: []
 
 network: