Skip to content

Commit f534f2b

Browse files
committed
feat: separate handling of snaps for 24.04
1 parent 96cd6ff commit f534f2b

5 files changed

Lines changed: 31 additions & 5 deletions

File tree

.secrets.baseline

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@
9090
{
9191
"path": "detect_secrets.filters.allowlist.is_line_allowlisted"
9292
},
93+
{
94+
"path": "detect_secrets.filters.common.is_baseline_file",
95+
"filename": ".secrets.baseline"
96+
},
9397
{
9498
"path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
9599
"min_level": 2
@@ -157,18 +161,18 @@
157161
"filename": "tasks/remnux.yml",
158162
"hashed_secret": "33cf8de6d1638aa9a0186979d36f22f8800d76e6",
159163
"is_verified": true,
160-
"line_number": 204,
164+
"line_number": 213,
161165
"is_secret": false
162166
},
163167
{
164168
"type": "Secret Keyword",
165169
"filename": "tasks/remnux.yml",
166170
"hashed_secret": "6b42874e3cd20771d93096ec5ce36307a1f2ba14",
167171
"is_verified": true,
168-
"line_number": 310,
172+
"line_number": 319,
169173
"is_secret": false
170174
}
171175
]
172176
},
173-
"generated_at": "2024-11-11T21:38:52Z"
177+
"generated_at": "2025-04-20T19:07:19Z"
174178
}

defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ remnux_with_xamarin_mono: false
2424
remnux_with_ghidra: true
2525
remnux_ghidra_url: 'https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_11.2.1_build/ghidra_11.2.1_PUBLIC_20241105.zip'
2626
remnux_ghidra_checksum: 'sha256:ce4db5117da0fbaf8f33863fec4f40902f754f06b68945a59fb1c0f9b1bc461c'
27+
remnux_snap_enable: false
2728

2829
# remnux_webserver: apache2
2930
remnux_webserver: nginx

tasks/remnux-repos.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,17 @@
4242
mode: '0644'
4343
register: pkg_result
4444
until: pkg_result is success
45+
when: false
4546

4647
- name: Adding Draios repository (sysdig)
4748
ansible.builtin.apt_repository:
4849
repo: 'deb https://download.sysdig.com/stable/deb stable-$(ARCH)/'
4950
state: present
50-
when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
5151
register: pkg_result
5252
until: pkg_result is success
53+
when:
54+
- ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
55+
- false
5356

5457
- name: Enabling multiverse repository
5558
ansible.builtin.replace:
@@ -59,6 +62,13 @@
5962
mode: '0644'
6063
backup: yes
6164

65+
# https://www.jeffgeerling.com/blog/2022/aptkey-deprecated-debianubuntu-how-fix-ansible
66+
- name: Adding wireshark-dev gpg key
67+
ansible.builtin.get_url:
68+
url: "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xa2e402b85a4b70cd78d8a3d9d875551314eca0f0"
69+
dest: /etc/apt/trusted.gpg.d/wireshark-dev.asc
70+
mode: '0644'
71+
owner: root
6272
- name: Adding wireshark-dev ppa repository
6373
ansible.builtin.apt_repository:
6474
repo: 'ppa:wireshark-dev/stable'

tasks/remnux.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,15 @@
4545
register: pkg_result
4646
until: pkg_result is success
4747

48+
- name: REMNUX | packages install (snap-based)
49+
ansible.builtin.apt:
50+
name: "{{ remnux_snap_packages }}"
51+
state: "present"
52+
register: pkg_result
53+
until: pkg_result is success
54+
when:
55+
- ansible_virtualization_type != 'lxc' or remnux_snap_enable | bool
56+
4857
- name: REMNUX | remnux+sift ppa packages install
4958
ansible.builtin.apt:
5059
name: "{{ remnux_ppa_packages + sift_ppa_packages }}"

vars/Ubuntu-24.04.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ remnux_packages:
8787
# - gdb-minimal
8888
- gdb
8989
- python3-virtualenv
90-
- firefox
9190
- xmlstarlet
9291
- inspircd
9392
- epic5
@@ -271,4 +270,7 @@ remnux_pip_packages:
271270
- dnslib
272271
- pydivert
273272

273+
remnux_snap_packages:
274+
- firefox
275+
274276
microsoft_dotnet: dotnet-runtime-8.0

0 commit comments

Comments
 (0)