Skip to content

Commit e4e2c6c

Browse files
committed
CI: Move sudo test users defaults into /etc/sudoers.d
Prep for reusing it in non-Ansible tests
1 parent 5abdde1 commit e4e2c6c

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

docs/changelog.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ In progress (unreleased)
2222
------------------------
2323

2424
* :gh:issue:`1306` CI: Report sudo version on Ansible targets
25+
* :gh:issue:`1306` CI: Move sudo test users defaults into ``/etc/sudoers.d``
2526

2627

2728
v0.3.27 (2025-08-20)

tests/image_prep/_user_accounts.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,14 @@
157157
owner: mitogen__has_sudo_pubkey
158158
group: mitogen__group
159159

160-
- name: Configure sudoers defaults
161-
blockinfile:
162-
path: /etc/sudoers
163-
marker: "# {mark} Mitogen test defaults"
164-
block: |
165-
Defaults>mitogen__pw_required targetpw
166-
Defaults>mitogen__require_tty requiretty
167-
Defaults>mitogen__require_tty_pw_required requiretty,targetpw
160+
- name: Configure sudoers
161+
copy:
162+
src: "{{ item.src }}"
163+
dest: "{{ item.dest }}"
164+
mode: ug=r,o=
168165
validate: '/usr/sbin/visudo -cf %s'
166+
with_items:
167+
- {src: sudoers_defaults, dest: /etc/sudoers.d/mitogen_test_defaults}
169168

170169
- name: Configure sudoers users
171170
blockinfile:
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Defaults>mitogen__pw_required targetpw
2+
Defaults>mitogen__require_tty requiretty
3+
Defaults>mitogen__require_tty_pw_required requiretty,targetpw

0 commit comments

Comments
 (0)