Merge branch '5-use-infrared-s-version-of-onlyoffice' into 'master'

Resolve "Use InfraRed's version of OnlyOffice"

Closes #5

See merge request openappstack/nextcloud!5

nextcloud-onlyoffice/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v1
 description: |
   A helm chart for installing NextCloud and setting up ONLYOFFICE integration
 name: nextcloud-onlyoffice
-version: 0.1.3
+version: 0.1.4

nextcloud-onlyoffice/requirements.yaml

@@ -5,7 +5,7 @@ dependencies:
     tags:
       - nextcloud
   - name: onlyoffice-documentserver
-    version: 0.1.0
+    version: 0.1.1
     repository: "@onlyoffice-documentserver"
     tags:
       - onlyoffice

nextcloud-onlyoffice/templates/onlyoffice-config.yaml

@@ -19,7 +19,7 @@ data:
           "editFormats": "{\"csv\":\"true\",\"odp\":\"true\",\"ods\":\"true\",\"odt\":\"true\",\"rtf\":\"false\",\"txt\":\"true\"}",
           "enabled": "yes",
           "groups": "[]",
-          "jwt_secret": "",
+          "jwt_secret": "{{ $onlyoffice.jwtSecret }}",
           "sameTab": "false",
           "settings_error": "",
           "types": "filesystem"

nextcloud-onlyoffice/values.yaml

@@ -33,7 +33,5 @@ mariadb:
   enabled: true
 
 onlyoffice-documentserver:
-  onlyoffice:
-    containerPort: 80
   livenessProbe:
     initialDelaySeconds: 40

onlyoffice-documentserver/Chart.yaml

@@ -9,4 +9,4 @@ maintainers:
 name: onlyoffice-documentserver
 sources:
 - https://code.greenhost.net/openappstack/nextcloud
-version: 0.1.0
+version: 0.1.1

onlyoffice-documentserver/README.md

@@ -10,10 +10,18 @@ Parameters:
 **NOTE:** The `onlyoffice.server_name` variable needs to be overwritten with an
 URL that points to your onlyoffice for this to work correctly.
 
+**NOTE:** It is very important that you overwrite the following password and
+secrets variables manually when you run helm install: 
+
+- `jwtSecret`
+- `postgresql.postgresqlPassword`
+- `rabbitmq.rabbitmq.password`
+
 | Parameter                                         | Description                                                   | Default                                                     |
 | ------------------------------------------------- | ------------------------------------------------------------- | ----------------------------------------------------------- |
 | `replicaCount`                                    | Number of provisioner instances to deployed                   | `1`                                                         |
 | `strategy`                                        | Specifies the strategy used to replace old Pods by new ones   | `Recreate`                                                  |
+| `jwtSecret`                                       | Used to set the JWT shared secret between ONLYOFFICE and NC   | `secret`                                                    |
 | `image.repository`                                | Provisioner image                                             | `onlyoffice/documentserver`                                 |
 | `image.tag`                                       | Version of provisioner image                                  | `5.3.1.26`                                                  |
 | `image.pullPolicy`                                | Image pull policy                                             | `IfNotPresent`                                              |

onlyoffice-documentserver/requirements.yaml

+dependencies:
+  - name: rabbitmq
+    version: 6.1.2
+    repository: "@stable"
+    tags:
+      - onlyoffice
+      - rabbitmq
+      - queue
+  - name: redis
+    version: 8.0.18
+    repository: "@stable"
+    tags:
+      - key-value-store
+      - redis
+      - onlyoffice
+  - name: postgresql
+    version: 5.3.10
+    repository: "@stable"
+    tags:
+      - postgresql
+      - onlyoffice
+      - database

onlyoffice-documentserver/templates/deployment.yaml

@@ -29,7 +29,7 @@ spec:
           livenessProbe:
             failureThreshold: 3
             httpGet:
-              path: /
+              path: /welcome
               port: http
               scheme: HTTP
             initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
@@ -39,6 +39,41 @@ spec:
             failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
           {{- end }}
           {{- if .Values.readinessProbe.enabled }}
+          livenessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /welcome
+              port: http
+              scheme: HTTP
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+          {{- end }}
+          env:
+            - name: RABBITMQ_SERVER_URL
+              value: "amqp://user:{{ .Values.rabbitmq.rabbitmq.password }}@{{ .Release.Name }}-rabbitmq"
+            - name: JWT_SECRET
+              value: "{{ .Values.jwtSecret }}"
+            - name: POSTGRESQL_SERVER_USER
+              value: "onlyoffice"
+            - name: REDIS_SERVER_HOST
+              value: "{{ .Release.Name }}-redis-master"
+            - name: POSTGRESQL_SERVER_PASS
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ .Release.Name }}-postgresql"
+                  key: "postgresql-password"
+            - name: REDIS_SERVER_PORT
+              value: "{{ .Values.redis.master.service.port }}"
+            - name: POSTGRESQL_SERVER_HOST
+              value: "{{ .Release.Name }}-postgresql"
+            - name: POSTGRESQL_SERVER_PORT
+              value: "{{ .Values.postgresql.service.port }}"
+            - name: POSTGRESQL_SERVER_DB_NAME
+              value: "{{ .Values.postgresql.postgresqlDatabase }}"
+          {{- if .Values.readinessProbe.enabled }}
           readinessProbe:
             failureThreshold: 3
             httpGet:

onlyoffice-documentserver/values.yaml

@@ -4,10 +4,12 @@
 
 replicaCount: 1
 
+jwtSecret: "secret"
+
 image:
-  repository: onlyoffice/documentserver
-  tag: 5.3.1.26
-  pullPolicy: IfNotPresent
+  repository: infrarednetwork/onlyoffice-documentserver
+  tag: 5.3.2-2
+  pullPolicy: Always
 
 strategy: Recreate
 
@@ -27,7 +29,7 @@ ingress:
 
 onlyoffice:
   # port that server onlyoffice in container
-  containerPort: 80
+  containerPort: 8000
   # URL to the server running onlyoffice, replace this with your own domain!
   server_name: onlyoffice.domain
 
@@ -62,3 +64,22 @@ readinessProbe:
   periodSeconds: 10
   successThreshold: 1
   failureThreshold: 3
+
+redis:
+  master:
+    command: "redis-server --appendonly yes"
+  usePassword: false
+  cluster:
+    enabled: false
+
+postgresql:
+  persistence:
+    # persistent storage is handled by NextCloud in our case
+    enabled: false
+  postgresqlDatabase: onlyoffice
+  postgresqlUsername: onlyoffice
+  postgresqlPassword: onlyoffice
+
+rabbitmq:
+  rabbitmq:
+    password: password