mirror of
https://github.com/gaschz/dotfiles.git
synced 2025-03-01 14:22:33 +01:00
fix: skip edit of files owned by system packages
Fix: https://github.com/ben-grande/qusal/issues/101
This commit is contained in:
parent
f9457092ea
commit
7659897283
@ -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/
|
||||
@ -23,3 +25,5 @@ SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
- dir_mode: '0700'
|
||||
- user: root
|
||||
- group: root
|
||||
|
||||
{% endif -%}
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user