More flexible database url

miniflux.nomad.hcl

@@ -86,17 +86,6 @@ job [[ .miniflux.instance | toJSON ]] {
 
 [[ template "common/file_env.tpl" $c.env ]]
 
-      template {
-        data =<<_EOT
-{{ with secret "[[ .vault.prefix ]]database/creds/[[ .miniflux.instance ]]" }}
-DATABASE_URL="host=localhost port=5432 user={{ .Data.username }} password='{{ .Data.password }}' dbname=[[ .miniflux.db.name ]] sslmode=disable"
-{{ end }}
-_EOT
-        destination = "secrets/miniflux.env"
-        perms = 400
-        env = true
-      }
-
 [[ template "common/resources.tpl" .miniflux.resources ]]
     }
   }

variables.yml

@@ -19,17 +19,12 @@ miniflux:
     - service: postgres
 
   # Additional env var to pass to the container
-  env: {}
+  env:
+    DATABASE_URL: postgresql://{{ with secret "[[ .vault.prefix ]]database/creds/[[ .miniflux.instance ]]" }}{{ .Data.username }}:{{ urlquery .Data.password }}{{ end }}@localhost:5432/[[ .miniflux.instance ]]?sslmode=disable
 
   # Public URL of the service
   public_url: https://flux.example.org
 
-  # Postgres database settings
-  db:
-    host: localhost
-    port: 5432
-    name: '[[ .miniflux.instance ]]'
-
 # Prometheus configuration
 prometheus:
   metrics_url: http://localhost:8085/metrics