Skip to content

Commit

Permalink
fix: skip edit of files owned by system packages
Browse files Browse the repository at this point in the history
  • Loading branch information
ben-grande committed Oct 14, 2024
1 parent f945709 commit 7659897
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
4 changes: 4 additions & 0 deletions copy-pgp.sls
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later
- user: {{ gui_user.gui_user }}
- group: {{ gui_user.gui_user }}
{% if not salt['file.file_exists']('/usr/share/whonix/marker') -%}
"{{ slsdotpath }}-copy-pgp-skel":
file.recurse:
- name: /etc/skel/
Expand All @@ -23,3 +25,5 @@ SPDX-License-Identifier: AGPL-3.0-or-later
- dir_mode: '0700'
- user: root
- group: root
{% endif -%}
4 changes: 3 additions & 1 deletion files/git/.config/git/config
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,10 @@
tool = vimdiff
conflictStyle = diff3
summary = true
[protocol "qrexec"]
allow = always
[pull]
; Rebase does not verify signatures. Does not prevent manual rebase.
; Rebase does not verify signatures. Opt does not prevent manual rebase.
rebase = false
[push]
autoSetupRemote = true
Expand Down

0 comments on commit 7659897

Please sign in to comment.