Skip to content
Closed
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
18 changes: 15 additions & 3 deletions sift/python3-packages/mulder.sls
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{%- set user = salt['pillar.get']('sift_user', 'sansforensics') -%}
{%- if user == "root" -%}
{%- set home = "/root" -%}
{%- else -%}
{%- set home = salt['user.info'](user).get('home', '/home/' ~ user) -%}
{%- endif -%}

include:
- sift.config.user.user
Expand All @@ -24,19 +29,26 @@ sift-python3-package-mulder:
- sls: sift.packages.dotnet
- user: sift-user-{{ user }}

{#- mulder refuses to run setup as root, see 'mulder setup' output #}
{%- if user != "root" %}
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
{%- endif %}

sift-python3-package-mulder-ensurepath:
cmd.run:
- name: pipx ensurepath
- runas: {{ user }}
- cwd: /home/{{ user }}/.local/bin
- cwd: {{ home }}/.local/bin
- require:
{%- if user != "root" %}
- cmd: sift-python3-package-mulder-setup
{%- else %}
- cmd: sift-python3-package-mulder
{%- endif %}

6 changes: 5 additions & 1 deletion sift/repos/ubuntu-multiverse.sls
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,12 @@ sift-security-repo:
{% if codename == "jammy" %}

sift-remove-sources-list-multiverse:
file.absent:
file.managed:
- name: /etc/apt/sources.list
- contents: |
# Ubuntu sources have moved to /etc/apt/sources.list.d/ubuntu.sources
# This file is kept (empty) because add-apt-repository on jammy fails
# to write PPA entries when /etc/apt/sources.list does not exist.
- require:
- file: sift-multiverse-repo

Expand Down
6 changes: 5 additions & 1 deletion sift/repos/ubuntu-universe.sls
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,12 @@ sift-universe-repo:
{% if codename == "jammy" %}

sift-remove-sources-list:
file.absent:
file.managed:
- name: /etc/apt/sources.list
- contents: |
# Ubuntu sources have moved to /etc/apt/sources.list.d/ubuntu.sources
# This file is kept (empty) because add-apt-repository on jammy fails
# to write PPA entries when /etc/apt/sources.list does not exist.
- require:
- file: sift-universe-repo

Expand Down
Loading