Skip to content

Commit 87caf9a

Browse files
committed
Fix in release pipeline with config file for linux packages
1 parent 4ef1323 commit 87caf9a

3 files changed

Lines changed: 10 additions & 11 deletions

File tree

.goreleaser.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ nfpms:
9999
contents:
100100
- src: service/linux/systemd.service
101101
dst: /lib/systemd/system/osctrld.service
102-
- src: service/osctrld.yaml
102+
- src: service/osctrld-sample.yaml
103103
dst: /etc/osctrld/osctrld.yaml
104104
type: config|noreplace
105105

README.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ Full documentation for the osctrl project is available at [https://osctrl.net](h
5353
For this repository, the most useful starting points are:
5454

5555
- [service/osctrld-sample.yaml](service/osctrld-sample.yaml) for a YAML configuration example.
56-
- [service/osctrld.yaml](service/osctrld.yaml) and [service/osctrld.json](service/osctrld.json) for additional config examples.
5756
- [service/linux/systemd.service](service/linux/systemd.service) for Linux service deployment.
5857
- [service/darwin/net.osctrl.daemon.plist](service/darwin/net.osctrl.daemon.plist) for macOS launchd deployment.
5958
- [SECURITY.md](SECURITY.md) for vulnerability reporting and operator security guidance.
@@ -171,7 +170,7 @@ COMMANDS:
171170
Validate configuration before launching:
172171

173172
```shell
174-
osctrld check-config --config /etc/osctrld/config.yaml
173+
osctrld check-config --config /etc/osctrld/osctrld.yaml
175174
```
176175

177176
Generate a fresh config template:
@@ -183,26 +182,26 @@ osctrld default-config
183182
Retrieve flags and certificates:
184183

185184
```shell
186-
osctrld flags --config /etc/osctrld/config.yaml
187-
osctrld cert --config /etc/osctrld/config.yaml
185+
osctrld flags --config /etc/osctrld/osctrld.yaml
186+
osctrld cert --config /etc/osctrld/osctrld.yaml
188187
```
189188

190189
Enroll a node:
191190

192191
```shell
193-
osctrld enroll --config /etc/osctrld/config.yaml
192+
osctrld enroll --config /etc/osctrld/osctrld.yaml
194193
```
195194

196195
Verify a node:
197196

198197
```shell
199-
osctrld verify --config /etc/osctrld/config.yaml
198+
osctrld verify --config /etc/osctrld/osctrld.yaml
200199
```
201200

202201
Run in daemon mode:
203202

204203
```shell
205-
osctrld service --config /etc/osctrld/config.yaml --interval 60
204+
osctrld service --config /etc/osctrld/osctrld.yaml --interval 60
206205
```
207206

208207
In daemon mode, osctrld will:
@@ -219,14 +218,14 @@ In daemon mode, osctrld will:
219218
```shell
220219
cp osctrld /opt/osctrld/
221220
cp service/linux/systemd.service /etc/systemd/system/osctrld.service
222-
cp service/osctrld-sample.yaml /etc/osctrld/config.yaml
221+
cp service/osctrld-sample.yaml /etc/osctrld/osctrld.yaml
223222
224223
systemctl daemon-reload
225224
systemctl enable osctrld
226225
systemctl start osctrld
227226
```
228227

229-
Edit `/etc/osctrld/config.yaml` with the correct osctrl URL, environment, secret, and local osquery paths before starting the service in production.
228+
Edit `/etc/osctrld/osctrld.yaml` with the correct osctrl URL, environment, secret, and local osquery paths before starting the service in production.
230229

231230
### 🍎 macOS launchd
232231

service/linux/systemd.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Restart=on-failure
1111
RestartSec=10
1212

1313
WorkingDirectory=/opt/osctrld
14-
ExecStart=/opt/osctrld/osctrld service --config=/etc/osctrld/service.yaml
14+
ExecStart=/opt/osctrld/osctrld service --config=/etc/osctrld/osctrld.yaml
1515

1616
# make sure log directory exists and owned by syslog
1717
PermissionsStartOnly=true

0 commit comments

Comments
 (0)