fix various dependency issues

python · Apr 11, 2024 · 15b1aa7 · 15b1aa7
1 parent aad7473
commit 15b1aa7
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 14 deletions.
diff --git a/salt/base/repo.sls b/salt/base/repo.sls
@@ -1,13 +1,24 @@
+{% if grains["oscodename"] == "jammy" %}
+psfkey:
+  file.managed:
+    - name: /etc/apt/keyrings/packagecloud.asc
+    - mode: "0644"
+    - source: salt://base/config/APT-GPG-KEY-PSF
+
 psf:
   pkgrepo.managed:
-    {% if grains["oscodename"] == "jammy" %}
-    - name: "deb [signed-by=/etc/apt/keyrings/packagecloud.gpg arch={{ grains["osarch"] }}] https://packagecloud.io/psf/infra/ubuntu {{ grains['oscodename'] }} main"
+    - name: "deb [signed-by=/etc/apt/keyrings/packagecloud.asc arch={{ grains["osarch"] }}] https://packagecloud.io/psf/infra/ubuntu {{ grains['oscodename'] }} main"
     - aptkey: False
-    {% else %}
-    - name: "deb https://packagecloud.io/psf/infra/ubuntu {{ grains['oscodename'] }} main"
-    {% endif %}
+    - file: /etc/apt/sources.list.d/psf.list
+    - require:
+      - file: psfkey
+{% else %}
+psf:
+  pkgrepo.managed:
+    - name: deb http://psf.org/packages/ubuntu {{ grains.oscodename }} psf
     - file: /etc/apt/sources.list.d/psf.list
     - key_url: salt://base/config/APT-GPG-KEY-PSF
+{% endif %}
 
 # Make source list globally readable.
 /etc/apt/sources.list.d/psf.list:

diff --git a/salt/base/salt.sls b/salt/base/salt.sls
@@ -89,7 +89,6 @@ salt-master:
     - mode: "0644"
     - require:
       - file: /etc/nginx/sites.d/
-      - sls: tls.lego
 
 /etc/consul.d/service-letsencrypt-well-known.json:
   file.managed:

diff --git a/salt/bugs/init.sls b/salt/bugs/init.sls
@@ -25,7 +25,6 @@ lego_config:
     - group: root
     - mode: "0644"
     - require:
-      - sls: tls.lego
       - cmd: lego_bootstrap
 
 roundup-deps:

diff --git a/salt/datadog/init.sls b/salt/datadog/init.sls
@@ -1,13 +1,24 @@
+{% if grains["oscodename"] == "jammy" %}
+datadogkey:
+  file.managed:
+    - name: /etc/apt/keyrings/datadog.asc
+    - mode: "0644"
+    - source: salt://datadog/config/APT-GPG-KEY-DATADOG
+
 datadog_repo:
   pkgrepo.managed:
-    {% if grains["oscodename"] == "jammy" %}
-    - name: "deb [signed-by=/etc/apt/keyrings/datadoghq.gpg arch={{ grains["osarch"] }}]  https://apt.datadoghq.com stable 6"
+    - name: "deb [signed-by=/etc/apt/keyrings/datadog.asc arch={{ grains["osarch"] }}]  https://apt.datadoghq.com stable 6"
     - aptkey: False
-    {% else %}
+    - file: /etc/apt/sources.list.d/datadog.list
+    - require:
+      - file: datadogkey
+{% else %}
+datadog_repo:
+  pkgrepo.managed:
     - name: "deb https://apt.datadoghq.com stable 6"
-    {% endif %}
-    - key_url: salt://datadog/config/APT-GPG-KEY-DATADOG
     - file: /etc/apt/sources.list.d/datadog.list
+    - key_url: salt://datadog/config/APT-GPG-KEY-DATADOG
+{% endif %}
 
 {% set in_datadog_tags = pillar.get('datadog_tags', []) + grains.get('datadog_tags', []) + grains.get('datadog_tags_from_metadata', []) %}
 {% set datadog_tags = [] %}

diff --git a/salt/users/dotfiles/dstufft.sls b/salt/users/dotfiles/dstufft.sls
@@ -1,17 +1,20 @@
+git:
+  pkg.installed
+
 https://github.com/dstufft/dotfiles.git:
   git.latest:
     - target: /home/psf-users/dstufft/.dotfiles
     - user: dstufft
     - force_clone: True
     - force_checkout: True
     - require:
-      - sls: users
+      - pkg: git
+      - user: dstufft
 
 /home/psf-users/dstufft/.zshenv:
   file.symlink:
     - target: /home/psf-users/dstufft/.dotfiles/zsh/.zshenv
     - user: dstufft
     - group: dstufft
     - require:
-      - sls: users
       - git: https://github.com/dstufft/dotfiles.git