fix the default missing config based off example config, this was affecting #443
This commit is contained in:
parent
8a3bb1a562
commit
4259d4f396
|
|
@ -266,6 +266,12 @@ nfpms:
|
||||||
- src: examples/up.yaml.example
|
- src: examples/up.yaml.example
|
||||||
dst: /etc/unpoller/up.yaml.example
|
dst: /etc/unpoller/up.yaml.example
|
||||||
type: config
|
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"
|
- src: "README.html"
|
||||||
dst: /etc/unpoller/readme.html
|
dst: /etc/unpoller/readme.html
|
||||||
type: config
|
type: config
|
||||||
|
|
@ -315,7 +321,7 @@ nfpms:
|
||||||
dst: /usr/local/lib/unpoller/web/static/index.html
|
dst: /usr/local/lib/unpoller/web/static/index.html
|
||||||
type: config
|
type: config
|
||||||
- src: init/webserver/static/css/*
|
- src: init/webserver/static/css/*
|
||||||
dst: /usr/local/lib/unpoller/web/static//css
|
dst: /usr/local/lib/unpoller/web/static/css
|
||||||
type: config
|
type: config
|
||||||
- src: init/webserver/static/images/*
|
- src: init/webserver/static/images/*
|
||||||
dst: /usr/local/lib/unpoller/web/static/images
|
dst: /usr/local/lib/unpoller/web/static/images
|
||||||
|
|
|
||||||
10
Dockerfile
10
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
|
FROM gcr.io/distroless/static-debian11
|
||||||
|
|
||||||
COPY unpoller /usr/bin/unpoller
|
COPY unpoller /usr/bin/unpoller
|
||||||
|
COPY --from=builder /etc/unpoller /etc/unpoller
|
||||||
|
|
||||||
ENTRYPOINT [ "/usr/bin/unpoller" ]
|
ENTRYPOINT [ "/usr/bin/unpoller" ]
|
||||||
|
|
|
||||||
|
|
@ -33,10 +33,10 @@ func DefaultConfFile() string {
|
||||||
case "netbsd":
|
case "netbsd":
|
||||||
fallthrough
|
fallthrough
|
||||||
case "openbsd":
|
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:
|
default:
|
||||||
// linux and everything else
|
// 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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue