nomad
/
miniflux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup + update to 2.0.51

This commit is contained in:
Daniel Berteaud 2023-12-21 22:55:20 +01:00
parent e71b9350de
commit 8fb6686d37
8 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
consul/config/service-defaults/miniflux.hcl
View File

@ -1,3 +1,3 @@
Kind = "service-defaults"
Name = "[[ .miniflux.instance ]][[ .consul.suffix ]]"
Name = "[[ .instance ]][[ .consul.suffix ]]"
Protocol = "http"

5
consul/config/service-intentions/miniflux.hcl
View File

@ -1,9 +1,8 @@
[[- $c := merge .miniflux . ]]
Kind = "service-intentions"
Name = "[[ .miniflux.instance ]][[ $c.consul.suffix ]]"
Name = "[[ .instance ]][[ .consul.suffix ]]"
Sources = [
{
Name = "[[ $c.traefik.instance ]][[ $c.consul.suffix ]]"
Name = "[[ (merge .miniflux .).traefik.instance ]][[ .consul.suffix ]]"
Permissions = [
{
Action = "allow"

2
images/miniflux/Dockerfile
View File

@ -1,7 +1,7 @@
FROM [[ .docker.repo ]][[ .docker.base_images.alpine.image ]]
MAINTAINER [[ .docker.maintainer ]]
ARG MINIFLUX_VERSION=2.0.50
ARG MINIFLUX_VERSION=2.0.51
ENV LISTEN_ADDR=0.0.0.0:8085 \
RUN_MIGRATIONS=1 \

4
init/vault-miniflux
View File

@ -2,7 +2,7 @@
set -euo pipefail
[[- template "common/vault.mkpgrole.sh.tpl"
[[- template "common/vault.mkpgrole.sh"
dict "ctx" .
"config" (dict "role" .miniflux.instance "database" "postgres")
"config" (dict "role" .instance "database" "postgres")
]]

32
miniflux.nomad.hcl
View File

@ -1,8 +1,8 @@
[[- $c := merge .miniflux . -]]
job [[ .miniflux.instance | toJSON ]] {
job [[ .instance | toJSON ]] {
[[ template "common/job_start.tpl" $c ]]
[[ template "common/job_start" $c ]]
group "miniflux" {
@ -20,12 +20,12 @@ job [[ .miniflux.instance | toJSON ]] {
}
service {
name = "[[ .miniflux.instance ]][[ $c.consul.suffix ]]"
name = "[[ .instance ]][[ .consul.suffix ]]"
port = 8085
[[ template "common/prometheus_meta.tpl" $c ]]
[[ template "common/prometheus_meta" $c ]]
[[ template "common/connect.tpl" $c ]]
[[ template "common/connect" $c ]]
check {
type = "http"
@ -42,23 +42,23 @@ job [[ .miniflux.instance | toJSON ]] {
tags = [
"[[ $c.traefik.instance ]].enable=true",
"[[ $c.traefik.instance ]].http.routers.[[ .miniflux.instance ]][[ $c.consul.suffix ]].rule=Host(`[[ (urlParse .miniflux.public_url).Hostname ]]`)
"[[ $c.traefik.instance ]].http.routers.[[ .instance ]][[ .consul.suffix ]].rule=Host(`[[ (urlParse .miniflux.public_url).Hostname ]]`)
[[- if not (regexp.Match "^/?$" (urlParse .miniflux.public_url).Path) ]] && PathPrefix(`[[ (urlParse .miniflux.public_url).Path ]]`)[[ end ]]",
"[[ $c.traefik.instance ]].http.routers.[[ .miniflux.instance ]][[ $c.consul.suffix ]].entrypoints=[[ join $c.traefik.entrypoints "," ]]",
"[[ $c.traefik.instance ]].http.routers.[[ .instance ]][[ .consul.suffix ]].entrypoints=[[ join $c.traefik.entrypoints "," ]]",
[[- if not (regexp.Match "^/?$" (urlParse .miniflux.public_url).Path) ]]
"[[ $c.traefik.instance ]].http.middlewares.[[ .miniflux.instance ]][[ $c.consul.suffix ]]-prefix.stripprefix.prefixes=[[ (urlParse .miniflux.public_url).Path ]]",
"[[ $c.traefik.instance ]].http.routers.[[ .miniflux.instance ]][[ $c.consul.suffix ]].middlewares=[[ .miniflux.instance ]][[ $c.consul.suffix ]]-prefix,[[ template "common/traefik_middlewares.tpl" $c.traefik ]]",
"[[ $c.traefik.instance ]].http.middlewares.[[ .instance ]][[ .consul.suffix ]]-prefix.stripprefix.prefixes=[[ (urlParse .miniflux.public_url).Path ]]",
"[[ $c.traefik.instance ]].http.routers.[[ .instance ]][[ .consul.suffix ]].middlewares=[[ .instance ]][[ .consul.suffix ]]-prefix,[[ template "common/traefik_middlewares" $c.traefik ]]",
[[- else ]]
"[[ $c.traefik.instance ]].http.routers.[[ .miniflux.instance ]][[ $c.consul.suffix ]].middlewares=[[ template "common/traefik_middlewares.tpl" $c.traefik ]]",
"[[ $c.traefik.instance ]].http.routers.[[ .instance ]][[ .consul.suffix ]].middlewares=[[ template "common/traefik_middlewares" $c.traefik ]]",
[[- end ]]
]
}
[[- if $c.prometheus.enabled ]]
[[ template "common/task.metrics_proxy.tpl" $c ]]
[[ template "common/task.metrics_proxy" $c ]]
[[- end ]]
[[ template "common/task.wait_for.tpl" $c ]]
[[ template "common/task.wait_for" $c ]]
task "miniflux" {
driver = [[ $c.nomad.driver | toJSON ]]
@ -70,7 +70,7 @@ job [[ .miniflux.instance | toJSON ]] {
}
vault {
policies = ["[[ .miniflux.instance ]][[ $c.consul.suffix ]]"]
policies = ["[[ .instance ]][[ .consul.suffix ]]"]
env = false
disable_file = true
}
@ -81,12 +81,12 @@ job [[ .miniflux.instance | toJSON ]] {
[[- if $c.prometheus.enabled ]]
METRICS_COLLECTOR = 1
[[- end ]]
[[ template "common/proxy_env.tpl" $c ]]
[[ template "common/proxy_env" $c ]]
}
[[ template "common/file_env.tpl" $c.env ]]
[[ template "common/file_env" $c.env ]]
[[ template "common/resources.tpl" .miniflux.resources ]]
[[ template "common/resources" .miniflux.resources ]]
}
}
}

2
prep.d/mv_conf.sh
View File

@ -1 +1 @@
[[ template "common/mv_conf.sh.tpl" dict "ctx" . "services" (dict "miniflux" .miniflux.instance) ]]
[[ template "common/mv_conf.sh" dict "ctx" . "services" (dict "miniflux" .instance) ]]

10
variables.yml
View File

@ -1,14 +1,14 @@
---
miniflux:
# Name of this instance (controls job and service name)
instance: miniflux
# Name of this instance (controls job and service name)
instance: miniflux
miniflux:
# Number of instance to run
count: 1
# Docker image to use
image: danielberteaud/miniflux:2.0.50-1
image: '[[ .docker.repo ]]miniflux:2.0.51-1'
# Resources for the container
resources:
@ -20,7 +20,7 @@ miniflux:
# Additional env var to pass to the container
env:
DATABASE_URL: postgresql://{{ with secret "[[ .vault.prefix ]]database/creds/[[ .miniflux.instance ]]" }}{{ .Data.username }}:{{ urlquery .Data.password }}{{ end }}@localhost:5432/[[ .miniflux.instance ]]?sslmode=disable
DATABASE_URL: postgresql://{{ with secret "[[ .vault.prefix ]]database/creds/[[ .instance ]]" }}{{ .Data.username }}:{{ urlquery .Data.password }}{{ end }}@localhost:5432/[[ .instance ]]?sslmode=disable
# Public URL of the service
public_url: https://flux.example.org

4
vault/policies/miniflux.hcl
View File

@ -1,6 +1,6 @@
path "[[ .vault.prefix ]]kv/data/service/[[ .miniflux.instance ]]" {
path "[[ .vault.prefix ]]kv/data/service/[[ .instance ]]" {
capabilities = ["read"]
}
path "[[ .vault.prefix ]]database/creds/[[ .miniflux.instance ]]" {
path "[[ .vault.prefix ]]database/creds/[[ .instance ]]" {
capabilities = ["read"]
}