Git-Mirrors/qusal
1
0
Fork 0
mirror of https://github.com/ben-grande/qusal.git synced 2025-03-30 19:08:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove old split-gpg from qubes-builder

Browse Source
This commit is contained in:
Ben Grande 2024-01-03 14:29:49 +01:00
parent ca95f435c8
commit 083285901c
4 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/qubes-builder/configure.sls
View File

@ -15,14 +15,6 @@ include:
- dotfiles.copy-x11 - dotfiles.copy-x11
- docker.configure - docker.configure
"{{ slsdotpath }}-gpg-split-domain":
file.managed:
- name: /rw/config/gpg-split-domain
- source: salt://{{ slsdotpath }}/files/client/gpg-split-domain
- mode: '0644'
- user: root
- group: root
"{{ slsdotpath }}-rpmmacros": "{{ slsdotpath }}-rpmmacros":
file.managed: file.managed:
- name: /home/user/.rpmmacros - name: /home/user/.rpmmacros

1
salt/qubes-builder/files/client/gpg-split-domain
View File

@ -1 +0,0 @@
@default

3
salt/qubes-builder/files/client/gpg-split-domain.license
View File

@ -1,3 +0,0 @@
# SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
#
# SPDX-License-Identifier: GPL-3.0-or-later

4
salt/qubes-builder/files/client/rpmmacros
View File

@ -2,12 +2,12 @@
# #
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
%__gpg /usr/bin/qubes-gpg-client-wrapper %__gpg /usr/bin/gpg2
%__gpg_check_password_cmd %{__gpg} \ %__gpg_check_password_cmd %{__gpg} \
gpg --batch --no-verbose -u "%{_gpg_name}" -s gpg --batch --no-verbose -u "%{_gpg_name}" -s
%__gpg_sign_cmd /bin/sh sh -c '/usr/bin/qubes-gpg-client-wrapper \\\ %__gpg_sign_cmd /bin/sh sh -c '/usr/bin/gpg2 \\\
--batch --no-verbose \\\ --batch --no-verbose \\\
%{?_gpg_digest_algo:--digest-algo %{_gpg_digest_algo}} \\\ %{?_gpg_digest_algo:--digest-algo %{_gpg_digest_algo}} \\\
-u "%{_gpg_name}" \\\ -u "%{_gpg_name}" \\\