Merge branch '375-follow-nextcloud-chart-simplification' into 'master'

Resolve "Follow NextCloud chart simplification"

Closes #375

See merge request openappstack/openappstack!137

ansible/group_vars/all/oas.yml

@@ -25,7 +25,7 @@ grafana_admin_password: "{{ lookup('password', '{{ cluster_dir }}/secrets/grafan
 # git repo versions
 git_local_storage_version: 'HEAD'
 # version of the https://open.greenhost.net/openappstack/nextcloud repo
-git_nextcloud_version: 'd882b6952c32b5cce03e6ad9a534035ce6f01230'
+git_nextcloud_version: '7cf53de18f09192f309be0d06a9b825b81af5e50'
 
 # Application versions
 helm:

helmfiles/helmfile.d/20-nextcloud.yaml

@@ -3,16 +3,11 @@ environments:
     values:
       - "/etc/OpenAppStack/values/local.yaml"
 
-# Note: needs helm-git plugin (https://github.com/aslafy-z/helm-git)
-repositories:
-  - name: onlyoffice-documentserver
-    url: git+https://open.greenhost.net/openappstack/nextcloud@onlyoffice-documentserver?ref=master
-
 releases:
   - name: "oas-{{ .Environment.Values.releaseName }}-files"
     namespace: "oas-apps"
     # Install from file path, so you don't run into https://github.com/roboll/helmfile/issues/726
-    chart: "../../repos/nextcloud/nextcloud-onlyoffice"
+    chart: "../../repos/nextcloud"
     values:
     - "../values/nextcloud.yaml.gotmpl"
     - "/etc/OpenAppStack/values/apps/nextcloud.yaml.gotmpl"

helmfiles/values/nextcloud.yaml.gotmpl

@@ -60,7 +60,8 @@ nextcloud:
     successThreshold: 1
     failureThreshold: 3
 
-onlyoffice-documentserver:
+onlyoffice:
+  server_name: "office.{{ .Environment.Values.domain }}"
   ingress:
     enabled: true
     annotations:
@@ -74,16 +75,7 @@ onlyoffice-documentserver:
       - hosts:
           - "office.{{ .Environment.Values.domain }}"
         secretName: oas-{{ .Environment.Values.releaseName }}-office
-
-  onlyoffice:
-    server_name: "office.{{ .Environment.Values.domain }}"
   jwtSecret: "{{ requiredEnv "ONLYOFFICE_JWT_SECRET" }}"
-  postgresql:
-    postgresqlPassword: "{{ requiredEnv "ONLYOFFICE_POSTGRESQL_PASSWORD" }}"
-  rabbitmq:
-    rabbitmq:
-      password: "{{ requiredEnv "ONLYOFFICE_RABBITMQ_PASSWORD" }}"
-
   livenessProbe:
     initialDelaySeconds: 120
     timeoutSeconds: 20
@@ -96,3 +88,10 @@ onlyoffice-documentserver:
     periodSeconds: 30
     successThreshold: 1
     failureThreshold: 3
+
+postgresql:
+  postgresqlPassword: "{{ requiredEnv "ONLYOFFICE_POSTGRESQL_PASSWORD" }}"
+
+rabbitmq:
+  rabbitmq:
+    password: "{{ requiredEnv "ONLYOFFICE_RABBITMQ_PASSWORD" }}"