From a6b79b8771019a8d9fa1b3299ce2de0e3cec2dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Gonzalez?= Date: Wed, 17 Jul 2024 19:08:52 -0600 Subject: [PATCH] Chore/Upgrade ansible-lint profile to safety --- .config/ansible-lint-ignore.txt | 3 +++ .ansible-lint => .config/ansible-lint.yml | 13 +++++----- roles/base/tasks/{cron.yml => Cron.yml} | 0 roles/base/tasks/{debug.yml => Debug.yml} | 0 roles/base/tasks/{fish.yml => Fish.yml} | 0 roles/base/tasks/{locale.yml => Locale.yml} | 6 ++--- roles/base/tasks/{neovim.yml => Neovim.yml} | 0 roles/base/tasks/{network.yml => Network.yml} | 0 .../base/tasks/{packages.yml => Packages.yml} | 0 roles/base/tasks/{ssh.yml => SSH.yml} | 0 .../base/tasks/{security.yml => Security.yml} | 0 .../tasks/{tailscale.yml => Tailscale.yml} | 2 +- roles/base/tasks/{ufw.yml => UFW.yml} | 0 roles/base/tasks/{users.yml => Users.yml} | 20 ++++++++-------- roles/base/tasks/keyboard-layout.yml | 2 +- roles/base/tasks/main.yml | 24 +++++++++---------- roles/base/tasks/tailscale-arch.yml | 2 +- roles/base/tasks/tailscale-debian.yml | 10 ++++---- roles/base/vars/Archlinux.yml | 2 +- roles/base/vars/Debian.yml | 2 +- roles/base/vars/Ubuntu.yml | 2 +- .../tasks/{docker.yml => Docker.yml} | 0 .../tasks/{insync.yml => Insync.yml} | 0 .../tasks/{libvirt.yml => Libvirt.yml} | 0 .../tasks/{portmaster.yml => Portmaster.yml} | 4 ++-- .../tasks/{smtpd.yml => SMTPD.yml} | 0 .../tasks/{samba.yml => Samba.yml} | 20 ++++++++-------- .../tasks/{syncthing.yml => Syncthing.yml} | 0 roles/heavy_workstation/tasks/main.yml | 14 +++++------ roles/heavy_workstation/tasks/windows-vm.yml | 4 ++-- roles/light_workstation/tasks/brave.yml | 5 ++-- roles/light_workstation/tasks/cron.yml | 12 +++++----- roles/light_workstation/tasks/git.yml | 2 +- roles/light_workstation/tasks/grub.yml | 8 ++++++- roles/light_workstation/tasks/rsync.yml | 9 ++++--- roles/light_workstation/vars/main.yml | 2 +- 36 files changed, 91 insertions(+), 77 deletions(-) create mode 100644 .config/ansible-lint-ignore.txt rename .ansible-lint => .config/ansible-lint.yml (95%) rename roles/base/tasks/{cron.yml => Cron.yml} (100%) rename roles/base/tasks/{debug.yml => Debug.yml} (100%) rename roles/base/tasks/{fish.yml => Fish.yml} (100%) rename roles/base/tasks/{locale.yml => Locale.yml} (70%) rename roles/base/tasks/{neovim.yml => Neovim.yml} (100%) rename roles/base/tasks/{network.yml => Network.yml} (100%) rename roles/base/tasks/{packages.yml => Packages.yml} (100%) rename roles/base/tasks/{ssh.yml => SSH.yml} (100%) rename roles/base/tasks/{security.yml => Security.yml} (100%) rename roles/base/tasks/{tailscale.yml => Tailscale.yml} (98%) rename roles/base/tasks/{ufw.yml => UFW.yml} (100%) rename roles/base/tasks/{users.yml => Users.yml} (70%) rename roles/heavy_workstation/tasks/{docker.yml => Docker.yml} (100%) rename roles/heavy_workstation/tasks/{insync.yml => Insync.yml} (100%) rename roles/heavy_workstation/tasks/{libvirt.yml => Libvirt.yml} (100%) rename roles/heavy_workstation/tasks/{portmaster.yml => Portmaster.yml} (84%) rename roles/heavy_workstation/tasks/{smtpd.yml => SMTPD.yml} (100%) rename roles/heavy_workstation/tasks/{samba.yml => Samba.yml} (70%) rename roles/heavy_workstation/tasks/{syncthing.yml => Syncthing.yml} (100%) diff --git a/.config/ansible-lint-ignore.txt b/.config/ansible-lint-ignore.txt new file mode 100644 index 000000000..2c066289d --- /dev/null +++ b/.config/ansible-lint-ignore.txt @@ -0,0 +1,3 @@ +# To skip a rule just enter filename and tag, like "playbook.yml package-latest" + +roles/light_workstation/tasks/dotfiles.yml command-instead-of-module diff --git a/.ansible-lint b/.config/ansible-lint.yml similarity index 95% rename from .ansible-lint rename to .config/ansible-lint.yml index 06cdc3695..622f9c49c 100644 --- a/.ansible-lint +++ b/.config/ansible-lint.yml @@ -1,5 +1,5 @@ --- -profile: min # min, basic, moderate,safety, shared, production +profile: safety # min, basic, moderate, safety, shared, production # Allows dumping of results in SARIF format # sarif_file: result.sarif @@ -57,15 +57,16 @@ use_default_rules: true # still visible, making it easier to address later. skip_list: - ignore-errors + - schema[tasks] # Ansible-lint does not automatically load rules that have the 'opt-in' tag. # You must enable opt-in rules by listing each rule 'id' below. enable_list: - - args - - empty-string-compare # opt-in - - no-log-password # opt-in - - no-same-owner # opt-in - - name[prefix] # opt-in + # - args + # - empty-string-compare # opt-in + # - no-log-password # opt-in + # - no-same-owner # opt-in + # - name[prefix] # opt-in # add yaml here if you want to avoid ignoring yaml checks when yamllint # library is missing. Normally its absence just skips using that rule. - yaml diff --git a/roles/base/tasks/cron.yml b/roles/base/tasks/Cron.yml similarity index 100% rename from roles/base/tasks/cron.yml rename to roles/base/tasks/Cron.yml diff --git a/roles/base/tasks/debug.yml b/roles/base/tasks/Debug.yml similarity index 100% rename from roles/base/tasks/debug.yml rename to roles/base/tasks/Debug.yml diff --git a/roles/base/tasks/fish.yml b/roles/base/tasks/Fish.yml similarity index 100% rename from roles/base/tasks/fish.yml rename to roles/base/tasks/Fish.yml diff --git a/roles/base/tasks/locale.yml b/roles/base/tasks/Locale.yml similarity index 70% rename from roles/base/tasks/locale.yml rename to roles/base/tasks/Locale.yml index 15d7bdcec..c5f75394c 100644 --- a/roles/base/tasks/locale.yml +++ b/roles/base/tasks/Locale.yml @@ -1,5 +1,5 @@ --- -- name: Install locale package when distribution is Ubuntu +- name: Locale | Install locale package when distribution is Ubuntu tags: - locale ansible.builtin.package: @@ -9,14 +9,14 @@ become: true when: ansible_distribution in ["Ubuntu", "Debian"] -- name: Set timezone to "{{ timezone }}" +- name: Locale | Set timezone to "{{ timezone }}" tags: - timezone community.general.timezone: name: "{{ timezone }}" become: true -- name: Ensure the locale exists +- name: Locale | Ensure the locale exists tags: - locale community.general.locale_gen: diff --git a/roles/base/tasks/neovim.yml b/roles/base/tasks/Neovim.yml similarity index 100% rename from roles/base/tasks/neovim.yml rename to roles/base/tasks/Neovim.yml diff --git a/roles/base/tasks/network.yml b/roles/base/tasks/Network.yml similarity index 100% rename from roles/base/tasks/network.yml rename to roles/base/tasks/Network.yml diff --git a/roles/base/tasks/packages.yml b/roles/base/tasks/Packages.yml similarity index 100% rename from roles/base/tasks/packages.yml rename to roles/base/tasks/Packages.yml diff --git a/roles/base/tasks/ssh.yml b/roles/base/tasks/SSH.yml similarity index 100% rename from roles/base/tasks/ssh.yml rename to roles/base/tasks/SSH.yml diff --git a/roles/base/tasks/security.yml b/roles/base/tasks/Security.yml similarity index 100% rename from roles/base/tasks/security.yml rename to roles/base/tasks/Security.yml diff --git a/roles/base/tasks/tailscale.yml b/roles/base/tasks/Tailscale.yml similarity index 98% rename from roles/base/tasks/tailscale.yml rename to roles/base/tasks/Tailscale.yml index 55f688eea..5e2e4dc4b 100644 --- a/roles/base/tasks/tailscale.yml +++ b/roles/base/tasks/Tailscale.yml @@ -126,7 +126,7 @@ seconds: 5 when: nonsensitive_stdout is not skipped -- name: Install | Clear State Upon Error +- name: Tailscale | Clear State Upon Error tags: - tailscale ansible.builtin.file: diff --git a/roles/base/tasks/ufw.yml b/roles/base/tasks/UFW.yml similarity index 100% rename from roles/base/tasks/ufw.yml rename to roles/base/tasks/UFW.yml diff --git a/roles/base/tasks/users.yml b/roles/base/tasks/Users.yml similarity index 70% rename from roles/base/tasks/users.yml rename to roles/base/tasks/Users.yml index 4713c2bec..09239901d 100644 --- a/roles/base/tasks/users.yml +++ b/roles/base/tasks/Users.yml @@ -1,42 +1,42 @@ --- -- name: Create frank group +- name: Users | Create frank group tags: - users ansible.builtin.group: name: frank state: present -- name: Create ansible group +- name: Users | Create ansible group tags: - users ansible.builtin.group: name: ansible state: present -- name: Set fact for Debian +- name: Users | Set fact for Debian tags: - users ansible.builtin.set_fact: - sudo_group: sudo + base_sudo_group: sudo when: ansible_os_family == "Debian" -- name: Set fact for ArchLinux +- name: Users | Set fact for ArchLinux tags: - users ansible.builtin.set_fact: - sudo_group: wheel + base_sudo_group: wheel when: ansible_os_family == "Archlinux" -- name: Users | frank | create user +- name: Users | Create user {{ lookup('env', 'USER') }} tags: - users ansible.builtin.user: name: frank group: frank - groups: adm,{{ sudo_group }} + groups: adm,{{ base_sudo_group }} state: present -- name: Create ansible user +- name: Users | Create ansible user tags: - users - ansible @@ -45,7 +45,7 @@ system: true become: true -- name: Copy sudoers_ansible +- name: Users | Copy sudoers_ansible tags: - users - ansible diff --git a/roles/base/tasks/keyboard-layout.yml b/roles/base/tasks/keyboard-layout.yml index fea05adc0..1aa9b5a27 100644 --- a/roles/base/tasks/keyboard-layout.yml +++ b/roles/base/tasks/keyboard-layout.yml @@ -1,5 +1,5 @@ --- -- name: Copy file vconsole.conf +- name: keyboard-layout | Copy file vconsole.conf tags: - keyboard ansible.builtin.copy: diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 82c6fc5b0..a631b60f7 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -1,16 +1,16 @@ --- - name: Base | Include tasks from debug play - ansible.builtin.include_tasks: tasks/debug.yml + ansible.builtin.include_tasks: tasks/Debug.yml tags: - debug - name: Base | Include tasks from users play - ansible.builtin.include_tasks: tasks/users.yml + ansible.builtin.include_tasks: tasks/Users.yml tags: - users - name: Base | Include tasks from ssh play - ansible.builtin.include_tasks: tasks/ssh.yml + ansible.builtin.include_tasks: tasks/SSH.yml tags: - ssh @@ -20,48 +20,48 @@ - keyboard - name: Base | Include tasks from locale play - ansible.builtin.include_tasks: tasks/locale.yml + ansible.builtin.include_tasks: tasks/Locale.yml tags: - timezone - locale - name: Base | Include tasks from cron play - ansible.builtin.include_tasks: tasks/cron.yml + ansible.builtin.include_tasks: tasks/Cron.yml tags: - cron - name: Base | Include tasks from packages play - ansible.builtin.include_tasks: tasks/packages.yml + ansible.builtin.include_tasks: tasks/Packages.yml tags: - packages - nvidia - name: Base | Include tasks from fish play - ansible.builtin.include_tasks: tasks/fish.yml + ansible.builtin.include_tasks: tasks/Fish.yml tags: - fish - name: Base | Include tasks from security play - ansible.builtin.include_tasks: tasks/security.yml + ansible.builtin.include_tasks: tasks/Security.yml tags: - security - fail2ban - apparmor - name: Base | Include tasks from ufw play - ansible.builtin.include_tasks: tasks/ufw.yml + ansible.builtin.include_tasks: tasks/UFW.yml tags: - ufw - name: Base | Include tasks from neovim play - ansible.builtin.include_tasks: tasks/neovim.yml + ansible.builtin.include_tasks: tasks/Neovim.yml tags: - neovim - git - aur - name: Base | Include tasks from network play - ansible.builtin.include_tasks: tasks/network.yml + ansible.builtin.include_tasks: tasks/Network.yml tags: - network - netbook @@ -69,6 +69,6 @@ - aur - name: Base | Include tasks from tailscale play - ansible.builtin.include_tasks: tasks/tailscale.yml + ansible.builtin.include_tasks: tasks/Tailscale.yml tags: - tailscale diff --git a/roles/base/tasks/tailscale-arch.yml b/roles/base/tasks/tailscale-arch.yml index f659fc1d4..64023c535 100644 --- a/roles/base/tasks/tailscale-arch.yml +++ b/roles/base/tasks/tailscale-arch.yml @@ -1,5 +1,5 @@ --- -- name: Arch | Install Tailscale +- name: tailscale-arch | Tailscale | Install Tailscale become: true community.general.pacman: name: "{{ tailscale_package }}" diff --git a/roles/base/tasks/tailscale-debian.yml b/roles/base/tasks/tailscale-debian.yml index 6bfb7890c..da7ad6a05 100644 --- a/roles/base/tasks/tailscale-debian.yml +++ b/roles/base/tasks/tailscale-debian.yml @@ -1,12 +1,12 @@ --- -- name: Debian | Apt Dependencies +- name: tailscale-debian | Tailscale | Apt Dependencies become: true ansible.builtin.apt: name: "{{ tailscale_apt_dependencies }}" cache_valid_time: 3600 state: present -- name: Debian | Legacy Apt Dependencies +- name: tailscale-debian | Tailscale | Legacy Apt Dependencies become: true ansible.builtin.apt: name: "{{ tailscale_legacy_apt_dependencies }}" @@ -16,20 +16,20 @@ - ansible_distribution_major_version != "testing" - ansible_distribution_major_version != "n/a" -- name: Debian | Add Tailscale Signing Key +- name: tailscale-debian | Tailscale | Add Tailscale Signing Key become: true ansible.builtin.get_url: url: "{{ tailscale_apt_signkey }}" dest: "{{ tailscale_apt_keyring_path }}" mode: "0644" -- name: Debian | Add Tailscale Deb +- name: tailscale-debian | Tailscale | Add Tailscale Deb become: true ansible.builtin.apt_repository: repo: "{{ tailscale_apt_deb }}" state: present -- name: Debian | Install Tailscale +- name: tailscale-debian | Tailscale | Install Tailscale become: true ansible.builtin.apt: name: "{{ tailscale_package }}" diff --git a/roles/base/vars/Archlinux.yml b/roles/base/vars/Archlinux.yml index 8bc97f6d6..4974b56b8 100644 --- a/roles/base/vars/Archlinux.yml +++ b/roles/base/vars/Archlinux.yml @@ -1,2 +1,2 @@ --- -sudo_group: wheel +base_sudo_group: wheel diff --git a/roles/base/vars/Debian.yml b/roles/base/vars/Debian.yml index 41802937d..412f6c960 100644 --- a/roles/base/vars/Debian.yml +++ b/roles/base/vars/Debian.yml @@ -1,2 +1,2 @@ --- -sudo_group: sudo +base_sudo_group: sudo diff --git a/roles/base/vars/Ubuntu.yml b/roles/base/vars/Ubuntu.yml index 41802937d..412f6c960 100644 --- a/roles/base/vars/Ubuntu.yml +++ b/roles/base/vars/Ubuntu.yml @@ -1,2 +1,2 @@ --- -sudo_group: sudo +base_sudo_group: sudo diff --git a/roles/heavy_workstation/tasks/docker.yml b/roles/heavy_workstation/tasks/Docker.yml similarity index 100% rename from roles/heavy_workstation/tasks/docker.yml rename to roles/heavy_workstation/tasks/Docker.yml diff --git a/roles/heavy_workstation/tasks/insync.yml b/roles/heavy_workstation/tasks/Insync.yml similarity index 100% rename from roles/heavy_workstation/tasks/insync.yml rename to roles/heavy_workstation/tasks/Insync.yml diff --git a/roles/heavy_workstation/tasks/libvirt.yml b/roles/heavy_workstation/tasks/Libvirt.yml similarity index 100% rename from roles/heavy_workstation/tasks/libvirt.yml rename to roles/heavy_workstation/tasks/Libvirt.yml diff --git a/roles/heavy_workstation/tasks/portmaster.yml b/roles/heavy_workstation/tasks/Portmaster.yml similarity index 84% rename from roles/heavy_workstation/tasks/portmaster.yml rename to roles/heavy_workstation/tasks/Portmaster.yml index c148774e8..2f744413e 100644 --- a/roles/heavy_workstation/tasks/portmaster.yml +++ b/roles/heavy_workstation/tasks/Portmaster.yml @@ -1,5 +1,5 @@ --- -- name: Install aur packages +- name: Portmaster | Install aur packages tags: - portmaster kewlfft.aur.aur: @@ -11,7 +11,7 @@ when: ansible_distribution == "Archlinux" ignore_errors: true -- name: Generate a file to start portmaster +- name: Portmaster | Generate a file to start portmaster tags: - portmaster ansible.builtin.blockinfile: diff --git a/roles/heavy_workstation/tasks/smtpd.yml b/roles/heavy_workstation/tasks/SMTPD.yml similarity index 100% rename from roles/heavy_workstation/tasks/smtpd.yml rename to roles/heavy_workstation/tasks/SMTPD.yml diff --git a/roles/heavy_workstation/tasks/samba.yml b/roles/heavy_workstation/tasks/Samba.yml similarity index 70% rename from roles/heavy_workstation/tasks/samba.yml rename to roles/heavy_workstation/tasks/Samba.yml index 1468f6bed..7d86f8ac1 100644 --- a/roles/heavy_workstation/tasks/samba.yml +++ b/roles/heavy_workstation/tasks/Samba.yml @@ -1,5 +1,5 @@ --- -- name: Install samba packages +- name: Samba | Install samba packages tags: - samba ansible.builtin.package: @@ -12,7 +12,7 @@ become: true when: ansible_distribution == "Archlinux" -- name: Ensure group sambausers exists +- name: Samba | Ensure group sambausers exists tags: - samba ansible.builtin.group: @@ -20,7 +20,7 @@ state: present become: true -- name: Ensure /samba directory exists +- name: Samba | Ensure /samba directory exists tags: - samba ansible.builtin.file: @@ -30,7 +30,7 @@ state: directory become: true -- name: Copy file smb.conf to /etc/samba/ +- name: Samba | Copy file smb.conf to /etc/samba/ tags: - samba ansible.builtin.copy: @@ -42,7 +42,7 @@ become: true notify: finish samba configuration -- name: File to Allow samba in ufw +- name: Samba | File to Allow samba in ufw tags: - samba ansible.builtin.copy: @@ -53,7 +53,7 @@ mode: "0644" become: true -- name: Allow samba in ufw +- name: Samba | Allow samba in ufw tags: - samba community.general.ufw: @@ -61,16 +61,16 @@ name: Samba become: true -- name: Create samba password and the user {{ lookup('env', 'USER') }} +- name: Samba | Create samba password and the user {{ lookup('env', 'USER') }} tags: - samba - ansible.builtin.shell: (echo '{{ samba_pass }}'; echo '{{ samba_pass }}') | smbpasswd -s -a {{ lookup('env', 'USER') }} + ansible.builtin.shell: set -o pipefail && echo '{{ samba_pass }}'; echo '{{ samba_pass }}') | smbpasswd -s -a {{ lookup('env', 'USER') }} register: smbpasswd changed_when: "'Added user' in smbpasswd.stdout" become: true listen: finish samba configuration -- name: Start samba (smb) service +- name: Samba | Start samba (smb) service tags: - samba ansible.builtin.service: @@ -80,7 +80,7 @@ become: true listen: finish samba configuration -- name: Start samba (nmb) service +- name: Samba | Start samba (nmb) service tags: - samba ansible.builtin.service: diff --git a/roles/heavy_workstation/tasks/syncthing.yml b/roles/heavy_workstation/tasks/Syncthing.yml similarity index 100% rename from roles/heavy_workstation/tasks/syncthing.yml rename to roles/heavy_workstation/tasks/Syncthing.yml diff --git a/roles/heavy_workstation/tasks/main.yml b/roles/heavy_workstation/tasks/main.yml index 757ba5ca9..7262b58ae 100644 --- a/roles/heavy_workstation/tasks/main.yml +++ b/roles/heavy_workstation/tasks/main.yml @@ -1,16 +1,16 @@ --- - name: Heavy Workstation | Include tasks from docker play - ansible.builtin.include_tasks: tasks/docker.yml + ansible.builtin.include_tasks: tasks/Docker.yml tags: - docker - name: Heavy Workstation | Include tasks from syncthing play - ansible.builtin.include_tasks: tasks/syncthing.yml + ansible.builtin.include_tasks: tasks/Syncthing.yml tags: - syncthing - name: Heavy Workstation | Include tasks from libvirt play - ansible.builtin.include_tasks: tasks/libvirt.yml + ansible.builtin.include_tasks: tasks/Libvirt.yml tags: - libvirt @@ -20,24 +20,24 @@ - windows-vm - name: Heavy Workstation | Include tasks from insync play - ansible.builtin.include_tasks: tasks/insync.yml + ansible.builtin.include_tasks: tasks/Insync.yml tags: - insync # - name: Heavy Workstation | Include tasks from samba play -# ansible.builtin.include_tasks: tasks/samba.yml +# ansible.builtin.include_tasks: tasks/Samba.yml # tags: # - never # - samba # - name: Heavy Workstation | Include tasks from smtpd play -# ansible.builtin.include_tasks: tasks/smtpd.yml +# ansible.builtin.include_tasks: tasks/SMTPD.yml # tags: # - never # - opensmtpd # - name: Heavy Workstation | Include tasks from portmaster play -# ansible.builtin.include_tasks: tasks/portmaster.yml +# ansible.builtin.include_tasks: tasks/Portmaster.yml # tags: # - aur # - never diff --git a/roles/heavy_workstation/tasks/windows-vm.yml b/roles/heavy_workstation/tasks/windows-vm.yml index 81477cf05..4bbda12a5 100644 --- a/roles/heavy_workstation/tasks/windows-vm.yml +++ b/roles/heavy_workstation/tasks/windows-vm.yml @@ -1,5 +1,5 @@ --- -- name: Windows VM | Ensure windows-docker directory exists +- name: windows-vm | Ensure windows-docker directory exists tags: - windows-vm ansible.builtin.file: @@ -9,7 +9,7 @@ owner: "{{ lookup('env', 'USER') }}" state: directory -- name: Windows VM | Clone windows_docker repo +- name: windows-vm | Clone windows_docker repo tags: - windows-vm ansible.builtin.git: diff --git a/roles/light_workstation/tasks/brave.yml b/roles/light_workstation/tasks/brave.yml index fb92c1af9..cd4aefb98 100644 --- a/roles/light_workstation/tasks/brave.yml +++ b/roles/light_workstation/tasks/brave.yml @@ -20,8 +20,9 @@ - name: Brave | Brave Browser PPA setting in Ubuntu tags: - brave - ansible.builtin.shell: echo "deb [signed-by=/usr/share/keyrings/brave-browser-archive-keyring.gpg arch=amd64] > https://brave-browser-apt-release.s3.brave.com/ - stable main" | tee /etc/apt/sources.list.d/brave-browser-release.list + ansible.builtin.apt_repository: + repo: deb https://brave-browser-apt-release.s3.brave.com/ stable main + state: present become: true when: ansible_distribution in ["Ubuntu", "Debian"] diff --git a/roles/light_workstation/tasks/cron.yml b/roles/light_workstation/tasks/cron.yml index 11ea2c8be..f1f2b3542 100644 --- a/roles/light_workstation/tasks/cron.yml +++ b/roles/light_workstation/tasks/cron.yml @@ -7,8 +7,8 @@ name: ansible provision minute: "*/10" disabled: true - job: /usr/bin/ansible-pull --vault-password-file {{ lookup('env', 'HOME') }}/.vault_key -o -U https://github.com/andre-gonzalez/ansible-pull.git 2>> {{ lookup('env', - 'HOME') }}/.cron-errors/ansible-pull-error-logs.txt 1>> {{ lookup('env', 'HOME') }}/.cron-errors//gdrive-pessoal/pessoal/programação/cron-logs/stdout-logs/ansible-pull-stdout-logs.txt + job: > + /usr/bin/ansible-pull --vault-password-file "{{ lookup('env', 'HOME') }}"/.vault_key -o -U https://github.com/andre-gonzalez/ansible-pull.git 2>> {{ lookup('env', 'HOME') }}/.cron-errors/ansible-pull-error-logs.txt 1>> {{ lookup('env', 'HOME') }}/.cron-errors//gdrive-pessoal/pessoal/programação/cron-logs/stdout-logs/ansible-pull-stdout-logs.txt become: true - name: Cron | Install cron job (profile-selector) @@ -50,8 +50,8 @@ name: push notes to git repository minute: "*/10" disabled: false - job: /bin/sh {{ lookup('env', 'HOME') }}/.scripts/push-new-notes.sh 2>> {{ lookup('env', 'HOME') }}/.cron-errors/push-new-notes-error-logs.txt 1>> {{ lookup('env', - 'HOME') }}/gdrive-pessoal/pessoal/programação/cron-logs/stdout-logs/push-new-notes-stdout-logs.txt + job: > + /bin/sh {{ lookup('env', 'HOME') }}/.scripts/push-new-notes.sh 2>> {{ lookup('env', 'HOME') }}/.cron-errors/push-new-notes-error-logs.txt 1>> {{ lookup('env', 'HOME') }}/gdrive-pessoal/pessoal/programação/cron-logs/stdout-logs/push-new-notes-stdout-logs.txt - name: Cron | Install cron job (Auto adjust screen brightness) tags: @@ -63,7 +63,7 @@ minute: "*/5" hour: 17-19,6-15 disabled: false - job: /bin/sh {{ lookup('env', 'HOME') }}/.scripts/auto-adjust-brightness.sh 2>> {{ lookup('env', 'HOME') }}/.cron-errors/auto-adjust-brightness-error-logs.txt - 1>> {{ lookup('env', 'HOME') }}/gdrive-pessoal/pessoal/programação/cron-logs/stdout-logs/auto-adjust-brightness-stdout-logs.txt + job: > + /bin/sh {{ lookup('env', 'HOME') }}/.scripts/auto-adjust-brightness.sh 2>> {{ lookup('env', 'HOME') }}/.cron-errors/auto-adjust-brightness-error-logs.txt 1>> {{ lookup('env', 'HOME') }}/gdrive-pessoal/pessoal/programação/cron-logs/stdout-logs/auto-adjust-brightness-stdout-logs.txt become: true when: '"Notebook" in ansible_facts["form_factor"]' diff --git a/roles/light_workstation/tasks/git.yml b/roles/light_workstation/tasks/git.yml index bf4fe4fcd..39705d617 100644 --- a/roles/light_workstation/tasks/git.yml +++ b/roles/light_workstation/tasks/git.yml @@ -22,7 +22,7 @@ community.general.git_config: name: user.name scope: global - value: "{{ fullname }}" + value: "{{ light_workstation_fullname }}" - name: Git | Set default branch tags: diff --git a/roles/light_workstation/tasks/grub.yml b/roles/light_workstation/tasks/grub.yml index 6077d3bf2..bdd2324c7 100644 --- a/roles/light_workstation/tasks/grub.yml +++ b/roles/light_workstation/tasks/grub.yml @@ -109,5 +109,11 @@ group: root mode: "0755" become: true - when: update_grub is changed or update_grub2 is changed or update_grub3 is changed or update_grub4 is changed or update_grub5 is changed or update_grub6 is changed + when: > + update_grub is changed + or update_grub2 is changed + or update_grub3 is changed + or update_grub4 is changed + or update_grub5 is changed + or update_grub6 is changed and ansible_service_mgr == "grub" diff --git a/roles/light_workstation/tasks/rsync.yml b/roles/light_workstation/tasks/rsync.yml index d3fcf7197..0cb572b5d 100644 --- a/roles/light_workstation/tasks/rsync.yml +++ b/roles/light_workstation/tasks/rsync.yml @@ -51,9 +51,10 @@ hour: 8,21 weekday: SAT disabled: true - job: "{{ lookup('env', 'HOME') }}/.scripts/backup-to-internal-hard-drive.sh 2>> {{ lookup('env', 'HOME') }}/gdrive-pessoal/pessoal/programação/cron-logs/error-logs/backup-internal-hard-drive-error-logs.txt + job: > + "{{ lookup('env', 'HOME') }}/.scripts/backup-to-internal-hard-drive.sh + 2>> {{ lookup('env', 'HOME') }}/gdrive-pessoal/pessoal/programação/cron-logs/error-logs/backup-internal-hard-drive-error-logs.txt 1>> {{ lookup('env', 'HOME') }}/gdrive-pessoal/pessoal/programação/cron-logs/stdout-logs/backup-internal-hard-drive-stdout-logs.txt" - - name: Rsync | Install cron job (Backup home directory with rsync to external hard drive) tags: - rsync @@ -64,5 +65,7 @@ hour: 8,21 weekday: SUN disabled: true - job: "{{ lookup('env', 'HOME') }}/.scripts/backup-to-external-hard-drive.sh 2>> {{ lookup('env', 'HOME') }}/gdrive-pessoal/pessoal/programação/cron-logs/error-logs/backup-external-hard-drive-error-logs.txt + job: > + "{{ lookup('env', 'HOME') }}/.scripts/backup-to-external-hard-drive.sh + 2>> {{ lookup('env', 'HOME') }}/gdrive-pessoal/pessoal/programação/cron-logs/error-logs/backup-external-hard-drive-error-logs.txt 1>> {{ lookup('env', 'HOME') }}/gdrive-pessoal/pessoal/programação/cron-logs/stdout-logs/backup-external-hard-drive-stdout-logs.txt" diff --git a/roles/light_workstation/vars/main.yml b/roles/light_workstation/vars/main.yml index 0a30b3275..bd23d983f 100644 --- a/roles/light_workstation/vars/main.yml +++ b/roles/light_workstation/vars/main.yml @@ -1,2 +1,2 @@ --- -fullname: André Gonzalez +light_workstation_fullname: André Gonzalez