From b15368ad5743fc54510566cb517daaa24190e00b Mon Sep 17 00:00:00 2001 From: Lilian Roller Date: Tue, 11 Jun 2019 13:41:22 +0200 Subject: [PATCH] Add exception handling for root --- tasks/main.yml | 16 +++++++++++++--- vars/main.yml | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 555e986..d700cfa 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -59,7 +59,10 @@ group: '{{ item }}' mode: 'u=rw,g=r,o=' with_items: '{{ accounts }}' - when: accounts is defined + when: + - accounts is defined + - accounts != ['root'] + - accounts != 'root' - name: Copy vimrc configuration to root become: yes @@ -79,7 +82,10 @@ group: '{{ item }}' mode: 'u=rw,g=r,o=' with_items: "{{ accounts }}" - when: accounts is defined + when: + - accounts is defined + - accounts != ['root'] + - accounts != 'root' - name: Copy vimrc configuration to admin users become: yes @@ -108,7 +114,11 @@ owner: "{{ item }}" group: "{{ item }}" with_items: "{{ accounts }}" - when: ranger_hidden_files | bool + when: + - ranger_hidden_files | bool + - accounts is defined + - accounts != ['root'] + - accounts != 'root' - name: create .config/ranger/rc.conf file become: true diff --git a/vars/main.yml b/vars/main.yml index bd28572..818cf26 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -8,5 +8,5 @@ bash: shell: "/bin/bash" keyboard: '$(if [[ $(id -u) -ne 0 ]];then echo "\[\033[01;33m\]"; else echo "\[\033[01;31m\]"; fi) $(if [[ $? == 0 ]]; then printf "\xE2\x9D\xA4"; fi) \[\033[01;32m\]\u\[\033[01;36m\]@\[\033[01;32m\]\H\[\033[01;34m\] <\A> \[\033[01;35m\] \j \[\033[01;36m\] \w \[\033[01;33m\]\n\[\033[01;33m\] $(git branch 2>/dev/null | sed -n "s/* \(.*\)/\1 /p")$\[\033[01;00m\] ' -playbook_version_number: 107 # integer without dots +playbook_version_number: 108 # integer without dots playbook_version_path: '/etc/ansible-version/role_dotfiles_chaos-bodensee_github.version'