github-personal/matchbox
1
0
Fork 0
mirror of https://github.com/outbackdingo/matchbox.git synced 2026-01-27 10:19:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

*: Use platform agnostic Makefile, stop creating empty env file

Browse Source 
* systemd users can use /etc/bootcfg.env if they choose to
use environment files
This commit is contained in:
Dalton Hubble
2016-05-27 11:56:24 -07:00
parent dd6e69102b
commit a6113b5042
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/config.md
View File

@@ -7,8 +7,8 @@ Configuration arguments can be provided as flags or as environment variables.
|------|----------|---------|---------|
| -address | BOOTCFG_ADDRESS | 127.0.0.1:8080 | 0.0.0.0:8080 |
| -log-level | BOOTCFG_LOG_LEVEL | info | critical, error, warning, notice, info, debug |
| -data-path | BOOTCFG_DATA_PATH | /var/lib/bootcfg | ~/.bootcfg |
| -assets-path | BOOTCFG_ASSETS_PATH | /var/lib/bootcfg/assets | ~/.bootcfg/assets |
| -data-path | BOOTCFG_DATA_PATH | /var/lib/bootcfg | ./examples |
| -assets-path | BOOTCFG_ASSETS_PATH | /var/lib/bootcfg/assets | ./examples/assets |
| -rpc-address | BOOTCFG_RPC_ADDRESS | (RPC server disabled) | 127.0.0.1:8081 |
| -key-ring-path | BOOTCFG_KEY_RING_PATH | (no key ring) | ~/.secrets/vault/bootcfg/secring.gpg |
| (no flag) | BOOTCFG_PASSPHRASE | (no passphrase) | "secret passphrase" |

3
Makefile
View File

@@ -1,7 +1,5 @@
BIN_DIR=/usr/local/bin
DATA_DIR=/var/lib/bootcfg
ENV_FILE=/etc/bootcfg.env
all: build
@@ -12,7 +10,6 @@ test:
./test
install:
touch ${ENV_FILE}
cp bin/bootcfg $(BIN_DIR)
cp bin/bootcmd $(BIN_DIR)
@echo "**************"

1
contrib/systemd/bootcfg.service
View File

@@ -6,7 +6,6 @@ Documentation=https://github.com/coreos/coreos-baremetal
Type=simple
User=bootcfg
Group=bootcfg
EnvironmentFile=/etc/bootcfg.env
ExecStart=/usr/local/bin/bootcfg -address=0.0.0.0:8080 -log-level=debug
# systemd.exec