|
|
@@ -22,16 +22,18 @@
|
|
|
- file: /etc/apt/trusted.gpg.d/ffho.gpg
|
|
|
|
|
|
# Salt APT
|
|
|
-/etc/apt/trusted.gpg.d/salt.gpg:
|
|
|
+/usr/share/keyrings/salt-archive-keyring.gpg:
|
|
|
file.managed:
|
|
|
- source: salt://apt/salt.gpg
|
|
|
|
|
|
+/etc/apt/trusted.gpg.d/salt.gpg:
|
|
|
+ file.absent
|
|
|
+
|
|
|
/etc/apt/sources.list.d/salt.list:
|
|
|
file.managed:
|
|
|
- source: salt://apt/salt.list.{{ grains.os }}.{{ grains.oscodename }}
|
|
|
- require:
|
|
|
- - file: /etc/apt/trusted.gpg.d/salt.gpg
|
|
|
-
|
|
|
+ - file: /usr/share/keyrings/salt-archive-keyring.gpg
|
|
|
|
|
|
# APT preferences
|
|
|
/etc/apt/preferences.d/ffho:
|
