Skip to content

Commit 238c49e

Browse files
committedMay 15, 2023
update services to expect binary in usr/bin
This seems to be more correct than user/local/bin, and goreleaser's defaults corroborate that. Resolves #328, as this behavior is the systemd default Adds on to #320 as well.
1 parent 583f334 commit 238c49e

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed
 

‎.goreleaser.yml

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ nfpms:
5252
formats:
5353
- deb
5454
- rpm
55+
bindir: /usr/bin # explicitly defining the default
5556
overrides:
5657
deb:
5758
scripts:

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ VERSION := $(shell git describe --tags --abbrev=0 | tr -d '[:alpha:]')
77
LDFLAGS := "-X main.version=$(VERSION)"
88

99
DESTDIR := build
10-
PREFIX := usr/local
10+
PREFIX := usr
1111
INSTALL_BIN := $(DESTDIR)/$(PREFIX)/bin
1212
INIT_PREFIX := $(DESTDIR)/etc/init.d
1313
SYSTEMD_PREFIX := $(DESTDIR)/lib/systemd/system

‎pkg/gokeyless.service

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Type=simple
77
User=keyless
88
Group=keyless
99
WorkingDirectory=/etc/keyless
10-
ExecStart=/usr/local/bin/gokeyless
10+
ExecStart=/usr/bin/gokeyless
1111

1212
[Install]
1313
WantedBy=multi-user.target

‎pkg/gokeyless.sysv

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if [ `id -u` -ne 0 ]; then
2222
fi
2323

2424
name=gokeyless
25-
program=/usr/local/bin/gokeyless
25+
program=/usr/bin/gokeyless
2626
pidfile="/var/run/$name.pid"
2727

2828
# Optional

0 commit comments

Comments
 (0)