diff --git a/nextcloud-aio-helm-chart/Chart.yaml b/nextcloud-aio-helm-chart/Chart.yaml index 41f68a9e..8b1d36d5 100755 --- a/nextcloud-aio-helm-chart/Chart.yaml +++ b/nextcloud-aio-helm-chart/Chart.yaml @@ -1,6 +1,6 @@ name: nextcloud-aio-helm-chart description: A generated Helm Chart for Nextcloud AIO from Skippbox Kompose -version: 6.0.0 +version: 6.1.0 apiVersion: v2 keywords: - latest diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml index 504c4fbe..f9d594c3 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml @@ -54,7 +54,7 @@ spec: value: nextcloud-aio-talk - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-apache:20230606_070951-latest + image: nextcloud/aio-apache:20230613_065816-latest name: nextcloud-aio-apache ports: - containerPort: {{ .Values.APACHE_PORT }} diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml index 537cbae7..1abf0400 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml @@ -38,7 +38,7 @@ spec: value: "90" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-clamav:20230606_070951-latest + image: nextcloud/aio-clamav:20230613_065816-latest name: nextcloud-aio-clamav ports: - containerPort: 3310 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml index fb1b57ba..6af2e1e8 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml @@ -22,16 +22,6 @@ spec: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-collabora spec: - initContainers: - - name: init-volumes - image: alpine - command: - - chmod - - "777" - - /nextcloud-aio-collabora-fonts - volumeMounts: - - name: nextcloud-aio-collabora-fonts - mountPath: /nextcloud-aio-collabora-fonts containers: - env: - name: DONT_GEN_SSL_CERT @@ -46,15 +36,8 @@ spec: value: --o:ssl.enable=false --o:ssl.termination=true --o:mount_jail_tree=false --o:logging.level=warning --o:home_mode.enable=true {{ .Values.COLLABORA_SECCOMP_POLICY }} --o:remote_font_config.url=https://{{ .Values.NC_DOMAIN }}/apps/richdocuments/settings/fonts.json - name: server_name value: "{{ .Values.NC_DOMAIN }}" - image: nextcloud/aio-collabora:20230606_070951-latest + image: nextcloud/aio-collabora:20230613_065816-latest name: nextcloud-aio-collabora ports: - containerPort: 9980 - volumeMounts: - - mountPath: /opt/cool/systemplate/tmpfonts - name: nextcloud-aio-collabora-fonts - volumes: - - name: nextcloud-aio-collabora-fonts - persistentVolumeClaim: - claimName: nextcloud-aio-collabora-fonts {{- end }} diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-fonts-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-fonts-persistentvolumeclaim.yaml deleted file mode 100755 index ea0b9c00..00000000 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-fonts-persistentvolumeclaim.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - labels: - io.kompose.service: nextcloud-aio-collabora-fonts - name: nextcloud-aio-collabora-fonts -spec: - {{- if .Values.STORAGE_CLASS }} - storageClassName: {{ .Values.STORAGE_CLASS }} - {{- end }} - accessModes: - - ReadWriteOnce - resources: - requests: - storage: {{ .Values.COLLABORA_FONTS_STORAGE_SIZE }} diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml index 391381f7..44ffe656 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml @@ -60,7 +60,7 @@ spec: value: nextcloud - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-postgresql:20230606_070951-latest + image: nextcloud/aio-postgresql:20230613_065816-latest name: nextcloud-aio-database ports: - containerPort: 5432 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml index f2018626..117a7689 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml @@ -42,7 +42,7 @@ spec: value: "{{ .Values.TIMEZONE }}" - name: discovery.type value: single-node - image: nextcloud/aio-fulltextsearch:20230606_070951-latest + image: nextcloud/aio-fulltextsearch:20230613_065816-latest name: nextcloud-aio-fulltextsearch ports: - containerPort: 9200 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml index a117da25..83c42a10 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml @@ -26,7 +26,7 @@ spec: - env: - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-imaginary:20230606_070951-latest + image: nextcloud/aio-imaginary:20230613_065816-latest name: nextcloud-aio-imaginary ports: - containerPort: 9000 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml index 6285972a..6e79c9c0 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml @@ -44,10 +44,6 @@ spec: value: "{{ .Values.NEXTCLOUD_PASSWORD }}" - name: ADMIN_USER value: admin - - name: AIO_TOKEN - value: "{{ .Values.AIO_TOKEN }}" - - name: AIO_URL - value: "{{ .Values.AIO_URL }}" - name: CLAMAV_ENABLED value: "{{ .Values.CLAMAV_ENABLED }}" - name: CLAMAV_HOST @@ -94,6 +90,8 @@ spec: value: "{{ .Values.DATABASE_PASSWORD }}" - name: POSTGRES_USER value: nextcloud + - name: RECORDING_SECRET + value: "{{ .Values.RECORDING_SECRET }}" - name: REDIS_HOST value: nextcloud-aio-redis - name: REDIS_HOST_PASSWORD @@ -106,6 +104,10 @@ spec: value: "{{ .Values.TALK_ENABLED }}" - name: TALK_PORT value: "{{ .Values.TALK_PORT }}" + - name: TALK_RECORDING_ENABLED + value: "{{ .Values.TALK_RECORDING_ENABLED }}" + - name: TALK_RECORDING_HOST + value: nextcloud-aio-talk-recording - name: TRUSTED_CACERTS_DIR value: "{{ .Values.NEXTCLOUD_TRUSTED_CACERTS_DIR }}" - name: TURN_SECRET @@ -114,7 +116,7 @@ spec: value: "{{ .Values.TIMEZONE }}" - name: UPDATE_NEXTCLOUD_APPS value: "{{ .Values.UPDATE_NEXTCLOUD_APPS }}" - image: nextcloud/aio-nextcloud:20230606_070951-latest + image: nextcloud/aio-nextcloud:20230613_065816-latest name: nextcloud-aio-nextcloud ports: - containerPort: 9000 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml index 5e60077f..25bdfc64 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml @@ -42,7 +42,7 @@ spec: value: "{{ .Values.ONLYOFFICE_SECRET }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-onlyoffice:20230606_070951-latest + image: nextcloud/aio-onlyoffice:20230613_065816-latest name: nextcloud-aio-onlyoffice ports: - containerPort: 80 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml index fc5c63ea..2d37988c 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml @@ -37,7 +37,7 @@ spec: value: "{{ .Values.REDIS_PASSWORD }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-redis:20230606_070951-latest + image: nextcloud/aio-redis:20230613_065816-latest name: nextcloud-aio-redis ports: - containerPort: 6379 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml index 7e883aea..b2ee62a5 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml @@ -24,6 +24,8 @@ spec: spec: containers: - env: + - name: INTERNAL_SECRET + value: "{{ .Values.TALK_INTERNAL_SECRET }}" - name: NC_DOMAIN value: "{{ .Values.NC_DOMAIN }}" - name: SIGNALING_SECRET @@ -34,7 +36,7 @@ spec: value: "{{ .Values.TURN_SECRET }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-talk:20230606_070951-latest + image: nextcloud/aio-talk:20230613_065816-latest name: nextcloud-aio-talk ports: - containerPort: {{ .Values.TALK_PORT }} diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-deployment.yaml new file mode 100755 index 00000000..5a41c65b --- /dev/null +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-deployment.yaml @@ -0,0 +1,37 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose convert -c -f latest.yml + kompose.version: 1.28.0 (c4137012e) + labels: + io.kompose.service: nextcloud-aio-talk-recording + name: nextcloud-aio-talk-recording +spec: + replicas: 1 + selector: + matchLabels: + io.kompose.service: nextcloud-aio-talk-recording + template: + metadata: + annotations: + kompose.cmd: kompose convert -c -f latest.yml + kompose.version: 1.28.0 (c4137012e) + labels: + io.kompose.network/nextcloud-aio: "true" + io.kompose.service: nextcloud-aio-talk-recording + spec: + containers: + - env: + - name: INTERNAL_SECRET + value: "{{ .Values.TALK_INTERNAL_SECRET }}" + - name: NC_DOMAIN + value: "{{ .Values.NC_DOMAIN }}" + - name: RECORDING_SECRET + value: "{{ .Values.RECORDING_SECRET }}" + - name: TZ + value: "{{ .Values.TIMEZONE }}" + image: nextcloud/aio-talk-recording:20230613_065816-latest + name: nextcloud-aio-talk-recording + ports: + - containerPort: 1234 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-service.yaml new file mode 100755 index 00000000..50016d5c --- /dev/null +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-service.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + kompose.cmd: kompose convert -c -f latest.yml + kompose.version: 1.28.0 (c4137012e) + labels: + io.kompose.service: nextcloud-aio-talk-recording + name: nextcloud-aio-talk-recording +spec: + ports: + - name: "1234" + port: 1234 + targetPort: 1234 + selector: + io.kompose.service: nextcloud-aio-talk-recording diff --git a/nextcloud-aio-helm-chart/values.yaml b/nextcloud-aio-helm-chart/values.yaml index f3f4ac3e..b4f430f5 100755 --- a/nextcloud-aio-helm-chart/values.yaml +++ b/nextcloud-aio-helm-chart/values.yaml @@ -2,8 +2,10 @@ DATABASE_PASSWORD: # 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_PASSWORD: # TODO! This is the password of the initially created Nextcloud admin with username admin. ONLYOFFICE_SECRET: # TODO! This needs to be a unique and good password! +RECORDING_SECRET: # TODO! This needs to be a unique and good password! REDIS_PASSWORD: # TODO! This needs to be a unique and good password! SIGNALING_SECRET: # TODO! This needs to be a unique and good password! +TALK_INTERNAL_SECRET: # TODO! This needs to be a unique and good password! TIMEZONE: Europe/Berlin # TODO! This is the timezone that your containers will use. TURN_SECRET: # TODO! This needs to be a unique and good password! @@ -13,9 +15,8 @@ FULLTEXTSEARCH_ENABLED: "no" # Setting this to "yes" (with quotes) enab IMAGINARY_ENABLED: "no" # Setting this to "yes" (with quotes) enables the option in Nextcloud automatically. ONLYOFFICE_ENABLED: "no" # Setting this to "yes" (with quotes) enables the option in Nextcloud automatically. TALK_ENABLED: "no" # Setting this to "yes" (with quotes) enables the option in Nextcloud automatically. +TALK_RECORDING_ENABLED: "no" # Setting this to "yes" (with quotes) enables the option in Nextcloud automatically. -AIO_TOKEN: 123456 # Has no function but needs to be set! -AIO_URL: localhost # Has no function but needs to be set! APACHE_MAX_SIZE: "10737418240" # This needs to be an integer and in sync with NEXTCLOUD_UPLOAD_LIMIT APACHE_PORT: 443 # Changing this to a different value than 443 will allow you to run it behind a web server or reverse proxy (like Apache, Nginx and else). COLLABORA_DICTIONARIES: de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru # You can change this in order to enable other dictionaries for collabora @@ -33,7 +34,6 @@ UPDATE_NEXTCLOUD_APPS: no # When setting to yes (with quotes), it will STORAGE_CLASS: # By setting this, you can adjust the storage class for your volumes APACHE_STORAGE_SIZE: 1Gi # You can change the size of the apache volume that default to 1Gi with this value CLAMAV_STORAGE_SIZE: 1Gi # You can change the size of the clamav volume that default to 1Gi with this value -COLLABORA_FONTS_STORAGE_SIZE: 1Gi # You can change the size of the collabora-fonts volume that default to 1Gi with this value DATABASE_STORAGE_SIZE: 1Gi # You can change the size of the database volume that default to 1Gi with this value DATABASE_DUMP_STORAGE_SIZE: 1Gi # You can change the size of the database-dump volume that default to 1Gi with this value ELASTICSEARCH_STORAGE_SIZE: 1Gi # You can change the size of the elasticsearch volume that default to 1Gi with this value