diff --git a/states/golang/install.sls b/states/golang/install.sls index 7317039..3d679c2 100644 --- a/states/golang/install.sls +++ b/states/golang/install.sls @@ -7,6 +7,9 @@ golang-archive-extract: - skip_verify: true - enforce_toplevel: false - options: --transform 's/^go\///g' + - user: root + - group: root + - enforce_ownership_on: {{ golang.release_dir }}/golang-{{ golang.version }} - if_missing: {{ golang.release_dir }}/golang-{{ golang.version }} golang-binary-symlink: diff --git a/states/ipbl/install.sls b/states/ipbl/install.sls index 57e645c..f9fdc6d 100644 --- a/states/ipbl/install.sls +++ b/states/ipbl/install.sls @@ -6,6 +6,9 @@ ipbl-archive-extract: - source: {{ ipbl.mirror }}/{{ ipbl.version }}/ipbl-{{ ipbl.version }}-{{ ipbl.os }}-{{ ipbl.arch }}.tar.gz - skip_verify: true - enforce_toplevel: false + - user: root + - group: root + - enforce_ownership_on: {{ ipbl.release_dir }}/ipbl-{{ ipbl.version }} - if_missing: {{ ipbl.release_dir }}/ipbl-{{ ipbl.version }} - watch_in: - service: ipbl-service diff --git a/states/ipblc/install.sls b/states/ipblc/install.sls index 7bb4d2c..f6e4b5f 100644 --- a/states/ipblc/install.sls +++ b/states/ipblc/install.sls @@ -6,6 +6,9 @@ ipblc-archive-extract: - source: {{ ipblc.mirror }}/{{ ipblc.version }}/ipblc-{{ ipblc.version }}-{{ ipblc.os }}-{{ ipblc.arch }}.tar.gz - skip_verify: true - enforce_toplevel: false + - user: root + - group: root + - enforce_ownership_on: {{ ipblc.release_dir }}/ipblc-{{ ipblc.version }} - if_missing: {{ ipblc.release_dir }}/ipblc-{{ ipblc.version }} - watch_in: - service: ipblc-service diff --git a/states/kopia/install.sls b/states/kopia/install.sls index 89a1514..256fbf3 100644 --- a/states/kopia/install.sls +++ b/states/kopia/install.sls @@ -5,14 +5,17 @@ kopia-archive-extract: archive.extracted: - name: {{ kopia.release_dir }}/kopia-{{ kopia.version }} - source: {{ kopia.mirror }}/v{{ kopia.version }}/kopia-{{ kopia.version }}-{{ kopia.os }}-{{ kopia.arch }}.tar.gz + - skip_verify: true + - archive_format: tar - enforce_toplevel: false - options: > --transform 's|^\{{ archive_exclude_dir }}|/|g' --transform 's|LICENSE||g' --transform 's|README.md||g' --strip 1 - - skip_verify: true - - archive_format: tar + - user: root + - group: root + - enforce_ownership_on: {{ kopia.release_dir }}/kopia-{{ kopia.version }} - if_missing: {{ kopia.release_dir }}/kopia-{{ kopia.version }}/kopia kopia-bin-perm: diff --git a/states/lego/install.sls b/states/lego/install.sls index 1d1d4e4..90c77c2 100644 --- a/states/lego/install.sls +++ b/states/lego/install.sls @@ -5,6 +5,9 @@ lego-archive-extract: - name: {{ lego.release_dir }}/lego-{{ lego.version }} - source: {{ lego.mirror }}/v{{ lego.version }}/lego_v{{ lego.version }}_{{ lego.os }}_{{ lego.arch }}.tar.gz - skip_verify: true + - user: root + - group: root + - enforce_ownership_on: {{ lego.release_dir }}/lego-{{ lego.version }} - enforce_toplevel: false - if_missing: {{ lego.release_dir }}/lego-{{ lego.version }} diff --git a/states/micromdm/install.sls b/states/micromdm/install.sls index a94665f..3f8a437 100644 --- a/states/micromdm/install.sls +++ b/states/micromdm/install.sls @@ -24,6 +24,9 @@ micromdm-archive-extract: - source: {{ micromdm.mirror }}/v{{ micromdm.version }}/micromdm_v{{ micromdm.version }}.zip - skip_verify: true - enforce_toplevel: false + - user: root + - group: root + - enforce_ownership_on: {{ micromdm.release_dir }}/micromdm-{{ micromdm.version }} - if_missing: {{ micromdm.release_dir }}/micromdm-{{ micromdm.version }}/build/{{ micromdm.os }}/micromdm - watch_in: - service: micromdm-service diff --git a/states/ytdlp/defaults.yaml b/states/ytdlp/defaults.yaml index 3e37ca7..82766f4 100644 --- a/states/ytdlp/defaults.yaml +++ b/states/ytdlp/defaults.yaml @@ -1,4 +1,5 @@ --- ytdlp: + archive_url: https://github.com/yt-dlp/yt-dlp/releases/download install_dir: /usr/bin version: 2022.04.08 diff --git a/states/ytdlp/init.sls b/states/ytdlp/init.sls index 4532b18..f57d4f9 100644 --- a/states/ytdlp/init.sls +++ b/states/ytdlp/init.sls @@ -3,7 +3,7 @@ ytdlp-bin: file.managed: - name: {{ ytdlp.install_dir }}/yt-dlp - - source: https://github.com/yt-dlp/yt-dlp/releases/download/{{ ytdlp.version }}/yt-dlp + - source: {{ ytdlp.archive_url}}/{{ ytdlp.version }}/yt-dlp - user: root - group: root - mode: "0775"