v1.0.9

tasks/mastodon.yaml

@@ -8,55 +8,64 @@
     create_namespace: true
     timeout: 600s
     values:
-      adminUser: "mastodon"
-      adminEmail: "mastodon@mail.eom.dev"
-      adminPassword: "{{ mastodon_admin_password }}"
-      otpSecret: ""
-      secretKeyBase: ""
-      vapidPrivateKey: ""
-      vapidPublicKey: ""
-      activeRecordEncryptionDeterministicKey: ""
-      activeRecordEncryptionKeyDerivationSalt: ""
-      activeRecordEncryptionPrimaryKey: ""
-      extraConfig:
-        LDAP_ENABLED: "true"
-        LDAP_HOST: openldap.auth.svc.cluster.local
-        LDAP_PORT: "389"
-        LDAP_METHOD: plain
-        LDAP_BASE: ou=People,dc=eom,dc=dev
-        LDAP_BIND_DN: cn=readonly,dc=eom,dc=dev
-        LDAP_PASSWORD: "{{ ldap_readonly_password }}"
-        LDAP_UID: uid
-        LDAP_SEARCH_FILTER: "(&(objectClass=inetOrgPerson)(uid=%{uid}))"
-        LDAP_MAIL: mail
-      enableS3: false
-      localDomain: "mastodon.eom.dev"
-      smtp:
-        server: "mail.eom.dev"
-        port: 587
-        from_address: "mastodon@mail.eom.dev"
-        domain: "mail.eom.dev"
-        reply_to: "mastodon@mail.eom.dev"
-        delivery_method: smtp
-        ca_file: /etc/ssl/certs/ca-certificates.crt
-        openssl_verify_mode: none
-        enable_starttls_auto: true
-        tls: true
-        auth_method: starttls
-        login: "mastodon"
-        password: "{{ mastodon_mail_password }}"
-      persistence:
+      metrics:
         enabled: true
-        size: 128Gi
       initJob:
         precompileAssets:
-          resourcesPreset: "micro"
+          resources:
+            requests:
+              cpu: 0m
+              memory: 0Mi
+            limits:
+              cpu: 1.5
+              memory: 3072Mi
+      adminUser: mastodon
+      adminEmail: mastodon@postfix.eom.dev
+      adminPassword: "{{ mastodon_admin_password }}"
+      extraConfig:
+        LDAP_ENABLED: "true"
+        LDAP_HOST: openldap.openldap.svc.cluster.local
+        LDAP_PORT: "389"
+        LDAP_METHOD: plain
+        LDAP_BASE: dc=eom,dc=dev
+        LDAP_BIND_DN: cn=readonly,dc=eom,dc=dev
+        LDAP_PASSWORD: "{{ openldap_readonly_password }}"
+        LDAP_UID: uid
+        LDAP_SEARCH_FILTER: (&(objectClass=posixAccount)(|(%{uid}=%{username})(%{mail}=%{email}))(memberOf=cn=Mastodon Users,ou=Mastodon,ou=Services,dc=eom,dc=dev))
+        LDAP_MAIL: mail
+      enableS3: false
+      localDomain: mastodon.eom.dev
+      smtp:
+        server: postfix.eom.dev
+        port: 587
+        from_address: mastodon@postfix.eom.dev
+        domain: postfix.eom.dev
+        reply_to: mastodon@postfix.eom.dev
+        delivery_method: smtp
+        tls: true
+        auth_method: starttls
+        login: mastodon
+        password: "{{ mastodon_admin_password }}"
+      persistence:
+        enabled: true
+        size: 8Ti
       redis:
+        enabled: true
         auth:
-          password: "{{ mastodon_redis_password }}"
+          password: "{{ redis_auth_password }}"
       postgresql:
-        auth:
-          password: "{{ mastodon_postgres_password }}"
+        enabled: false
+      externalDatabase:
+        host: postgresql-postgresql-ha-pgpool.postgresql.svc.cluster.local
+        user: mastodon
+        password: "{{ mastodon_admin_password }}"
+        database: mastodon
+        port: 5432
+      elasticsearch:
+        enabled: false
+      externalElasticsearch:
+        host: elasticsearch.elasticsearch.svc.cluster.local
+        port: 9200
       minio:
         enabled: false
       apache:
@@ -66,7 +75,7 @@
             http: 80
         ingress:
           enabled: true
-          hostname: "mastodon.eom.dev"
+          hostname: mastodon.eom.dev
           annotations:
             kubernetes.io/ingress.class: nginx
             cert-manager.io/cluster-issuer: ca-issuer