Skip to content

Commit

Permalink
feat(nextcloud): Add new onlyoffice config options (truecharts#14698)
Browse files Browse the repository at this point in the history
**Description**
<!--
Please include a summary of the change and which issue is fixed. Please
also include relevant motivation and context. List any dependencies that
are required for this change.
-->
⚒️ Fixes  # <!--(issue)-->

Adds additional config options for onlyoffice.

With the current setup, the connection may not work out of the box,
since Nextcloud and OnlyOffice will try to talk to each other using
their public FQDNs. In this case, the user will have to configure the
internal FQDNs manually from Nextcloud UI.

**⚙️ Type of change**

- [X] ⚙️ Feature/App addition
- [ ] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->
Checked if templating works as I don't have access to the new image

```
helm template -n ix-nextcloud nextcloud .
```

**📃 Notes:**
<!-- Please enter any other relevant information here -->

Container changes: https://github.com/truecharts/containers/pull/35386

**✔️ Checklist:**

- [X] ⚖️ My code follows the style guidelines of this project
- [X] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made corresponding changes to the documentation
- [X] ⚠️ My changes generate no new warnings
- [X] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [X] ⬆️ I increased versions for any altered app according to semantic
versioning

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🪞 I have opened a PR on
[truecharts/containers](https://github.com/truecharts/containers) adding
the container to TrueCharts mirror repo.
- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._

---------

Signed-off-by: sdimovv <[email protected]>
Signed-off-by: Stavros Kois <[email protected]>
Co-authored-by: Stavros Kois <[email protected]>
  • Loading branch information
astro-stan and stavros-k authored Nov 18, 2023
1 parent 13777d2 commit 5469aca
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 2 deletions.
2 changes: 1 addition & 1 deletion charts/stable/nextcloud/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ sources:
- https://github.com/nextcloud/docker
- https://github.com/nextcloud/helm
type: application
version: 22.1.17
version: 22.2.0
annotations:
truecharts.org/category: cloud
truecharts.org/SCALE-support: "true"
19 changes: 18 additions & 1 deletion charts/stable/nextcloud/questions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -456,11 +456,28 @@ questions:
show_subquestions_if: true
subquestions:
- variable: url
label: URL
label: Public URL
description: |
The public FQDN and port of the OnlyOffice Document Server
schema:
type: string
required: true
default: ""
- variable: internal_url
label: Internal URL
description: |
The internal FQDN and port of the OnlyOffice Document Server
schema:
type: string
required: true
default: ""
- variable: verify_ssl
label: Verify SSL (Advanced)
description: |
Verify SSL when connecting to OnlyOffice Document Server
schema:
type: boolean
default: true
- variable: jwt
label: JWT
schema:
Expand Down
3 changes: 3 additions & 0 deletions charts/stable/nextcloud/templates/_configmap.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@ nextcloud-config:
NX_ONLYOFFICE: {{ .Values.nextcloud.onlyoffice.enabled | quote }}
{{- if .Values.nextcloud.onlyoffice.enabled }}
NX_ONLYOFFICE_URL: {{ .Values.nextcloud.onlyoffice.url | quote }}
NX_ONLYOFFICE_INTERNAL_URL: {{ .Values.nextcloud.onlyoffice.internal_url | quote }}
NX_ONLYOFFICE_VERIFY_SSL: {{ .Values.nextcloud.onlyoffice.verify_ssl | quote }}
NX_ONLYOFFICE_NEXTCLOUD_INTERNAL_URL: {{ printf "http://%v:%v" $fullname .Values.service.main.ports.main.port }}
NX_ONLYOFFICE_JWT: {{ .Values.nextcloud.onlyoffice.jwt | quote }}
NX_ONLYOFFICE_JWT_HEADER: {{ .Values.nextcloud.onlyoffice.jwt_header | quote }}
{{- end }}
Expand Down
2 changes: 2 additions & 0 deletions charts/stable/nextcloud/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ nextcloud:
# Only add the OnlyOffice settings
enabled: false
url: ""
internal_url: ""
verify_ssl: true
jwt: ""
jwt_header: Authorization
# PHP settings
Expand Down

0 comments on commit 5469aca

Please sign in to comment.