Merge pull request #215 from digitalsleuth/repo_updates

ekristen · web-flow · commit 813f34fc4caf · 2026-02-05T07:59:54.000-07:00
Update to repos to support DEB822 format
diff --git a/sift/packages/docker.sls b/sift/packages/docker.sls
@@ -13,5 +13,5 @@ sift-package-docker:
   pkg.installed:
     - name: docker-ce
     - require:
-      - pkgrepo: sift-docker-repo
+      - file: sift-docker-repo
       - sls: sift.repos.docker
diff --git a/sift/repos/docker.sls b/sift/repos/docker.sls
@@ -1,6 +1,5 @@
 include:
   - sift.packages.software-properties-common
-  - sift.packages.apt-transport-https
 
 sift-docker-key:
   file.managed:
@@ -9,13 +8,36 @@ sift-docker-key:
     - skip_verify: True
     - makedirs: True
 
-sift-docker-repo:
-  pkgrepo.managed:
-    - humanname: Docker
-    - name: deb [signed-by=/usr/share/keyrings/DOCKER-PGP-KEY.asc] https://download.docker.com/linux/ubuntu {{ grains['lsb_distrib_codename'] }} stable
-    - dist: {{ grains['lsb_distrib_codename'] }}
-    - file: /etc/apt/sources.list.d/docker.list
-    - refresh: True
+sift-remove-docker-ppa:
+  pkgrepo.absent:
+    - ppa: docker/stable
     - require:
       - sls: sift.packages.software-properties-common
-      - sls: sift.packages.apt-transport-https
+
+sift-remove-docker-list:
+  file.absent:
+    - name: /etc/apt/sources.list.d/docker.list
+    - require:
+      - pkgrepo: sift-remove-docker-ppa
+
+sift-remove-docker-sources:
+  file.absent:
+    - name: /etc/apt/sources.list.d/docker.sources
+    - require:
+      - pkgrepo: sift-remove-docker-ppa
+
+sift-docker-repo:
+  file.managed:
+    - name: /etc/apt/sources.list.d/docker.sources
+    - contents: |
+        Types: deb
+        URIs: https://download.docker.com/linux/ubuntu
+        Suites: {{ grains['lsb_distrib_codename'] }}
+        Components: stable
+        Signed-By: /usr/share/keyrings/DOCKER-PGP-KEY.asc
+        Architectures: amd64
+    - require:
+      - file: sift-docker-key
+      - pkgrepo: sift-remove-docker-ppa
+      - file: sift-remove-docker-list
+      - file: sift-remove-docker-sources
diff --git a/sift/repos/init.sls b/sift/repos/init.sls
@@ -6,6 +6,8 @@ include:
   - sift.repos.ubuntu-multiverse
   - sift.repos.ubuntu-universe
   - sift.repos.dotnet-backports
+  - sift.repos.microsoft
+  - sift.repos.refresh
 
 sift-repos:
   test.nop:
@@ -18,3 +20,5 @@ sift-repos:
       - sls: sift.repos.ubuntu-multiverse
       - sls: sift.repos.ubuntu-universe
       - sls: sift.repos.dotnet-backports
+      - sls: sift.repos.microsoft
+      - sls: sift.repos.refresh
diff --git a/sift/repos/microsoft.sls b/sift/repos/microsoft.sls
@@ -5,13 +5,31 @@ sift-microsoft-key:
     - skip_verify: True
     - makedirs: True
 
-microsoft:
-  pkgrepo.managed:
-    - humanname: Microsoft
-    - name: deb [signed-by=/usr/share/keyrings/MICROSOFT.asc] https://packages.microsoft.com/ubuntu/{{ grains['lsb_distrib_release'] }}/prod {{ grains['lsb_distrib_codename'] }} main
-    - dist: {{ grains['lsb_distrib_codename'] }}
-    - file: /etc/apt/sources.list.d/microsoft.list
-    - refresh: True
-    - clean_file: True
+sift-microsoft-repo-cleanup:
+  pkgrepo.absent:
+    - name: deb https://packages.microsoft.com/ubuntu/{{ grains['lsb_distrib_release'] }}/prod {{ grains['lsb_distrib_codename'] }} main
+    - refresh: true
+
+sift-microsoft-list-absent:
+  file.absent:
+    - name: /etc/apt/sources.list.d/microsoft.list
+
+sift-microsoft-sources-absent:
+  file.absent:
+    - name: /etc/apt/sources.list.d/microsoft.sources
+
+sift-microsoft-repo:
+  file.managed:
+    - name: /etc/apt/sources.list.d/microsoft.sources
+    - contents: |
+        Types: deb
+        URIs: https://packages.microsoft.com/ubuntu/{{ grains['lsb_distrib_release'] }}/prod
+        Suites: {{ grains['lsb_distrib_codename'] }}
+        Components: main
+        Signed-By: /usr/share/keyrings/MICROSOFT.asc
+        Architectures: amd64
     - require:
       - file: sift-microsoft-key
