Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions sift/python3-packages/mulder.sls
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 %}
52 changes: 43 additions & 9 deletions sift/repos/dotnet-backports.sls
Original file line number Diff line number Diff line change
@@ -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 %}
2 changes: 1 addition & 1 deletion sift/repos/refresh.sls
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
sift-refresh-repos:
module.run:
- name: pkg.refresh_db
- pkg.refresh_db:
66 changes: 6 additions & 60 deletions sift/repos/ubuntu-multiverse.sls
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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 %}
44 changes: 44 additions & 0 deletions sift/repos/ubuntu-sources.sls
Original file line number Diff line number Diff line change
@@ -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:
46 changes: 6 additions & 40 deletions sift/repos/ubuntu-universe.sls
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
Loading