From fe29aa866e565e546f06155912a05d7fc6123567 Mon Sep 17 00:00:00 2001 From: digitalsleuth Date: Fri, 23 Oct 2026 03:22:00 +0000 Subject: [PATCH] Update ubuntu sources, dotnet-backports, fixes for mulder --- sift/python3-packages/mulder.sls | 16 ++++++-- sift/repos/dotnet-backports.sls | 52 ++++++++++++++++++++----- sift/repos/refresh.sls | 2 +- sift/repos/ubuntu-multiverse.sls | 66 +++----------------------------- sift/repos/ubuntu-sources.sls | 44 +++++++++++++++++++++ sift/repos/ubuntu-universe.sls | 46 +++------------------- 6 files changed, 112 insertions(+), 114 deletions(-) create mode 100644 sift/repos/ubuntu-sources.sls diff --git a/sift/python3-packages/mulder.sls b/sift/python3-packages/mulder.sls index e18ec858..68d9bf22 100644 --- a/sift/python3-packages/mulder.sls +++ b/sift/python3-packages/mulder.sls @@ -1,5 +1,12 @@ {%- set user = salt['pillar.get']('sift_user', 'sansforensics') -%} +{% if user == 'root' %} +Mulder does not install for the root user - skipping: + test.nop +{% else %} + +{%- set home = salt['user.info'](user).home -%} + include: - sift.config.user.user - sift.packages.git @@ -26,17 +33,18 @@ sift-python3-package-mulder: sift-python3-package-mulder-setup: cmd.run: - - name: mulder setup --yes + - name: {{ home }}/.local/bin/mulder setup --yes - runas: {{ user }} - - cwd: /home/{{ user }}/.local/bin + - cwd: {{ home }}/.local/bin - require: - cmd: sift-python3-package-mulder sift-python3-package-mulder-ensurepath: cmd.run: - - name: pipx ensurepath + - name: 'cd {{ home }}/.local/bin && pipx ensurepath --force' - runas: {{ user }} - - cwd: /home/{{ user }}/.local/bin + - cwd: {{ home }}/.local/bin - require: - cmd: sift-python3-package-mulder-setup +{% endif %} diff --git a/sift/repos/dotnet-backports.sls b/sift/repos/dotnet-backports.sls index ced70ec5..05fde407 100644 --- a/sift/repos/dotnet-backports.sls +++ b/sift/repos/dotnet-backports.sls @@ -1,12 +1,46 @@ -include: - - sift.packages.software-properties-common +{% set codename = grains['oscodename'] %} +{% set old_list = salt['file.find']('/etc/apt/sources.list.d', name='*.list', grep='dotnet/backports') %} + +sift-dotnet-backports-key: + file.managed: + - name: /usr/share/keyrings/dotnet-backports.asc + - source: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x45A3F127159BE9E5017811C62125B164E8E5D3FA + - skip_verify: True + - makedirs: True + - mode: '0644' + +{% if old_list %} +sift-dotnet-backports-old-list: + file.absent: + - names: {{ old_list | json }} +{% endif %} sift-dotnet-backports-repo: - pkgrepo.managed: - - name: dotnet-backports - - ppa: dotnet/backports - - keyid: 45A3F127159BE9E5017811C62125B164E8E5D3FA - - keyserver: keyserver.ubuntu.com - - refresh: true + file.managed: + - name: /etc/apt/sources.list.d/dotnet-backports.sources + - mode: '0644' + - contents: | + Types: deb + URIs: https://ppa.launchpadcontent.net/dotnet/backports/ubuntu + Suites: {{ codename }} + Components: main + Signed-By: /usr/share/keyrings/dotnet-backports.asc + - unless: + - grep -qxF 'Types: deb' /etc/apt/sources.list.d/dotnet-backports.sources + - grep -qxF 'URIs: https://ppa.launchpadcontent.net/dotnet/backports/ubuntu' /etc/apt/sources.list.d/dotnet-backports.sources + - grep -qxF 'Suites: {{ codename }}' /etc/apt/sources.list.d/dotnet-backports.sources + - grep -qxF 'Components: main' /etc/apt/sources.list.d/dotnet-backports.sources + - grep -qxF 'Signed-By: /usr/share/keyrings/dotnet-backports.asc' /etc/apt/sources.list.d/dotnet-backports.sources + - test "$(stat -c %a /etc/apt/sources.list.d/dotnet-backports.sources)" = "644" - require: - - sls: sift.packages.software-properties-common + - file: sift-dotnet-backports-key + +sift-dotnet-backports-refresh: + module.run: + - pkg.refresh_db: + - onchanges_any: + - file: sift-dotnet-backports-repo + - file: sift-dotnet-backports-key +{% if old_list %} + - file: sift-dotnet-backports-old-list +{% endif %} diff --git a/sift/repos/refresh.sls b/sift/repos/refresh.sls index 2a5340c0..b0355197 100644 --- a/sift/repos/refresh.sls +++ b/sift/repos/refresh.sls @@ -1,3 +1,3 @@ sift-refresh-repos: module.run: - - name: pkg.refresh_db + - pkg.refresh_db: diff --git a/sift/repos/ubuntu-multiverse.sls b/sift/repos/ubuntu-multiverse.sls index 54852828..39961e23 100644 --- a/sift/repos/ubuntu-multiverse.sls +++ b/sift/repos/ubuntu-multiverse.sls @@ -1,40 +1,5 @@ -{% set codename = grains["oscodename"] %} -{%- if grains["osarch"] == "aarch64" or grains["osarch"] == "arm64" -%} -sift-ubuntu-ports-repo-multiverse: - file.append: - - name: /etc/apt/sources.list.d/ubuntu.sources - - text: | - - Types: deb - URIs: http://ports.ubuntu.com/ubuntu-ports/ - Suites: {{ codename }} - 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: {{ codename }}-security - Components: main universe restricted multiverse - Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg - Architectures: arm64 - - unless: - - grep -q "ubuntu-ports" /etc/apt/sources.list.d/ubuntu.sources - - grep -q "{{ codename }}-security" /etc/apt/sources.list.d/ubuntu.sources - -{% else %} -sift-ubuntu-repo-multiverse: - file.append: - - name: /etc/apt/sources.list.d/ubuntu.sources - - text: | - Types: deb - URIs: http://archive.ubuntu.com/ubuntu/ - Suites: {{ codename }} {{ codename }}-updates {{ codename }}-backports - Components: main restricted universe multiverse - Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg - - makedirs: True - - unless: - - grep -q "archive.ubuntu.com" /etc/apt/sources.list.d/ubuntu.sources +include: + - sift.repos.ubuntu-sources sift-multiverse-repo: file.replace: @@ -43,28 +8,9 @@ sift-multiverse-repo: - repl: '\1\2 multiverse' - flags: - MULTILINE - -sift-security-repo: - file.append: - - name: /etc/apt/sources.list.d/ubuntu.sources - - text: | - - Types: deb - URIs: http://security.ubuntu.com/ubuntu/ - Suites: {{ codename }}-security - Components: main universe restricted multiverse - Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg - - unless: - - grep -q "ubuntu-ports" /etc/apt/sources.list.d/ubuntu.sources - - grep -q "security.ubuntu.com" /etc/apt/sources.list.d/ubuntu.sources - -{% if codename == "jammy" %} - -sift-remove-sources-list-multiverse: - file.absent: - - name: /etc/apt/sources.list + - backup: False - require: - - file: sift-multiverse-repo + - file: sift-ubuntu-sources + - onchanges_in: + - module: sift-ubuntu-repo-refresh -{% endif %} -{% endif %} diff --git a/sift/repos/ubuntu-sources.sls b/sift/repos/ubuntu-sources.sls new file mode 100644 index 00000000..6614504e --- /dev/null +++ b/sift/repos/ubuntu-sources.sls @@ -0,0 +1,44 @@ +{% set codename = grains["oscodename"] %} +{% set is_arm = grains["osarch"] in ["arm64", "aarch64"] %} +{% set keyring = "/usr/share/keyrings/ubuntu-archive-keyring.gpg" %} +{% set mirror = "http://ports.ubuntu.com/ubuntu-ports/" if is_arm else "http://archive.ubuntu.com/ubuntu/" %} +{% set pockets = [codename, codename ~ "-updates", codename ~ "-backports"] + ([codename ~ "-security"] if is_arm else []) %} + +sift-ubuntu-sources: + file.managed: + - name: /etc/apt/sources.list.d/ubuntu.sources + - replace: False + - makedirs: True + - mode: '0644' + - contents: | + Types: deb + URIs: {{ mirror }} + Suites: {{ pockets | join(" ") }} + Components: main restricted + Signed-By: {{ keyring }} + {%- if is_arm %} + Architectures: arm64 + {%- else %} + + Types: deb + URIs: http://security.ubuntu.com/ubuntu/ + Suites: {{ codename }}-security + Components: main restricted + Signed-By: {{ keyring }} + {%- endif %} + - onchanges_in: + - module: sift-ubuntu-repo-refresh + +{% if codename == "jammy" %} +sift-remove-sources-list: + file.absent: + - name: /etc/apt/sources.list + - require: + - file: sift-ubuntu-sources + - onchanges_in: + - module: sift-ubuntu-repo-refresh +{% endif %} + +sift-ubuntu-repo-refresh: + module.run: + - pkg.refresh_db: diff --git a/sift/repos/ubuntu-universe.sls b/sift/repos/ubuntu-universe.sls index eb0d90bc..195e84fe 100644 --- a/sift/repos/ubuntu-universe.sls +++ b/sift/repos/ubuntu-universe.sls @@ -1,32 +1,5 @@ -{% set codename = grains["oscodename"] %} -{%- if grains["osarch"] == "aarch64" or grains["osarch"] == "arm64" -%} -sift-ubuntu-ports-repo-universe: - file.append: - - name: /etc/apt/sources.list.d/ubuntu.sources - - text: | - - Types: deb - URIs: http://ports.ubuntu.com/ubuntu-ports/ - Suites: {{ codename }} - Components: main universe restricted multiverse - Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg - Architectures: arm64 - - makedirs: True - - unless: - - grep -q "ubuntu-ports" /etc/apt/sources.list.d/ubuntu.sources -{% else %} -sift-ubuntu-repo-universe: - file.append: - - name: /etc/apt/sources.list.d/ubuntu.sources - - text: | - Types: deb - URIs: http://archive.ubuntu.com/ubuntu/ - Suites: {{ codename }} {{ codename }}-updates {{ codename }}-backports - Components: main restricted universe multiverse - Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg - - makedirs: True - - unless: - - grep -q "archive.ubuntu.com" /etc/apt/sources.list.d/ubuntu.sources +include: + - sift.repos.ubuntu-sources sift-universe-repo: file.replace: @@ -35,15 +8,8 @@ sift-universe-repo: - repl: '\1\2 universe' - flags: - MULTILINE - -{% if codename == "jammy" %} - -sift-remove-sources-list: - file.absent: - - name: /etc/apt/sources.list + - backup: False - require: - - file: sift-universe-repo - -{% endif %} -{% endif %} - + - file: sift-ubuntu-sources + - onchanges_in: + - module: sift-ubuntu-repo-refresh