+      - pkgrepo: sift-microsoft-repo-cleanup
+      - file: sift-microsoft-list-absent
+      - file: sift-microsoft-sources-absent
diff --git a/sift/repos/refresh.sls b/sift/repos/refresh.sls
@@ -0,0 +1,3 @@
+sift-refresh-repos:
+  module.run:
+    - name: pkg.refresh_db
diff --git a/sift/repos/ubuntu-multiverse.sls b/sift/repos/ubuntu-multiverse.sls
@@ -1,17 +1,45 @@
-{%- set repo_url = "http://archive.ubuntu.com/ubuntu/ " %}
 {%- if grains["osarch"] == "aarch64" or grains["osarch"] == "arm64" -%}
-{%- set repo_url = "http://ports.ubuntu.com/ubuntu-ports/" -%}
-{%- endif %}
+sift-ubuntu-ports-repo:
+  file.append:
+    - name: /etc/apt/sources.list.d/ubuntu.sources
+    - text: |
 
+        Types: deb
+        URIs: http://ports.ubuntu.com/ubuntu-ports/
+        Suites: noble
+        Components: main universe restricted multiverse
+        Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+        Architectures: arm64
+
+        Types: deb
+        URIs: http://ports.ubuntu.com/ubuntu-ports/
+        Suites: noble-security
+        Components: main universe restricted multiverse
+        Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+        Architectures: arm64
+    - unless:
+      - grep -q "URIs: http://ports.ubuntu.com/ubuntu-ports/" /etc/apt/sources.list.d/ubuntu.sources
+
+{% else %}
 sift-multiverse-repo:
-  pkgrepo.managed:
-    - humanname: ubuntu-multiverse
-    - name: deb {{ repo_url }} {{ grains['lsb_distrib_codename'] }} multiverse
-    - refresh_db: true
+  file.replace:
+    - name: /etc/apt/sources.list.d/ubuntu.sources
+    - pattern: '^(Components: )(?!.*\bmultiverse\b)(.*)$'
+    - repl: '\1\2 multiverse'
+    - flags:
+        - MULTILINE
+
+sift-security-repo:
+  file.append:
+    - name: /etc/apt/sources.list.d/ubuntu.sources
+    - text: |
 
-sift-multiverse-repo-security:
-  pkgrepo.managed:
-    - humanname: ubuntu-multiverse-security
-    - name: deb {{ repo_url }} {{ grains['lsb_distrib_codename'] }}-security multiverse
-    - refresh_db: true
+        Types: deb
+        URIs: http://security.ubuntu.com/ubuntu/
+        Suites: noble-security
+        Components: main universe restricted multiverse
+        Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+    - unless:
+      - grep -q "^Suites:.*noble-security" /etc/apt/sources.list.d/ubuntu.sources
 
+{% endif %}
diff --git a/sift/repos/ubuntu-universe.sls b/sift/repos/ubuntu-universe.sls
@@ -1,10 +1,24 @@
-{%- set repo_url = "http://archive.ubuntu.com/ubuntu/ " %}
 {%- if grains["osarch"] == "aarch64" or grains["osarch"] == "arm64" -%}
-{%- set repo_url = "http://ports.ubuntu.com/ubuntu-ports/" -%}
-{%- endif %}
+sift-ubuntu-ports-repo:
+  file.append:
+    - name: /etc/apt/sources.list.d/ubuntu.sources
+    - text: |
 
+        Types: deb
+        URIs: http://ports.ubuntu.com/ubuntu-ports/
+        Suites: noble
+        Components: main universe restricted multiverse
+        Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+        Architectures: arm64
+    - unless: 
+      - grep -q "URIs: http://ports.ubuntu.com/ubuntu-ports/" /etc/apt/sources.list.d/ubuntu.sources
+{% else %}
 sift-universe-repo:
-  pkgrepo.managed:
-    - humanname: ubuntu-universe
-    - name: deb {{ repo_url }} {{ grains['lsb_distrib_codename'] }} universe
-    - refresh_db: true
+  file.replace:
+    - name: /etc/apt/sources.list.d/ubuntu.sources
+    - pattern: '^(Components: )(?!.*\buniverse\b)(.*)$'
+    - repl: '\1\2 universe'
+    - flags:
+        - MULTILINE
+{%- endif %}
+

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+sift-refresh-repos:`
	`2`	`+ module.run:`
	`3`	`+ - name: pkg.refresh_db`