Git-Mirrors/qusal
1
0
Fork 0
mirror of https://github.com/ben-grande/qusal.git synced 2025-05-07 08:45:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix: remove workaround around split-gpg2 hang

Browse source 
Fix: https://github.com/ben-grande/qusal/issues/110
This commit is contained in:
Ben Grande 2025-01-17 11:05:36 +01:00
parent 12d6d69ff4
commit de5937fd8a
No known key found for this signature in database
GPG key ID: 00C64E14F51F9E56
9 changed files with 17 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
salt/electrum/configure-builder.sls
View file

@ -44,10 +44,9 @@ include:
cmd.run: cmd.run:
- require: - require:
- file: "{{ slsdotpath }}-save-keys" - file: "{{ slsdotpath }}-save-keys"
- name: gpg --status-fd=2 --homedir . --import download/*.asc - name: gpg --homedir . --import download/*.asc
- cwd: /home/user/.gnupg/electrum - cwd: /home/user/.gnupg/electrum
- runas: user - runas: user
- success_stderr: IMPORT_OK
"{{ slsdotpath }}-import-ownertrust": "{{ slsdotpath }}-import-ownertrust":
cmd.run: cmd.run:

5
salt/mirage-builder/configure.sls
View file

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -55,10 +55,9 @@ include:
cmd.run: cmd.run:
- require: - require:
- file: "{{ slsdotpath }}-save-keys" - file: "{{ slsdotpath }}-save-keys"
- name: gpg --status-fd=2 --homedir . --import download/*.asc - name: gpg --homedir . --import download/*.asc
- cwd: /home/user/.gnupg/mirage-firewall - cwd: /home/user/.gnupg/mirage-firewall
- runas: user - runas: user
- success_stderr: IMPORT_OK
"{{ slsdotpath }}-import-ownertrust": "{{ slsdotpath }}-import-ownertrust":
cmd.run: cmd.run:

5
salt/qubes-builder/configure-qusal.sls
View file

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -53,10 +53,9 @@ include:
cmd.run: cmd.run:
- require: - require:
- file: "{{ slsdotpath }}-qusal-save-keys" - file: "{{ slsdotpath }}-qusal-save-keys"
- name: gpg --status-fd=2 --homedir . --import download/*.asc - name: gpg --homedir . --import download/*.asc
- cwd: /home/user/.gnupg/qusal-builder - cwd: /home/user/.gnupg/qusal-builder
- runas: user - runas: user
- success_stderr: IMPORT_OK
"{{ slsdotpath }}-qusal-import-ownertrust": "{{ slsdotpath }}-qusal-import-ownertrust":
cmd.run: cmd.run:

5
salt/qubes-builder/configure.sls
View file

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -46,10 +46,9 @@ include:
cmd.run: cmd.run:
- require: - require:
- file: "{{ slsdotpath }}-save-keys" - file: "{{ slsdotpath }}-save-keys"
- name: gpg --status-fd=2 --homedir . --import download/*.asc - name: gpg --homedir . --import download/*.asc
- cwd: /home/user/.gnupg/qubes-builder - cwd: /home/user/.gnupg/qubes-builder
- runas: user - runas: user
- success_stderr: IMPORT_OK
"{{ slsdotpath }}-import-ownertrust": "{{ slsdotpath }}-import-ownertrust":
cmd.run: cmd.run:

5
salt/sys-bitcoin/configure-builder-common.sls
View file

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2024 - 2025 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -35,10 +35,9 @@ include:
cmd.run: cmd.run:
- require: - require:
- file: "{{ slsdotpath }}-save-keys" - file: "{{ slsdotpath }}-save-keys"
- name: gpg --status-fd=2 --homedir . --import download/*.asc - name: gpg --homedir . --import download/*.asc
- cwd: /home/user/.gnupg/bitcoin - cwd: /home/user/.gnupg/bitcoin
- runas: user - runas: user
- success_stderr: IMPORT_OK
"{{ slsdotpath }}-import-ownertrust": "{{ slsdotpath }}-import-ownertrust":
cmd.run: cmd.run:

3
salt/sys-electrs/configure-builder-source.sls
View file

@ -54,10 +54,9 @@ include:
cmd.run: cmd.run:
- require: - require:
- file: "{{ slsdotpath }}-source-save-keys" - file: "{{ slsdotpath }}-source-save-keys"
- name: gpg --status-fd=2 --homedir . --import download/*.asc - name: gpg --homedir . --import download/*.asc
- cwd: /home/user/.gnupg/electrs - cwd: /home/user/.gnupg/electrs
- runas: user - runas: user
- success_stderr: IMPORT_OK
"{{ slsdotpath }}-source-import-ownertrust": "{{ slsdotpath }}-source-import-ownertrust":
cmd.run: cmd.run:

5
salt/sys-electrumx/configure-builder.sls
View file

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2024 - 2025 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -58,10 +58,9 @@ include:
cmd.run: cmd.run:
- require: - require:
- file: "{{ slsdotpath }}-save-keys" - file: "{{ slsdotpath }}-save-keys"
- name: gpg --status-fd=2 --homedir . --import download/*.asc - name: gpg --homedir . --import download/*.asc
- cwd: /home/user/.gnupg/electrumx - cwd: /home/user/.gnupg/electrumx
- runas: user - runas: user
- success_stderr: IMPORT_OK
"{{ slsdotpath }}-import-ownertrust": "{{ slsdotpath }}-import-ownertrust":
cmd.run: cmd.run:

3
salt/sys-pihole/install.sls
View file

@ -107,10 +107,9 @@ include:
cmd.run: cmd.run:
- require: - require:
- file: "{{ slsdotpath }}-save-keys" - file: "{{ slsdotpath }}-save-keys"
- name: gpg --status-fd=2 --homedir . --import download/*.asc - name: gpg --homedir . --import download/*.asc
- cwd: /root/.gnupg/pihole - cwd: /root/.gnupg/pihole
- runas: root - runas: root
- success_stderr: IMPORT_OK
"{{ slsdotpath }}-import-ownertrust": "{{ slsdotpath }}-import-ownertrust":
cmd.run: cmd.run:

11
scripts/commit-verify.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
## SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com> ## SPDX-FileCopyrightText: 2024 - 2025 Benjamin Grande M. S. <ben.grande.b@gmail.com>
## ##
## SPDX-License-Identifier: AGPL-3.0-or-later ## SPDX-License-Identifier: AGPL-3.0-or-later
@ -46,20 +46,17 @@ gpg_homedir="$(mktemp -d)"
trap 'rm -rf -- "${gpg_homedir}"' EXIT INT HUP QUIT ABRT trap 'rm -rf -- "${gpg_homedir}"' EXIT INT HUP QUIT ABRT
export GNUPGHOME="${gpg_homedir}" export GNUPGHOME="${gpg_homedir}"
otrust="${gpg_homedir}/otrust.txt" otrust="${gpg_homedir}/otrust.txt"
gpg_agent="$(gpgconf --list-components | awk -F: '/^gpg-agent:/{print $3}')"
gpg_cmd="gpg --status-fd=2"
${gpg_cmd} --agent-program "${gpg_agent}" \ gpg --import "${key_dir}"/*"${key_suffix}" >/dev/null 2>&1
--import "${key_dir}"/*"${key_suffix}" >/dev/null 2>&1
${gpg_cmd} --with-colons --list-public-keys | awk -F ':' '{ gpg --with-colons --list-public-keys | awk -F ':' '{
if (prev_line ~ /^pub$/ && $1 ~ /^fpr$/) { if (prev_line ~ /^pub$/ && $1 ~ /^fpr$/) {
print $10 ":6:" print $10 ":6:"
} }
prev_line = $1 prev_line = $1
}' | tee -- "${otrust}" >/dev/null }' | tee -- "${otrust}" >/dev/null
${gpg_cmd} --import-ownertrust "${otrust}" >/dev/null 2>&1 gpg --import-ownertrust "${otrust}" >/dev/null 2>&1
fail="0" fail="0"