diff --git a/sift/python3-packages/mulder.sls b/sift/python3-packages/mulder.sls index e18ec858..ec2fb47c 100644 --- a/sift/python3-packages/mulder.sls +++ b/sift/python3-packages/mulder.sls @@ -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 @@ -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 %} diff --git a/sift/repos/ubuntu-multiverse.sls b/sift/repos/ubuntu-multiverse.sls index 54852828..50afea80 100644 --- a/sift/repos/ubuntu-multiverse.sls +++ b/sift/repos/ubuntu-multiverse.sls @@ -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 diff --git a/sift/repos/ubuntu-universe.sls b/sift/repos/ubuntu-universe.sls index eb0d90bc..856b9aec 100644 --- a/sift/repos/ubuntu-universe.sls +++ b/sift/repos/ubuntu-universe.sls @@ -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