Standardize config.

listmonk/db-init-job.yaml

@@ -28,7 +28,7 @@ spec:
           readOnlyRootFilesystem: false
         env:
         - name: PGHOST
-          value: {{ .dbHost }}
+          value: {{ .db.host }}
         - name: PGUSER
           value: postgres
         - name: PGPASSWORD
@@ -37,9 +37,9 @@ spec:
               name: listmonk-secrets
               key: postgres.password
         - name: DB_NAME
-          value: {{ .dbName }}
+          value: {{ .db.name }}
         - name: DB_USER
-          value: {{ .dbUser }}
+          value: {{ .db.user }}
         - name: DB_PASSWORD
           valueFrom:
             secretKeyRef:

listmonk/deployment.yaml

@@ -31,17 +31,17 @@ spec:
             - name: LISTMONK_app__address
               value: "0.0.0.0:9000"
             - name: LISTMONK_app__root_url
-              value: "{{ .rootUrl }}"
+              value: "https://{{ .domain }}"
             - name: LISTMONK_db__host
-              value: {{ .dbHost }}
+              value: {{ .db.host }}
             - name: LISTMONK_db__port
-              value: "{{ .dbPort }}"
+              value: "{{ .db.port }}"
             - name: LISTMONK_db__user
-              value: {{ .dbUser }}
+              value: {{ .db.user }}
             - name: LISTMONK_db__database
-              value: {{ .dbName }}
+              value: {{ .db.name }}
             - name: LISTMONK_db__ssl_mode
-              value: {{ .dbSSLMode }}
+              value: disable
             - name: LISTMONK_db__password
               valueFrom:
                 secretKeyRef:

listmonk/manifest.yaml

@@ -2,7 +2,7 @@ name: listmonk
 is: listmonk
 description: Listmonk is a standalone, self-hosted, newsletter and mailing list manager.
   It is fast, feature-rich, and packed into a single binary.
-version: 5.0.3
+version: 5.0.3-1
 icon: https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/listmonk.svg
 requires:
 - name: postgres
@@ -10,18 +10,16 @@ defaultConfig:
   namespace: listmonk
   externalDnsDomain: '{{ .cloud.domain }}'
   domain: listmonk.{{ .cloud.domain }}
-  rootUrl: https://listmonk.{{ .cloud.domain }}
   tlsSecretName: wildcard-wild-cloud-tls
   storage: 1Gi
-  dbHost: postgres.postgres.svc.cluster.local
-  dbPort: 5432
-  dbName: listmonk
-  dbUser: listmonk
-  dbSSLMode: disable
-  timezone: UTC
+  db:
+    host: '{{ .apps.postgres.host }}'
+    port: '{{ .apps.postgres.port }}'
+    name: listmonk
+    user: listmonk
 defaultSecrets:
 - key: dbPassword
 - key: dbUrl
-  default: 'postgres://{{ .app.dbUser }}:{{ .secrets.dbPassword }}@{{ .app.dbHost }}:{{ .app.dbPort }}/{{ .app.dbName }}?sslmode={{ .app.dbSSLMode }}'
+  default: 'postgres://{{ .app.db.user }}:{{ .secrets.dbPassword }}@{{ .app.db.host }}:{{ .app.db.port }}/{{ .app.db.name }}?sslmode=disable'
 requiredSecrets:
 - postgres.password