From b34fc14d8b0a1d9d138190e0792d109df2c571ac Mon Sep 17 00:00:00 2001 From: L3D Date: Sun, 19 Sep 2021 03:18:12 +0200 Subject: [PATCH] use ansible FQCN --- tasks/bashrc.yml | 6 +++--- tasks/basic-selinux.yml | 2 +- tasks/main.yml | 17 ++++++++++------- vars/main.yml | 2 +- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/tasks/bashrc.yml b/tasks/bashrc.yml index 99f2a65..8763f13 100644 --- a/tasks/bashrc.yml +++ b/tasks/bashrc.yml @@ -1,7 +1,7 @@ --- - name: Create a global bashrc configuration become: true - template: + ansible.builtin.template: src: 'templates/bash.bashrc' dest: '/etc/bash.bashrc' owner: root @@ -10,7 +10,7 @@ - name: Copy bashrc configuration to root become: true - template: + ansible.builtin.template: src: 'templates/bashrc' dest: '/root/.bashrc' owner: 'root' @@ -20,7 +20,7 @@ - name: Copy bashrc configuration to non admin users become: true - template: + ansible.builtin.template: src: 'templates/bashrc' dest: '/home/{{ item }}/.bashrc' owner: '{{ item }}' diff --git a/tasks/basic-selinux.yml b/tasks/basic-selinux.yml index 8655e4b..0728eb7 100644 --- a/tasks/basic-selinux.yml +++ b/tasks/basic-selinux.yml @@ -1,7 +1,7 @@ --- - name: install the latest libselinux-python package become: true - dnf: + ansible.builtin.dnf: name: libselinux-python state: present when: ansible_distribution == "Fedora" diff --git a/tasks/main.yml b/tasks/main.yml index a9911fd..d84c45b 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,18 +1,21 @@ --- -- include_tasks: versioncheck.yml +- name: rin optional versionscheck + ansible.builtin.include_tasks: versioncheck.yml when: submodules_versioncheck | bool -- include_tasks: basic-selinux.yml +- name: try to install libselinux-python via dnf + ansible.builtin.include_tasks: basic-selinux.yml when: - dotfiles__install_python_selinux | bool - ansible_distribution == "Fedora" -- include_tasks: bashrc.yml +- name: deploy .bashrc + ansible.builtin.include_tasks: bashrc.yml when: dotfiles__modify_bashrc | bool - name: Copy vimrc configuration to root become: true - copy: + ansible.builtin.copy: src: 'templates/vimrc' dest: '/root/.vimrc' owner: root @@ -21,7 +24,7 @@ - name: Copy vimrc configuration to non admin users become: true - copy: + ansible.builtin.copy: src: 'templates/vimrc' dest: '/home/{{ item }}/.vimrc' owner: '{{ item }}' @@ -35,7 +38,7 @@ - name: create .config/ranger/ directory become: true - file: + ansible.builtin.file: path: "/home/{{ item }}/.config/ranger" state: directory owner: "{{ item }}" @@ -50,7 +53,7 @@ - name: create .config/ranger/rc.conf file become: true - template: + ansible.builtin.template: src: templates/ranger_rc.conf.j2 dest: "/home/{{ item }}/.config/ranger/rc.conf" owner: "{{ item }}" diff --git a/vars/main.yml b/vars/main.yml index 2355898..a792371 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,3 +1,3 @@ --- -playbook_version_number: 2071 # should be increased integer +playbook_version_number: 2072 # should be increased integer playbook_version_path: 'role_dotfiles_chaos-bodensee_github.version'