diff --git a/.goreleaser.yaml b/.goreleaser.yaml index d1fccd03..904389d5 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -93,6 +93,7 @@ archives: - unpoller_manual.html - rsrc_windows_*.syso - examples/up.*.example + - init/windows/application.ico dockers: - id: docker-linux-amd64 @@ -242,9 +243,10 @@ nfpms: version_metadata: git section: default priority: extra + # provides defines the packages. The first one defines the package name. provides: - - unifi-poller - unpoller + - unifi-poller # Contents to add to the package. # GoReleaser will automatically add the binaries. @@ -252,7 +254,11 @@ nfpms: - dst: /etc/unpoller type: dir file_info: - mode: 0700 + mode: 0740 + - dst: /usr/share/doc/unpoller + type: dir + file_info: + mode: 0755 # Example config files - src: examples/up.conf.example @@ -270,6 +276,59 @@ nfpms: - src: "unpoller_manual.html" dst: /etc/unpoller/manual.html type: config + + # man pages + - src: unpoller.1.gz + dst: /usr/share/man/man1/unpoller.1.gz + type: man + - src: LICENSE + dst: /usr/share/doc/unpoller/LICENSE + type: man + - src: unpoller_manual.html + dst: /usr/share/doc/unpoller/unpoller_manual.html + type: man + + # systemd service + - src: init/systemd/unpoller.service + dst: /lib/systemd/service/unpoller.service + type: config + + # freebsd rc service + - src: init/bsd/freebsd.rc.d + dst: /usr/local/etc/rc.d/unpoller + type: config + + # web server statics + - dst: /usr/local/lib/unpoller/web/static/ + type: dir + file_info: + mode: 0755 + - dst: /usr/local/lib/unpoller/web/static/css + type: dir + file_info: + mode: 0755 + - dst: /usr/local/lib/unpoller/web/static/images + type: dir + file_info: + mode: 0755 + - dst: /usr/local/lib/unpoller/web/static/js + type: dir + file_info: + mode: 0755 + - src: init/webserver/index.html + dst: /usr/local/lib/unpoller/web/static/index.html + type: config + - src: init/webserver/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 + type: config + - src: init/webserver/static/js/* + dst: /usr/local/lib/unpoller/web/static/js + type: config + + # signing scripts: postinstall: "scripts/after-install.sh" diff --git a/Makefile b/Makefile index 5a2e249f..eceb5602 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ all: clean generate build #################### # Prepare a release. Called in Travis CI. -release: clean linux_packages freebsd_packages windows +release: clean windows # Prepareing a release! mkdir -p $@ mv $(BINARY).*.linux $(BINARY).*.freebsd $@/ @@ -93,6 +93,7 @@ dmg: clean macapp # Delete all build assets. clean: + rm -rf dist rm -f $(BINARY) $(BINARY).*.{macos,freebsd,linux,exe,upx}{,.gz,.zip} $(BINARY).1{,.gz} $(BINARY).rb rm -f $(BINARY){_,-}*.{deb,rpm,txz} v*.tar.gz.sha256 examples/MANUAL .metadata.make rsrc_*.syso rm -f cmd/$(BINARY)/README{,.html} README{,.html} ./$(BINARY)_manual.html rsrc.syso $(MACAPP).app.zip @@ -137,51 +138,12 @@ $(BINARY): main.go go build -o $(BINARY) -ldflags "-w -s $(VERSION_LDFLAGS) $(EXTRA_LDFLAGS) " [ -z "$(UPXPATH)" ] || $(UPXPATH) -q9 $@ -linux: $(BINARY).amd64.linux -$(BINARY).amd64.linux: main.go - # Building linux 64-bit x86 binary. - GOOS=linux GOARCH=amd64 go build -o $@ -ldflags "-w -s $(VERSION_LDFLAGS) $(EXTRA_LDFLAGS) " - [ -z "$(UPXPATH)" ] || $(UPXPATH) -q9 $@ - -linux386: $(BINARY).i386.linux -$(BINARY).i386.linux: main.go - # Building linux 32-bit x86 binary. - GOOS=linux GOARCH=386 go build -o $@ -ldflags "-w -s $(VERSION_LDFLAGS) $(EXTRA_LDFLAGS) " - [ -z "$(UPXPATH)" ] || $(UPXPATH) -q9 $@ - -arm: arm64 armhf - -arm64: $(BINARY).arm64.linux -$(BINARY).arm64.linux: main.go - # Building linux 64-bit ARM binary. - GOOS=linux GOARCH=arm64 go build -o $@ -ldflags "-w -s $(VERSION_LDFLAGS) $(EXTRA_LDFLAGS) " - [ -z "$(UPXPATH)" ] || $(UPXPATH) -q9 $@ - -armhf: $(BINARY).armhf.linux -$(BINARY).armhf.linux: main.go - # Building linux 32-bit ARM binary. - GOOS=linux GOARCH=arm GOARM=6 go build -o $@ -ldflags "-w -s $(VERSION_LDFLAGS) $(EXTRA_LDFLAGS) " - [ -z "$(UPXPATH)" ] || $(UPXPATH) -q9 $@ - macos: $(BINARY).amd64.macos $(BINARY).amd64.macos: main.go # Building darwin 64-bit x86 binary. GOOS=darwin GOARCH=amd64 go build -o $@ -ldflags "-w -s $(VERSION_LDFLAGS) $(EXTRA_LDFLAGS) " [ -z "$(UPXPATH)" ] || $(UPXPATH) -q9 $@ -freebsd: $(BINARY).amd64.freebsd -$(BINARY).amd64.freebsd: main.go - GOOS=freebsd GOARCH=amd64 go build -o $@ -ldflags "-w -s $(VERSION_LDFLAGS) $(EXTRA_LDFLAGS) " - -freebsd386: $(BINARY).i386.freebsd -$(BINARY).i386.freebsd: main.go - GOOS=freebsd GOARCH=386 go build -o $@ -ldflags "-w -s $(VERSION_LDFLAGS) $(EXTRA_LDFLAGS) " - [ -z "$(UPXPATH)" ] || $(UPXPATH) -q9 $@ || true - -freebsdarm: $(BINARY).armhf.freebsd -$(BINARY).armhf.freebsd: main.go - GOOS=freebsd GOARCH=arm go build -o $@ -ldflags "-w -s $(VERSION_LDFLAGS) $(EXTRA_LDFLAGS) " - exe: $(BINARY).amd64.exe windows: $(BINARY).amd64.exe $(BINARY).amd64.exe: rsrc.syso main.go @@ -193,206 +155,12 @@ $(BINARY).amd64.exe: rsrc.syso main.go ##### Packages ##### #################### -linux_packages: rpm deb rpm386 deb386 debarm rpmarm debarmhf rpmarmhf - -freebsd_packages: freebsd_pkg freebsd386_pkg freebsdarm_pkg - macapp: $(MACAPP).app $(MACAPP).app: macos [ -z "$(MACAPP)" ] || mkdir -p init/macos/$(MACAPP).app/Contents/MacOS [ -z "$(MACAPP)" ] || cp $(BINARY).amd64.macos init/macos/$(MACAPP).app/Contents/MacOS/$(MACAPP) [ -z "$(MACAPP)" ] || cp -rp init/macos/$(MACAPP).app $(MACAPP).app -rpm: $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm -$(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm: package_build_linux check_fpm - @echo "Building 'rpm' package for $(BINARY) version '$(RPMVERSION)-$(ITERATION)'." - fpm -s dir -t rpm $(PACKAGE_ARGS) -a x86_64 -v $(RPMVERSION) -C $< $(EXTRA_FPM_FLAGS) - [ "$(SIGNING_KEY)" == "" ] || rpmsign --key-id=$(SIGNING_KEY) --resign $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm - -deb: $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb -$(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb: package_build_linux check_fpm - @echo "Building 'deb' package for $(BINARY) version '$(VERSION)-$(ITERATION)'." - fpm -s dir -t deb $(PACKAGE_ARGS) -a amd64 -v $(VERSION) -C $< $(EXTRA_FPM_FLAGS) - [ "$(SIGNING_KEY)" == "" ] || debsigs --default-key="$(SIGNING_KEY)" --sign=origin $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb - -rpm386: $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm -$(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm: package_build_linux_386 check_fpm - @echo "Building 32-bit 'rpm' package for $(BINARY) version '$(RPMVERSION)-$(ITERATION)'." - fpm -s dir -t rpm $(PACKAGE_ARGS) -a i386 -v $(RPMVERSION) -C $< $(EXTRA_FPM_FLAGS) - [ "$(SIGNING_KEY)" == "" ] || rpmsign --key-id=$(SIGNING_KEY) --resign $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm - -deb386: $(BINARY)_$(VERSION)-$(ITERATION)_i386.deb -$(BINARY)_$(VERSION)-$(ITERATION)_i386.deb: package_build_linux_386 check_fpm - @echo "Building 32-bit 'deb' package for $(BINARY) version '$(VERSION)-$(ITERATION)'." - fpm -s dir -t deb $(PACKAGE_ARGS) -a i386 -v $(VERSION) -C $< $(EXTRA_FPM_FLAGS) - [ "$(SIGNING_KEY)" == "" ] || debsigs --default-key="$(SIGNING_KEY)" --sign=origin $(BINARY)_$(VERSION)-$(ITERATION)_i386.deb - -rpmarm: $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm -$(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm: package_build_linux_arm64 check_fpm - @echo "Building 64-bit ARM8 'rpm' package for $(BINARY) version '$(RPMVERSION)-$(ITERATION)'." - fpm -s dir -t rpm $(PACKAGE_ARGS) -a arm64 -v $(RPMVERSION) -C $< $(EXTRA_FPM_FLAGS) - [ "$(SIGNING_KEY)" == "" ] || rpmsign --key-id=$(SIGNING_KEY) --resign $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm - -debarm: $(BINARY)_$(VERSION)-$(ITERATION)_arm64.deb -$(BINARY)_$(VERSION)-$(ITERATION)_arm64.deb: package_build_linux_arm64 check_fpm - @echo "Building 64-bit ARM8 'deb' package for $(BINARY) version '$(VERSION)-$(ITERATION)'." - fpm -s dir -t deb $(PACKAGE_ARGS) -a arm64 -v $(VERSION) -C $< $(EXTRA_FPM_FLAGS) - [ "$(SIGNING_KEY)" == "" ] || debsigs --default-key="$(SIGNING_KEY)" --sign=origin $(BINARY)_$(VERSION)-$(ITERATION)_arm64.deb - -rpmarmhf: $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm -$(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm: package_build_linux_armhf check_fpm - @echo "Building 32-bit ARM6/7 HF 'rpm' package for $(BINARY) version '$(RPMVERSION)-$(ITERATION)'." - fpm -s dir -t rpm $(PACKAGE_ARGS) -a armhf -v $(RPMVERSION) -C $< $(EXTRA_FPM_FLAGS) - [ "$(SIGNING_KEY)" == "" ] || rpmsign --key-id=$(SIGNING_KEY) --resign $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm - -debarmhf: $(BINARY)_$(VERSION)-$(ITERATION)_armhf.deb -$(BINARY)_$(VERSION)-$(ITERATION)_armhf.deb: package_build_linux_armhf check_fpm - @echo "Building 32-bit ARM6/7 HF 'deb' package for $(BINARY) version '$(VERSION)-$(ITERATION)'." - fpm -s dir -t deb $(PACKAGE_ARGS) -a armhf -v $(VERSION) -C $< $(EXTRA_FPM_FLAGS) - [ "$(SIGNING_KEY)" == "" ] || debsigs --default-key="$(SIGNING_KEY)" --sign=origin $(BINARY)_$(VERSION)-$(ITERATION)_armhf.deb - -freebsd_pkg: $(BINARY)-$(VERSION)_$(ITERATION).amd64.txz -$(BINARY)-$(VERSION)_$(ITERATION).amd64.txz: package_build_freebsd check_fpm - @echo "Building 'freebsd pkg' package for $(BINARY) version '$(VERSION)-$(ITERATION)'." - fpm -s dir -t freebsd $(PACKAGE_ARGS) -a amd64 -v $(VERSION) -p $(BINARY)-$(VERSION)_$(ITERATION).amd64.txz -C $< $(EXTRA_FPM_FLAGS) - -freebsd386_pkg: $(BINARY)-$(VERSION)_$(ITERATION).i386.txz -$(BINARY)-$(VERSION)_$(ITERATION).i386.txz: package_build_freebsd_386 check_fpm - @echo "Building 32-bit 'freebsd pkg' package for $(BINARY) version '$(VERSION)-$(ITERATION)'." - fpm -s dir -t freebsd $(PACKAGE_ARGS) -a 386 -v $(VERSION) -p $(BINARY)-$(VERSION)_$(ITERATION).i386.txz -C $< $(EXTRA_FPM_FLAGS) - -freebsdarm_pkg: $(BINARY)-$(VERSION)_$(ITERATION).armhf.txz -$(BINARY)-$(VERSION)_$(ITERATION).armhf.txz: package_build_freebsd_arm check_fpm - @echo "Building 32-bit ARM6/7 HF 'freebsd pkg' package for $(BINARY) version '$(VERSION)-$(ITERATION)'." - fpm -s dir -t freebsd $(PACKAGE_ARGS) -a arm -v $(VERSION) -p $(BINARY)-$(VERSION)_$(ITERATION).armhf.txz -C $< $(EXTRA_FPM_FLAGS) - -# Build an environment that can be packaged for linux. -package_build_linux: readme man plugins_linux_amd64 after-install-rendered.sh before-remove-rendered.sh linux - # Building package environment for linux. - mkdir -p $@/usr/bin $@/etc/$(BINARY) $@/usr/share/man/man1 $@/usr/share/doc/$(BINARY) $@/usr/lib/$(BINARY) - # Copying the binary, config file, unit file, and man page into the env. - cp $(BINARY).amd64.linux $@/usr/bin/$(BINARY) - cp *.1.gz $@/usr/share/man/man1 - rm -f $@/usr/lib/$(BINARY)/*.so - [ ! -f *amd64.so ] || cp *amd64.so $@/usr/lib/$(BINARY)/ - cp examples/$(CONFIG_FILE).example $@/etc/$(BINARY)/ - cp examples/$(CONFIG_FILE).example $@/etc/$(BINARY)/$(CONFIG_FILE) - cp LICENSE *.html examples/*?.?* $@/usr/share/doc/$(BINARY)/ - [ "$(FORMULA)" != "service" ] || mkdir -p $@/lib/systemd/system - [ "$(FORMULA)" != "service" ] || \ - sed -e "s/{{BINARY}}/$(BINARY)/g" -e "s/{{DESC}}/$(DESC)/g" \ - init/systemd/template.unit.service > $@/lib/systemd/system/$(BINARY).service - -after-install-rendered.sh: - sed -e "s/{{BINARY}}/$(BINARY)/g" scripts/after-install.sh > after-install-rendered.sh - -before-remove-rendered.sh: - sed -e "s/{{BINARY}}/$(BINARY)/g" scripts/before-remove.sh > before-remove-rendered.sh - -package_build_linux_386: package_build_linux linux386 - mkdir -p $@ - cp -r $ $@/usr/local/etc/rc.d/$(BINARY) - [ "$(FORMULA)" != "service" ] || chmod +x $@/usr/local/etc/rc.d/$(BINARY) - -package_build_freebsd_386: package_build_freebsd freebsd386 - mkdir -p $@ - cp -r $ /dev/null || (echo "FPM missing. Install FPM: https://fpm.readthedocs.io/en/latest/installing.html" && false) - -################## -##### Extras ##### -################## - -plugins: $(patsubst %,%.so,$(PLUGINS)) -$(patsubst %,%.so,$(PLUGINS)): - go build -o $@ -ldflags "$(VERSION_LDFLAGS)" -buildmode=plugin ./plugins/$(patsubst %.so,%,$@) - -linux_plugins: plugins_linux_amd64 plugins_linux_i386 plugins_linux_arm64 plugins_linux_armhf -plugins_linux_amd64: $(patsubst %,%.linux_amd64.so,$(PLUGINS)) -$(patsubst %,%.linux_amd64.so,$(PLUGINS)): - GOOS=linux GOARCH=amd64 go build -o $@ -ldflags "$(VERSION_LDFLAGS)" -buildmode=plugin ./plugins/$(patsubst %.linux_amd64.so,%,$@) - -plugins_darwin: $(patsubst %,%.darwin.so,$(PLUGINS)) -$(patsubst %,%.darwin.so,$(PLUGINS)): - GOOS=darwin go build -o $@ -ldflags "$(VERSION_LDFLAGS)" -buildmode=plugin ./plugins/$(patsubst %.darwin.so,%,$@) - -# Run code tests and lint. -test: # lint - # Testing. - go test -race -covermode=atomic ./... -#lint: -# # Checking lint. -# GOOS=linux $(shell go env GOPATH)/bin/golangci-lint run $(GOLANGCI_LINT_ARGS) -# GOOS=freebsd $(shell go env GOPATH)/bin/golangci-lint run $(GOLANGCI_LINT_ARGS) -# GOOS=windows $(shell go env GOPATH)/bin/golangci-lint run $(GOLANGCI_LINT_ARGS) - -# Mockgen and bindata are examples. -# Your `go generate` may require other tools; add them! - -mockgen: $(shell go env GOPATH)/bin/mockgen -$(shell go env GOPATH)/bin/mockgen: - cd /tmp ; go get github.com/golang/mock/mockgen ; go install github.com/golang/mock/mockgen - -bindata: $(shell go env GOPATH)/bin/go-bindata -$(shell go env GOPATH)/bin/go-bindata: - cd /tmp ; go get -u github.com/go-bindata/go-bindata/... ; go install github.com/go-bindata/go-bindata - -generate: mockgen bindata - go generate ./... - -################## -##### Docker ##### -################## - -docker: - docker build -f init/docker/Dockerfile \ - --build-arg "BUILD_DATE=$(DATE)" \ - --build-arg "COMMIT=$(COMMIT)" \ - --build-arg "VERSION=$(VERSION)-$(ITERATION)" \ - --build-arg "LICENSE=$(LICENSE)" \ - --build-arg "DESC=$(DESC)" \ - --build-arg "VENDOR=$(VENDOR)" \ - --build-arg "AUTHOR=$(MAINT)" \ - --build-arg "BINARY=$(BINARY)" \ - --build-arg "SOURCE_URL=$(SOURCE_URL)" \ - --build-arg "CONFIG_FILE=$(CONFIG_FILE)" \ - --tag $(BINARY) . - #################### ##### Homebrew ##### #################### @@ -437,3 +205,6 @@ install: man readme $(BINARY) plugins_darwin /usr/bin/install -m 0644 -cp init/webserver/static/images/* $(PREFIX)/lib/$(BINARY)/web/static/images/ [ -f $(ETC)/$(BINARY)/$(CONFIG_FILE) ] || /usr/bin/install -m 0644 -cp examples/$(CONFIG_FILE).example $(ETC)/$(BINARY)/$(CONFIG_FILE) /usr/bin/install -m 0644 -cp LICENSE *.html examples/* $(PREFIX)/share/doc/$(BINARY)/ + +goreleaser-test: + goreleaser release --rm-dist --skip-validate --skip-publish --skip-sign --debug diff --git a/init/bsd/freebsd.rc.d b/init/bsd/freebsd.rc.d index 13eda4af..3a20f8f1 100755 --- a/init/bsd/freebsd.rc.d +++ b/init/bsd/freebsd.rc.d @@ -1,31 +1,31 @@ #!/bin/sh # -# FreeBSD rc.d startup script for {{BINARY}}. +# FreeBSD rc.d startup script for unpoller. # -# PROVIDE: {{BINARY}} +# PROVIDE: unpoller # REQUIRE: networking syslog # KEYWORD: . /etc/rc.subr -name="{{BINARYU}}" -real_name="{{BINARY}}" -rcvar="{{BINARYU}}_enable" -{{BINARYU}}_command="/usr/local/bin/${real_name}" -{{BINARYU}}_user="{{BINARY}}" -{{BINARYU}}_config="/usr/local/etc/${real_name}/{{CONFIG_FILE}}" +name="unpoller" +real_name="unpoller" +rcvar="unpoller_enable" +unpoller_command="/usr/local/bin/${real_name}" +unpoller_user="unpoller" +unpoller_config="/usr/local/etc/${real_name}/{{CONFIG_FILE}}" pidfile="/var/run/${real_name}/pid" -# This runs `daemon` as the `{{BINARYU}}_user` user. +# This runs `daemon` as the `unpoller_user` user. command="/usr/sbin/daemon" -command_args="-P ${pidfile} -r -t ${real_name} -T ${real_name} -l daemon ${{{BINARYU}}_command} -c ${{{BINARYU}}_config}" +command_args="-P ${pidfile} -r -t ${real_name} -T ${real_name} -l daemon ${unpoller_command} -c ${unpoller_config}" load_rc_config ${name} -: ${{{BINARYU}}_enable:=no} +: ${unpoller_enable:=no} # Make a place for the pid file. mkdir -p $(dirname ${pidfile}) -chown -R ${{BINARYU}}_user $(dirname ${pidfile}) +chown -R $unpoller_user $(dirname ${pidfile}) # Suck in optional exported override variables. # ie. add something like the following to this file: export UP_POLLER_DEBUG=true diff --git a/init/systemd/template.unit.service b/init/systemd/unpoller.service similarity index 59% rename from init/systemd/template.unit.service rename to init/systemd/unpoller.service index 0612b55f..92b62550 100644 --- a/init/systemd/template.unit.service +++ b/init/systemd/unpoller.service @@ -1,29 +1,29 @@ -# Systemd service unit for {{BINARY}}. +# Systemd service unit for unpoller. # This is part of Application Builder. # https://github.com/golift/application-builder # This file is installed when FORMULA is set to 'service'. [Unit] -Description={{BINARY}} - {{DESC}} +Description=unpoller - Telemetry and Observability for your UniFi Network After=network.target Requires=network.target [Service] -ExecStart=/usr/bin/{{BINARY}} $DAEMON_OPTS -EnvironmentFile=-/etc/default/{{BINARY}} -EnvironmentFile=-/etc/sysconfig/{{BINARY}} +ExecStart=/usr/bin/unpoller $DAEMON_OPTS +EnvironmentFile=-/etc/default/unpoller +EnvironmentFile=-/etc/sysconfig/unpoller Restart=always RestartSec=10 StandardOutput=syslog StandardError=syslog -SyslogIdentifier={{BINARY}} +SyslogIdentifier=unpoller Type=simple WorkingDirectory=/tmp # These should be set correctly for your environment. UMask=0002 -User={{BINARY}} -Group={{BINARY}} +User=unpoller +Group=unpoller [Install] WantedBy=multi-user.target diff --git a/init/windows/manifest.xml b/init/windows/manifest.xml index 9a97fd5f..e3628ae7 100644 --- a/init/windows/manifest.xml +++ b/init/windows/manifest.xml @@ -1,6 +1,6 @@ - + diff --git a/scripts/after-install.sh b/scripts/after-install.sh index d06888c9..4332ccee 100755 --- a/scripts/after-install.sh +++ b/scripts/after-install.sh @@ -9,21 +9,21 @@ OS="$(uname -s)" if [ "${OS}" = "Linux" ]; then # Make a user and group for this app, but only if it does not already exist. - id {{BINARY}} >/dev/null 2>&1 || \ - useradd --system --user-group --no-create-home --home-dir /tmp --shell /bin/false {{BINARY}} + id unpoller >/dev/null 2>&1 || \ + useradd --system --user-group --no-create-home --home-dir /tmp --shell /bin/false unpoller elif [ "${OS}" = "OpenBSD" ]; then - id {{BINARY}} >/dev/null 2>&1 || \ - useradd -g =uid -d /tmp -s /bin/false {{BINARY}} + id unpoller >/dev/null 2>&1 || \ + useradd -g =uid -d /tmp -s /bin/false unpoller elif [ "${OS}" = "FreeBSD" ]; then - id {{BINARY}} >/dev/null 2>&1 || \ - pw useradd {{BINARY}} -d /tmp -w no -s /bin/false + id unpoller >/dev/null 2>&1 || \ + pw useradd unpoller -d /tmp -w no -s /bin/false else - echo "Unknown OS: ${OS}, please add system user {{BINARY}} manually." + echo "Unknown OS: ${OS}, please add system user unpoller manually." fi if [ -x "/bin/systemctl" ]; then # Reload and restart - this starts the application as user nobody. /bin/systemctl daemon-reload - /bin/systemctl enable {{BINARY}} - /bin/systemctl restart {{BINARY}} + /bin/systemctl enable unpoller + /bin/systemctl restart unpoller fi diff --git a/scripts/before-remove.sh b/scripts/before-remove.sh index 209f70c7..83c4264c 100755 --- a/scripts/before-remove.sh +++ b/scripts/before-remove.sh @@ -9,9 +9,9 @@ if [ "$1" = "upgrade" ] || [ "$1" = "1" ] ; then fi if [ -x "/bin/systemctl" ]; then - /bin/systemctl stop {{BINARY}} - /bin/systemctl disable {{BINARY}} + /bin/systemctl stop unpoller + /bin/systemctl disable unpoller elif [ -x /usr/sbin/service ]; then - /usr/sbin/service {{BINARY}} stop - /usr/sbin/service {{BINARY}} disable + /usr/sbin/service unpoller stop + /usr/sbin/service unpoller disable fi