update mastodon role for helm chart ghp/mastodon-0.2.0

roles/mastodon/defaults/main.yaml

@@ -14,12 +14,16 @@ mastodon_default_values:
       nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
       kubernetes.io/ingress.class: "{{ external_ingress_class if mastodon_publish else internal_ingress_class }}"
       kubernetes.io/tls-acme: "true"
-    hostname: "{{ mastodon_short_name }}.{{ domain }}"
+    hosts:
+      - host: "{{ mastodon_short_name }}.{{ domain }}"
+        paths:
+          - path: '/'
     tls:
       - secretName: "{{ mastodon_short_name }}.{{ domain }}-tls"
         hosts:
           - "{{ mastodon_short_name }}.{{ domain }}"
 
+  mastodon:
     # create an initial administrator user; the password is autogenerated and will
     # have to be reset
     createAdmin:
@@ -30,6 +34,7 @@ mastodon_default_values:
     
     # available locales: https://github.com/tootsuite/mastodon/blob/master/config/application.rb#L43
     locale: en
+    local_domain: "{{ mastodon_short_name }}.{{ domain }}"
     
     cron:
       # run `tootctl media remove` every week
@@ -37,7 +42,6 @@ mastodon_default_values:
         enabled: true
         schedule: "0 0 * * 0"
     
-  application:
     web:
       port: 3000
     streaming:
@@ -71,6 +75,22 @@ mastodon_default_values:
       reply_to: "{{ mastodon_admin_email }}"
       server: "{{ mail_short_name | default('mail') }}.{{ domain }}"
       tls: true
+    persistence:
+      assets:
+        # ReadWriteOnce is more widely supported than ReadWriteMany, but limits
+        # scalability, since it requires the Rails and Sidekiq pods to run on the
+        # same node.
+        storageClassName: "{{ mastodon_assets_storage | default('nfs-ssd') }}"
+        accessMode: "{{ mastodon_assets_storage_mode | default('ReadWriteMany') }}"
+        resources:
+          requests:
+            storage: "{{ mastodon_assets_size | default('10Gi') }}"
+      system:
+        storageClassName: "{{ mastodon_system_storage | default('nfs-hdd') }}"
+        accessMode: "{{ mastodon_system_storage_mode | default('ReadWriteMany') }}"
+        resources:
+          requests:
+            storage: "{{ mastodon_system_size | default('100Gi') }}"
   
   elasticsearch:
     # `false` will disable full-text search
@@ -99,9 +119,7 @@ mastodon_default_values:
   postgresql:
     # Disable for external PostgreSQL
     enabled: false
-    # Set for external PostgreSQL
+    postgresqlHostname: "{{ namespace }}-postgres.{{ postgres_db_namespace | default(namespace) }}.svc.cluster.local"
-    # postgresqlHost: postgresql.local
-    postgresqlHost: "{{ namespace }}-postgres.{{ postgres_db_namespace | default(namespace) }}.svc.cluster.local"
     postgresqlDatabase: mastodon
     # you must set a password; the password generated by the postgresql chart will
     # be rotated on each upgrade:
@@ -111,28 +129,9 @@ mastodon_default_values:
   
   # https://github.com/bitnami/charts/tree/master/bitnami/redis#parameters
   redis:
+    architecture: standalone
     enabled: true
-    usePassword: true
+    auth:
-    # you must set a password; the password generated by the redis chart will be
-    # rotated on each upgrade:
       password: "{{ mastodon_vapid_public_key_base64 | hash('md5') }}"
-    cluster:
-      enabled: false
   
-  persistence:
-    assets:
-      # ReadWriteOnce is more widely supported than ReadWriteMany, but limits
-      # scalability, since it requires the Rails and Sidekiq pods to run on the
-      # same node.
-      storageClassName: "{{ mastodon_assets_storage | default('nfs-ssd') }}"
-      accessMode: "{{ mastodon_assets_storage_mode | default('ReadWriteMany') }}"
-      resources:
-        requests:
-          storage: "{{ mastodon_assets_size | default('10Gi') }}"
-    system:
-      storageClassName: "{{ mastodon_system_storage | default('nfs-hdd') }}"
-      accessMode: "{{ mastodon_system_storage_mode | default('ReadWriteMany') }}"
-      resources:
-        requests:
-          storage: "{{ mastodon_system_size | default('100Gi') }}"