Skip to content

Commit

Permalink
fix: terminate option parsing for qvm commands
Browse files Browse the repository at this point in the history
  • Loading branch information
ben-grande committed Jun 19, 2024
1 parent 99fb138 commit bf0a4bc
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
26 changes: 13 additions & 13 deletions salt/signal/firewall.sls
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ SPDX-License-Identifier: AGPL-3.0-or-later
- require:
- qvm: {{ slsdotpath }}
- name: |
qvm-check -q --running {{ slsdotpath }} && qvm-pause {{ slsdotpath }}
qvm-firewall {{ slsdotpath }} reset
qvm-firewall {{ slsdotpath }} del --rule-no 0
qvm-check -q --running {{ slsdotpath }} && qvm-unpause {{ slsdotpath }}
qvm-firewall {{ slsdotpath }} add accept signal.org
qvm-firewall {{ slsdotpath }} add accept storage.signal.org
qvm-firewall {{ slsdotpath }} add accept chat.signal.org
qvm-firewall {{ slsdotpath }} add accept cdn.signal.org
qvm-firewall {{ slsdotpath }} add accept cdn2.signal.org
qvm-firewall {{ slsdotpath }} add accept sfu.voip.signal.org
qvm-firewall {{ slsdotpath }} add accept turn.voip.signal.org
qvm-firewall {{ slsdotpath }} add accept turn2.voip.signal.org
qvm-firewall {{ slsdotpath }} add accept turn3.voip.signal.org
qvm-check -q --running -- {{ slsdotpath }} && qvm-pause -- {{ slsdotpath }}
qvm-firewall -- {{ slsdotpath }} reset
qvm-firewall -- {{ slsdotpath }} del --rule-no 0
qvm-check -q --running -- {{ slsdotpath }} && qvm-unpause -- {{ slsdotpath }}
qvm-firewall -- {{ slsdotpath }} add accept signal.org
qvm-firewall -- {{ slsdotpath }} add accept storage.signal.org
qvm-firewall -- {{ slsdotpath }} add accept chat.signal.org
qvm-firewall -- {{ slsdotpath }} add accept cdn.signal.org
qvm-firewall -- {{ slsdotpath }} add accept cdn2.signal.org
qvm-firewall -- {{ slsdotpath }} add accept sfu.voip.signal.org
qvm-firewall -- {{ slsdotpath }} add accept turn.voip.signal.org
qvm-firewall -- {{ slsdotpath }} add accept turn2.voip.signal.org
qvm-firewall -- {{ slsdotpath }} add accept turn3.voip.signal.org
4 changes: 2 additions & 2 deletions salt/sys-git/files/client/git-core/git-init-qrexec
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ elif command -v qrexec-client >/dev/null; then
if test "${authority}" = "@default"; then
authority="${default_qube}"
fi
if ! qvm-check "${authority}" >/dev/null 2>&1; then
if ! qvm-check -- "${authority}" >/dev/null 2>&1; then
die "Qube doesn't exist: '${authority}'"
fi
qvm-start --skip-if-running "${authority}"
qvm-start --skip-if-running -- "${authority}"
exec qrexec-client -tT -d "${authority}" -- "DEFAULT:QUBESRPC ${rpc_cmd} dom0"
fi

Expand Down
4 changes: 2 additions & 2 deletions salt/sys-git/files/client/git-core/git-remote-qrexec-connect
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ elif command -v qrexec-client >/dev/null; then
if test "${authority}" = "@default"; then
authority="${default_qube}"
fi
if ! qvm-check "${authority}" >/dev/null 2>&1; then
if ! qvm-check -- "${authority}" >/dev/null 2>&1; then
die "Qube doesn't exist: '${authority}'"
fi
qvm-start --skip-if-running "${authority}"
qvm-start --skip-if-running -- "${authority}"
log "->" qrexec-client -T -d "${authority}" -- "DEFAULT:QUBESRPC ${rpc_cmd} dom0"
exec qrexec-client -T -d "${authority}" -- "DEFAULT:QUBESRPC ${rpc_cmd} dom0"
fi
Expand Down

0 comments on commit bf0a4bc

Please sign in to comment.