diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 80488465..f39f6632 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -266,6 +266,12 @@ nfpms: - src: examples/up.yaml.example dst: /etc/unpoller/up.yaml.example type: config + # copy example by default to real locations, people can override, cnfg uses this. + - src: examples/up.conf.example + dst: /etc/unpoller/up.conf + type: config|noreplace + + # common useful info - src: "README.html" dst: /etc/unpoller/readme.html type: config @@ -315,7 +321,7 @@ nfpms: dst: /usr/local/lib/unpoller/web/static/index.html type: config - src: init/webserver/static/css/* - dst: /usr/local/lib/unpoller/web/static//css + dst: /usr/local/lib/unpoller/web/static/css type: config - src: init/webserver/static/images/* dst: /usr/local/lib/unpoller/web/static/images diff --git a/Dockerfile b/Dockerfile index fac42da8..74705022 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,15 @@ +FROM busybox:latest as builder +# we have to do this hop because distroless is bare without common shell commands + +RUN mkdir -p /etc/unpoller +# copy over example config for cnfg environment-based default config +COPY examples/up.conf.example /etc/unpoller/up.conf +COPY unpoller_manual.html /etc/unpoller/manual.html +COPY README.html /etc/unpoller/readme.html + FROM gcr.io/distroless/static-debian11 COPY unpoller /usr/bin/unpoller +COPY --from=builder /etc/unpoller /etc/unpoller ENTRYPOINT [ "/usr/bin/unpoller" ] diff --git a/pkg/poller/config.go b/pkg/poller/config.go index 47797505..2eb3242f 100644 --- a/pkg/poller/config.go +++ b/pkg/poller/config.go @@ -33,10 +33,10 @@ func DefaultConfFile() string { case "netbsd": fallthrough case "openbsd": - return "/etc/unifi-poller/up.conf,/usr/local/etc/unifi-poller/up.conf" + return "/etc/unpoller/up.conf,/etc/unifi-poller/up.conf,/usr/local/etc/unifi-poller/up.conf" default: // linux and everything else - return "/config/unifi-poller.conf,/etc/unifi-poller/up.conf" + return "/etc/unpoller/up.conf,/config/unifi-poller.conf,/etc/unifi-poller/up.conf" } }