diff --git a/charts/mastodon/Chart.yaml b/charts/mastodon/Chart.yaml index 7e747e9..d69ada0 100644 --- a/charts/mastodon/Chart.yaml +++ b/charts/mastodon/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.1.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/mastodon/templates/configmap.yaml b/charts/mastodon/templates/configmap.yaml index 05a3ccb..eaa7bae 100644 --- a/charts/mastodon/templates/configmap.yaml +++ b/charts/mastodon/templates/configmap.yaml @@ -10,7 +10,6 @@ data: STREAMING_CLUSTER_NUM: {{ .Values.mastodon.streaming.workers | quote }} NODE_ENV: "production" RAILS_ENV: "production" - STREAMING_CLUSTER_NUM: {{ .Values.mastodon.streaming.workers | quote }} # Database DB_HOST: {{ .Values.postgres.host | quote }} DB_NAME: {{ .Values.postgres.name | quote }} diff --git a/charts/mastodon/values.yaml b/charts/mastodon/values.yaml index f6aab8d..b2d7528 100644 --- a/charts/mastodon/values.yaml +++ b/charts/mastodon/values.yaml @@ -16,7 +16,7 @@ fullnameOverride: "" mastodon: # Please look at https://docs.joinmastodon.org/admin/config/ for the full documentation. - localDomain: josa.social + localDomain: example.com # available locales: https://github.com/mastodon/mastodon/blob/main/config/application.rb#L71 locale: en # Possible values are debug, info, warn, error, fatal @@ -129,8 +129,8 @@ mastodon: storage: 100Gi postgres: - host: private-postgresql-db-jordanopensource-org-do-user-1737715-0.b.db.ondigitalocean.com - name: mastodon_dev + host: "localhost" + name: mastodon port: 25060 ## https://www.postgresql.org/docs/10/libpq-ssl.html sslMode: "require" @@ -170,9 +170,9 @@ elasticsearch: smtp: authMethod: plain - server: mail.josa.ngo + server: mail.example.com port: 465 - fromAddress: "JOSA Mastodon " + fromAddress: "Mastodon " domain: josa.ngo startTls: false tls: true @@ -195,6 +195,21 @@ s3: ## NOTE: Must contain key `AWS_SECRET_ACCESS_KEY` secretName: "s3-secrets" +ldap: + enabled: true + host: "localhost" + port: "636" + ldapMethod: "simple_tls" + baseDN: "DC=example,DC=com" + bindDN: "cn=admin,dc=example,dc=com" + uid: "mastodon" + mail: "mail" + searchFilter: "(|(%{uid}=%{email})(%{mail}=%{email}))" + credentials: + ## The Secret name containing the credentials for ldap. + ## NOTE: Must contain key `LDAP_PASSWORD` + secretName: "ldap-secret" + serviceAccount: # Specifies whether a service account should be created create: true @@ -227,19 +242,18 @@ ingress: enabled: true className: "nginx" annotations: - cert-manager.io/cluster-issuer: "letsencrypt" - external-dns.alpha.kubernetes.io/target: nginx.ingress.cloud.josa.ngo - external-dns.alpha.kubernetes.io/ingress-hostname-source: defined-hosts-only - nginx.ingress.kubernetes.io/proxy-body-size: 40m + # cert-manager.io/cluster-issuer: "letsencrypt" + # nginx.ingress.kubernetes.io/proxy-body-size: 40m hosts: - - host: josa.social + - host: example.com paths: - path: / pathType: ImplementationSpecific tls: - - secretName: josa.social-tls - hosts: - - josa.social + [] + # - secretName: josa.social-tls + # hosts: + # - example.com resources: {} @@ -261,8 +275,7 @@ autoscaling: targetCPUUtilizationPercentage: 80 # targetMemoryUtilizationPercentage: 80 -nodeSelector: - doks.digitalocean.com/node-pool: josa-cloud-np +nodeSelector: {} tolerations: []