Skip to content

Commit 6a2b4ca

Browse files
committed
explicitly use become where sudo privileges are required, and drop the previous become statements as we are already running in the current user's context now
1 parent 8cafab8 commit 6a2b4ca

10 files changed

Lines changed: 18 additions & 22 deletions

File tree

roles/ansible-lint/tasks/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
pip:
55
name: ansible-lint
66
version: 5.0.12
7-
state: present
7+
state: present
8+
become: yes

roles/bashrc_d/tasks/main.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
path: ~/.bashrc.d
55
state: directory
66
mode: 0755
7-
become: yes
8-
become_user: "{{ ansible_env.SUDO_USER }}"
97

108
- name: Setup ~/.bashrc to load .bash files from ~/.bashrc.d
119
blockinfile:
@@ -15,6 +13,4 @@
1513
for config in "$HOME"/.bashrc.d/*.bash ; do
1614
. "$config"
1715
done
18-
unset -v config
19-
become: yes
20-
become_user: "{{ ansible_env.SUDO_USER }}"
16+
unset -v config

roles/cache/tasks/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
d {{ download_cache_dir }} 1777 root root -
1010
dest: /etc/tmpfiles.d/downloads.conf
1111
mode: 0644
12+
become: yes
1213

1314
- name: Ensure {{ download_cache_dir }} is created
1415
command:
1516
cmd: systemd-tmpfiles --create
1617
creates: "{{ download_cache_dir }}"
18+
become: yes

roles/docker/tasks/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
deb: "{{ download_cache_dir }}/{{ item.deb_file }}"
1414
state: present
1515
with_items: "{{ docker_deb_packages }}"
16+
become: yes
1617

1718
- name: Add VM user to 'docker' group
1819
user:
1920
name: "{{ ansible_env.SUDO_USER }}"
2021
groups: docker
21-
append: yes
22+
append: yes
23+
become: yes

roles/git/tasks/main.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
apt:
55
name: git
66
state: present
7+
become: yes
78

89
- name: Set up the PS1 shell prompt for Git
910
copy:
1011
src: git-ps1.bash
1112
dest: ~/.bashrc.d/git-ps1.bash
1213
mode: 0644
13-
become: yes
14-
become_user: "{{ ansible_env.SUDO_USER }}"
1514

1615
- name: Supply default configuration entries in ~/.gitconfig
1716
git_config:
@@ -31,6 +30,4 @@
3130
alias.slog: log --pretty=oneline --abbrev-commit
3231
alias.graph: log --all --oneline --graph --decorate
3332
alias.stash-all: stash save --include-untracked
34-
alias.prune: fetch --prune
35-
become: yes
36-
become_user: "{{ ansible_env.SUDO_USER }}"
33+
alias.prune: fetch --prune

roles/readme/handlers/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
- name: restart display-manager
44
systemd:
55
name: display-manager
6-
state: restarted
6+
state: restarted
7+
become: yes

roles/readme/tasks/main.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,16 @@
55
state: present
66
notify:
77
- restart display-manager
8+
become: yes
89

910
- name: Ensure the ~/Desktop directory exists
1011
file:
1112
path: ~/Desktop
1213
state: directory
1314
mode: 0755
14-
become: yes
15-
become_user: "{{ ansible_env.SUDO_USER }}"
1615

1716
- name: Create the README file on the Desktop
1817
copy:
1918
src: README.md
2019
dest: ~/Desktop/README.md
2120
mode: 0644
22-
become: yes
23-
become_user: "{{ ansible_env.SUDO_USER }}"

roles/testinfra/tasks/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
name: pytest-testinfra
66
version: 6.3.0
77
state: present
8+
become: yes
89

910
- name: Install pytest-spec formatter at version 3.2.0
1011
pip:
1112
name: pytest-spec
1213
version: 3.2.0
13-
state: present
14+
state: present
15+
become: yes

roles/vscode/tasks/main.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,16 @@
1111
apt:
1212
deb: "{{ download_cache_dir }}/vscode-{{ vscode_version }}.deb"
1313
state: present
14+
become: yes
1415

1516
- name: List VSCode Extensions
1617
command:
1718
cmd: code --list-extensions
1819
register: vscode_installed_extensions
1920
changed_when: false
20-
become: yes
21-
become_user: "{{ ansible_env.SUDO_USER }}"
2221

2322
- name: Install VSCode Extensions
2423
command:
2524
cmd: code --install-extension "{{ item }}"
2625
with_items: "{{ vscode_extensions }}"
2726
when: not vscode_installed_extensions is search(item)
28-
become: yes
29-
become_user: "{{ ansible_env.SUDO_USER }}"

site.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
apt:
77
update_cache: yes
88
cache_valid_time: 3600
9+
become: yes
910

1011
- hosts: localhost
1112
roles:

0 commit comments

Comments
 (0)