mustard/qubes-salt-stuff
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hmmm

Browse source
This commit is contained in:
mustard 2025-10-24 18:59:11 +02:00
parent 9cbf4a7088
commit 4f82e5ab96
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Makefile
View file

@ -21,6 +21,16 @@ endif
BUNDLEIN := .bundles/qubes-mgmt-salt BUNDLEIN := .bundles/qubes-mgmt-salt
ifeq (apply, $(firstword $(MAKECMDGOALS)))
# use the rest as arguments for "run"
APPLY_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
# ...and turn them into do-nothing targets
$(eval $(APPLY_ARGS):;@:)
endif
clean-workdir = git init -q -b $* && git diff --quiet && git diff --cached --quiet || (echo 'dirty tree; check git status' && false) clean-workdir = git init -q -b $* && git diff --quiet && git diff --cached --quiet || (echo 'dirty tree; check git status' && false)
.PHONY: guard-domu .PHONY: guard-domu
@ -71,10 +81,11 @@ install:
mkdir -p /srv/user mkdir -p /srv/user
ln -s $(CURDIR)/salt /srv/user/salt ln -s $(CURDIR)/salt /srv/user/salt
.PHONY: apply
apply: apply:
install -D -oroot -groot -m0644 conf/z_user.conf /etc/salt/minion.d/z_user.conf install -D -oroot -groot -m0644 conf/z_user.conf /etc/salt/minion.d/z_user.conf
install -D -oroot -groot -m0644 conf/overrides.conf /usr/local/etc/salt/minion.d/overrides.conf install -D -oroot -groot -m0644 conf/overrides.conf /usr/local/etc/salt/minion.d/overrides.conf
qubesctl top.enable $(ARGS) qubesctl top.enable $(APPLY_ARGS)
qubesctl --show-output state.apply $(ARGS) saltenv=user qubesctl --show-output state.apply $(APPLY_ARGS) saltenv=user
qubesctl top.disable $(ARGS) qubesctl top.disable $(APPLY_ARGS)