Applied ansible-lint fixes
This commit is contained in:
parent
24b567fc57
commit
347104529f
20 changed files with 239 additions and 220 deletions
|
|
@ -1,9 +1,10 @@
|
|||
---
|
||||
- name: Set package directory
|
||||
ansible.builtin.set_fact:
|
||||
build_dir: '{{ aur_build_dir }}/{{ item.name }}'
|
||||
build_dir: "{{ aur_build_dir }}/{{ item.name }}"
|
||||
|
||||
- name: 'Retrieve package name for {{ item.name }}'
|
||||
command:
|
||||
- name: "Retrieve package name for {{ item.name }}"
|
||||
ansible.builtin.command:
|
||||
argv:
|
||||
- grep
|
||||
- --only-matching
|
||||
|
|
@ -12,8 +13,8 @@
|
|||
- "{{ build_dir }}/PKGBUILD"
|
||||
register: pkg_name
|
||||
|
||||
- name: 'Retrieve package version for {{ item.name }}'
|
||||
command:
|
||||
- name: "Retrieve package version for {{ item.name }}"
|
||||
ansible.builtin.command:
|
||||
argv:
|
||||
- grep
|
||||
- --only-matching
|
||||
|
|
@ -22,8 +23,8 @@
|
|||
- "{{ build_dir }}/PKGBUILD"
|
||||
register: pkg_version
|
||||
|
||||
- name: 'Retrieve package release for {{ item.name }}'
|
||||
command:
|
||||
- name: "Retrieve package release for {{ item.name }}"
|
||||
ansible.builtin.command:
|
||||
argv:
|
||||
- grep
|
||||
- --only-matching
|
||||
|
|
@ -34,20 +35,20 @@
|
|||
|
||||
- name: Set package filename & version
|
||||
ansible.builtin.set_fact:
|
||||
package_filename: '{{ pkg_name.stdout }}-{{ pkg_version.stdout }}-{{ pkg_release.stdout }}-{{ item.arch }}.pkg.tar.zst'
|
||||
package_filename: "{{ pkg_name.stdout }}-{{ pkg_version.stdout }}-{{ pkg_release.stdout }}-{{ item.arch }}.pkg.tar.zst"
|
||||
installed_version: ansible_facts.packages[item.package_name].version|default('')
|
||||
|
||||
- name: 'Build package {{ item.name }}'
|
||||
ansible.builtin.command: 'makepkg --syncdeps --rmdeps --clean --noconfirm --force'
|
||||
- name: "Build package {{ item.name }}"
|
||||
ansible.builtin.command: "makepkg --syncdeps --rmdeps --clean --noconfirm --force"
|
||||
args:
|
||||
chdir: '{{ build_dir }}'
|
||||
creates: '{{ build_dir }}/{{ package_filename }}'
|
||||
chdir: "{{ build_dir }}"
|
||||
creates: "{{ build_dir }}/{{ package_filename }}"
|
||||
register: package_build
|
||||
when: item.version != installed_version
|
||||
|
||||
- name: 'Install {{ item.name }}'
|
||||
- name: "Install {{ item.name }}"
|
||||
become: true
|
||||
community.general.pacman:
|
||||
name: '{{ build_dir }}/{{ package_filename }}'
|
||||
name: "{{ build_dir }}/{{ package_filename }}"
|
||||
state: present
|
||||
when: item.version != installed_version
|
||||
|
|
|
|||
|
|
@ -1,26 +1,27 @@
|
|||
---
|
||||
- name: Retrieve directory stats
|
||||
ansible.builtin.stat:
|
||||
path: '{{ aur_build_dir }}/{{ item.name }}'
|
||||
loop: '{{ aur_packages }}'
|
||||
path: "{{ aur_build_dir }}/{{ item.name }}"
|
||||
loop: "{{ aur_packages }}"
|
||||
|
||||
- name: Clone aur packages
|
||||
become: true
|
||||
ansible.builtin.git:
|
||||
repo: '{{ item.url }}'
|
||||
dest: '{{ aur_build_dir }}/{{ item.name }}'
|
||||
repo: "{{ item.url }}"
|
||||
dest: "{{ aur_build_dir }}/{{ item.name }}"
|
||||
update: true
|
||||
loop: '{{ aur_packages }}'
|
||||
loop: "{{ aur_packages }}"
|
||||
|
||||
- name: Change aur package directories owner
|
||||
become: true
|
||||
ansible.builtin.file:
|
||||
path: '{{ aur_build_dir }}/{{ item.name }}'
|
||||
path: "{{ aur_build_dir }}/{{ item.name }}"
|
||||
state: directory
|
||||
owner: '{{ ansible_user_id }}'
|
||||
group: '{{ ansible_user_id }}'
|
||||
owner: "{{ ansible_user_id }}"
|
||||
group: "{{ ansible_user_id }}"
|
||||
recurse: true
|
||||
loop: '{{ aur_packages }}'
|
||||
loop: "{{ aur_packages }}"
|
||||
|
||||
- name: Build & install aur packages
|
||||
ansible.builtin.include_tasks: 'tasks/arch/aur-package.yml'
|
||||
loop: '{{ aur_packages }}'
|
||||
ansible.builtin.include_tasks: "tasks/arch/aur-package.yml"
|
||||
loop: "{{ aur_packages }}"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
---
|
||||
- name: Remove docker mapping files
|
||||
become: true
|
||||
ansible.builtin.file:
|
||||
path: '{{ item }}'
|
||||
path: "{{ item }}"
|
||||
state: absent
|
||||
loop:
|
||||
- /etc/subgid
|
||||
|
|
@ -10,38 +11,38 @@
|
|||
- name: Setup desktop configuration
|
||||
become: true
|
||||
ansible.builtin.file:
|
||||
path: 'files/desktop/docker-daemon.json'
|
||||
dest: '/etc/docker/daemon.json'
|
||||
mode: '0755'
|
||||
path: "files/desktop/docker-daemon.json"
|
||||
dest: "/etc/docker/daemon.json"
|
||||
mode: "0755"
|
||||
when: ansible_hostname == 'desktop'
|
||||
|
||||
- name: Remove user setup desktop configuration
|
||||
ansible.builtin.file:
|
||||
path: '{{ xdg_config_dir }}/docker/daemon.json'
|
||||
path: "{{ xdg_config_dir }}/docker/daemon.json"
|
||||
state: absent
|
||||
when: ansible_hostname == 'desktop'
|
||||
|
||||
- name: Check for .bashrc.override
|
||||
ansible.builtin.stat:
|
||||
path: '{{ ansible_env.HOME }}/.bashrc.override'
|
||||
path: "{{ ansible_env.HOME }}/.bashrc.override"
|
||||
register: bashrc_override
|
||||
|
||||
- name: Create .bashrc.override
|
||||
ansible.builtin.file:
|
||||
path: '{{ ansible_env.HOME }}/.bashrc.override'
|
||||
path: "{{ ansible_env.HOME }}/.bashrc.override"
|
||||
state: touch
|
||||
mode: '0755'
|
||||
mode: "0755"
|
||||
when: not bashrc_override.stat.exists
|
||||
|
||||
- name: Remove rootless DOCKER_HOST variable assignment
|
||||
ansible.builtin.lineinfile:
|
||||
path: '{{ ansible_env.HOME }}/.bashrc.override'
|
||||
regexp: '^export DOCKER_HOST='
|
||||
line: ''
|
||||
path: "{{ ansible_env.HOME }}/.bashrc.override"
|
||||
regexp: "^export DOCKER_HOST="
|
||||
line: ""
|
||||
|
||||
- name: Disable user docker socket
|
||||
ansible.builtin.systemd:
|
||||
name: '{{ item }}'
|
||||
name: "{{ item }}"
|
||||
state: stopped
|
||||
enabled: false
|
||||
scope: user
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
---
|
||||
- name: Install language servers
|
||||
become: true
|
||||
community.general.pacman:
|
||||
name: '{{ item }}'
|
||||
name: "{{ item }}"
|
||||
state: present
|
||||
loop: '{{ language_servers | map(attribute="package") | list }}'
|
||||
|
|
|
|||
|
|
@ -1,15 +1,16 @@
|
|||
---
|
||||
- name: Set NVM install directory
|
||||
ansible.builtin.set_fact:
|
||||
install_dir: '{{ xdg_config_dir }}/nvm'
|
||||
install_dir: "{{ xdg_config_dir }}/nvm"
|
||||
|
||||
- name: Remove manually installed nvm install directory
|
||||
ansible.builtin.file:
|
||||
path: '{{ install_dir }}'
|
||||
path: "{{ install_dir }}"
|
||||
state: absent
|
||||
|
||||
- name: Remove nvm entry from bashrc
|
||||
ansible.builtin.lineinfile:
|
||||
path: '{{ ansible_env.HOME }}/.bashrc.override'
|
||||
path: "{{ ansible_env.HOME }}/.bashrc.override"
|
||||
line: >
|
||||
[ -s "{{ install_dir }}/nvm.sh" ] && \. "{{ install_dir }}/nvm.sh" # This loads nvm
|
||||
state: absent
|
||||
|
|
|
|||
|
|
@ -1,65 +1,66 @@
|
|||
- name: 'check for {{ item.binary }} binary'
|
||||
command: 'which {{ item.binary }}'
|
||||
---
|
||||
- name: "Check for {{ item.binary }} binary"
|
||||
ansible.builtin.command: "which {{ item.binary }}"
|
||||
changed_when: false
|
||||
failed_when: python_installed.rc not in [ 0, 1 ]
|
||||
register: python_installed
|
||||
|
||||
- name: 'check for {{ item.binary }} download'
|
||||
stat:
|
||||
path: '{{ python_build_dir }}/python-{{ item.version }}.tgz'
|
||||
- name: "Check for {{ item.binary }} download"
|
||||
ansible.builtin.stat:
|
||||
path: "{{ python_build_dir }}/python-{{ item.version }}.tgz"
|
||||
register: python_download
|
||||
|
||||
- block:
|
||||
- when: python_installed.rc not in [ 0 ]
|
||||
block:
|
||||
# TODO: verify for checksum
|
||||
- name: 'retrieve python {{ item.version }} source'
|
||||
- name: "Retrieve python {{ item.version }} source"
|
||||
become: true
|
||||
get_url:
|
||||
url: '{{ python_download_url }}/{{ item.version }}/Python-{{ item.version }}.tgz'
|
||||
dest: '{{ python_build_dir }}/python-{{ item.version }}.tgz'
|
||||
owner: '{{ ansible_user_id }}'
|
||||
group: '{{ ansible_user_id }}'
|
||||
ansible.builtin.get_url:
|
||||
url: "{{ python_download_url }}/{{ item.version }}/Python-{{ item.version }}.tgz"
|
||||
dest: "{{ python_build_dir }}/python-{{ item.version }}.tgz"
|
||||
owner: "{{ ansible_user_id }}"
|
||||
group: "{{ ansible_user_id }}"
|
||||
when: not python_download.stat.exists
|
||||
|
||||
- name: 'extract python {{ item.version }} sources'
|
||||
- name: "Extract python {{ item.version }} sources"
|
||||
become: true
|
||||
unarchive:
|
||||
src: '{{ python_build_dir }}/python-{{ item.version }}.tgz'
|
||||
dest: '{{ python_build_dir }}'
|
||||
include: 'Python-{{ item.version }}'
|
||||
ansible.builtin.unarchive:
|
||||
src: "{{ python_build_dir }}/python-{{ item.version }}.tgz"
|
||||
dest: "{{ python_build_dir }}"
|
||||
include: "Python-{{ item.version }}"
|
||||
|
||||
- name: rename source directory
|
||||
- name: Rename source directory
|
||||
become: true
|
||||
ansible.builtin.command: 'mv {{ python_build_dir}}/Python-{{ item.version }} {{ python_build_dir }}/{{ item.path }}'
|
||||
ansible.builtin.command: "mv {{ python_build_dir}}/Python-{{ item.version }} {{ python_build_dir }}/{{ item.path }}"
|
||||
|
||||
- name: set correct permissions
|
||||
- name: Set correct permissions
|
||||
become: true
|
||||
file:
|
||||
path: '{{ python_build_dir }}/{{ item.path }}'
|
||||
ansible.builtin.file:
|
||||
path: "{{ python_build_dir }}/{{ item.path }}"
|
||||
recurse: true
|
||||
owner: '{{ ansible_user_id }}'
|
||||
group: '{{ ansible_user_id }}'
|
||||
owner: "{{ ansible_user_id }}"
|
||||
group: "{{ ansible_user_id }}"
|
||||
state: directory
|
||||
|
||||
- name: configure build
|
||||
ansible.builtin.command: 'sh ./configure --prefix={{ python_install_dir }}/{{ item.path }}'
|
||||
- name: Configure build
|
||||
ansible.builtin.command: "sh ./configure --prefix={{ python_install_dir }}/{{ item.path }}"
|
||||
args:
|
||||
chdir: '{{ python_build_dir }}/{{ item.path }}/'
|
||||
chdir: "{{ python_build_dir }}/{{ item.path }}/"
|
||||
|
||||
- name: make build
|
||||
ansible.builtin.command: 'make'
|
||||
- name: Make build
|
||||
ansible.builtin.command: "make"
|
||||
args:
|
||||
chdir: '{{ python_build_dir }}/{{ item.path }}/'
|
||||
chdir: "{{ python_build_dir }}/{{ item.path }}/"
|
||||
|
||||
- name: install build
|
||||
- name: Install build
|
||||
become: true
|
||||
ansible.builtin.command: 'make install'
|
||||
ansible.builtin.command: "make install"
|
||||
args:
|
||||
chdir: '{{ python_build_dir }}/{{ item.path }}/'
|
||||
chdir: "{{ python_build_dir }}/{{ item.path }}/"
|
||||
|
||||
- name: 'create symlink for python {{ item.version }}'
|
||||
- name: "Create symlink for python {{ item.version }}"
|
||||
become: true
|
||||
file:
|
||||
src: '{{ python_install_dir }}/{{ item.path }}/bin/{{ item.binary }}'
|
||||
dest: '/usr/bin/{{ item.binary }}'
|
||||
ansible.builtin.file:
|
||||
src: "{{ python_install_dir }}/{{ item.path }}/bin/{{ item.binary }}"
|
||||
dest: "/usr/bin/{{ item.binary }}"
|
||||
state: link
|
||||
when: python_installed.rc not in [ 0 ]
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
---
|
||||
- name: Install language servers on debian hosts
|
||||
become: true
|
||||
community.general.npm:
|
||||
name: '{{ item }}'
|
||||
name: "{{ item }}"
|
||||
global: true
|
||||
loop: '{{ language_servers | map(attribute="package") | list }}'
|
||||
|
||||
|
|
@ -9,16 +10,16 @@
|
|||
become: true
|
||||
ansible.builtin.file:
|
||||
state: directory
|
||||
path: '{{ neovim.install_path }}'
|
||||
owner: '{{ ansible_user_id }}'
|
||||
group: '{{ ansible_user_gid }}'
|
||||
mode: '0755'
|
||||
path: "{{ neovim.install_path }}"
|
||||
owner: "{{ ansible_user_id }}"
|
||||
group: "{{ ansible_user_gid }}"
|
||||
mode: "0755"
|
||||
|
||||
- name: Register the current neovim version
|
||||
ansible.builtin.command:
|
||||
argv:
|
||||
- '{{ neovim.install_path }}/bin/nvim'
|
||||
- '--version'
|
||||
- "{{ neovim.install_path }}/bin/nvim"
|
||||
- "--version"
|
||||
register: neovim_stats
|
||||
changed_when: false
|
||||
ignore_errors: true
|
||||
|
|
@ -30,21 +31,21 @@
|
|||
|
||||
- name: Download neovim {{ neovim.version }}
|
||||
ansible.builtin.get_url:
|
||||
url: 'https://github.com/neovim/neovim/releases/download/{{ neovim.version }}/nvim-linux-x86_64.tar.gz'
|
||||
url: "https://github.com/neovim/neovim/releases/download/{{ neovim.version }}/nvim-linux-x86_64.tar.gz"
|
||||
dest: /tmp/nvim-linux64.tar.gz
|
||||
mode: '0755'
|
||||
checksum: '{{ neovim.download_checksum }}'
|
||||
mode: "0755"
|
||||
checksum: "{{ neovim.download_checksum }}"
|
||||
when: neovim_stats.rc > 0 or neovim_installed_version != neovim.version
|
||||
register: neovim_download
|
||||
|
||||
- name: Extract downloaded neovim version
|
||||
ansible.builtin.unarchive:
|
||||
src: /tmp/nvim-linux64.tar.gz
|
||||
dest: '{{ neovim.install_path }}'
|
||||
dest: "{{ neovim.install_path }}"
|
||||
extra_opts:
|
||||
- '--strip-components=1'
|
||||
- '--show-stored-names'
|
||||
- '--overwrite'
|
||||
- "--strip-components=1"
|
||||
- "--show-stored-names"
|
||||
- "--overwrite"
|
||||
when: |
|
||||
neovim_download.state == 'file'
|
||||
and (neovim_installed_version is undefined or neovim_installed_version != neovim.version)
|
||||
|
|
@ -52,6 +53,6 @@
|
|||
- name: Add neovim to PATH
|
||||
become: true
|
||||
ansible.builtin.template:
|
||||
src: 'templates/debian/nvim.profile.j2'
|
||||
dest: '/etc/profile.d/neovim.sh'
|
||||
mode: '0755'
|
||||
src: "templates/debian/nvim.profile.j2"
|
||||
dest: "/etc/profile.d/neovim.sh"
|
||||
mode: "0755"
|
||||
|
|
|
|||
|
|
@ -1,69 +1,70 @@
|
|||
---
|
||||
- name: Clone dotfiles
|
||||
ansible.builtin.git:
|
||||
repo: '{{ dotfiles_repo }}'
|
||||
dest: '{{ ansible_env.HOME }}/dotfiles'
|
||||
repo: "{{ dotfiles_repo }}"
|
||||
dest: "{{ ansible_env.HOME }}/dotfiles"
|
||||
version: master
|
||||
update: true
|
||||
|
||||
- name: Create xdg configuration directories
|
||||
ansible.builtin.file:
|
||||
path: '{{ item }}'
|
||||
path: "{{ item }}"
|
||||
state: directory
|
||||
mode: '0755'
|
||||
mode: "0755"
|
||||
loop:
|
||||
- '{{ xdg_config_dir }}/git'
|
||||
- '{{ xdg_config_dir }}/tmux'
|
||||
- "{{ xdg_config_dir }}/git"
|
||||
- "{{ xdg_config_dir }}/tmux"
|
||||
|
||||
- name: Remove previous dotfiles
|
||||
ansible.builtin.file:
|
||||
path: '{{ item }}'
|
||||
path: "{{ item }}"
|
||||
state: absent
|
||||
loop:
|
||||
- '{{ ansible_env.HOME }}/.tmux.conf'
|
||||
- '{{ ansible_env.HOME }}/.gitconfig'
|
||||
- "{{ ansible_env.HOME }}/.tmux.conf"
|
||||
- "{{ ansible_env.HOME }}/.gitconfig"
|
||||
|
||||
- name: Setup dotfiles
|
||||
ansible.builtin.file:
|
||||
path: '{{ item.dest }}'
|
||||
src: '{{ item.src }}'
|
||||
path: "{{ item.dest }}"
|
||||
src: "{{ item.src }}"
|
||||
state: link
|
||||
force: true
|
||||
loop:
|
||||
- src: '{{ ansible_env.HOME }}/dotfiles/.vimrc'
|
||||
dest: '{{ ansible_env.HOME }}/.vimrc'
|
||||
- src: "{{ ansible_env.HOME }}/dotfiles/.vimrc"
|
||||
dest: "{{ ansible_env.HOME }}/.vimrc"
|
||||
|
||||
- src: '{{ ansible_env.HOME }}/dotfiles/.bashrc'
|
||||
dest: '{{ ansible_env.HOME }}/.bashrc'
|
||||
- src: "{{ ansible_env.HOME }}/dotfiles/.bashrc"
|
||||
dest: "{{ ansible_env.HOME }}/.bashrc"
|
||||
|
||||
- src: '{{ ansible_env.HOME }}/dotfiles/.profile'
|
||||
dest: '{{ ansible_env.HOME }}/.profile'
|
||||
- src: "{{ ansible_env.HOME }}/dotfiles/.profile"
|
||||
dest: "{{ ansible_env.HOME }}/.profile"
|
||||
|
||||
- src: '{{ ansible_env.HOME }}/dotfiles/tmux/tmux.conf'
|
||||
dest: '{{ xdg_config_dir }}/tmux/tmux.conf'
|
||||
- src: "{{ ansible_env.HOME }}/dotfiles/tmux/tmux.conf"
|
||||
dest: "{{ xdg_config_dir }}/tmux/tmux.conf"
|
||||
|
||||
- src: '{{ ansible_env.HOME }}/dotfiles/tmux/light.conf'
|
||||
dest: '{{ xdg_config_dir }}/tmux/light.conf'
|
||||
- src: "{{ ansible_env.HOME }}/dotfiles/tmux/light.conf"
|
||||
dest: "{{ xdg_config_dir }}/tmux/light.conf"
|
||||
|
||||
- src: '{{ ansible_env.HOME }}/dotfiles/tmux/dark.conf'
|
||||
dest: '{{ xdg_config_dir }}/tmux/dark.conf'
|
||||
- src: "{{ ansible_env.HOME }}/dotfiles/tmux/dark.conf"
|
||||
dest: "{{ xdg_config_dir }}/tmux/dark.conf"
|
||||
|
||||
- src: '{{ ansible_env.HOME }}/dotfiles/.gitignore'
|
||||
dest: '{{ xdg_config_dir }}/git/ignore'
|
||||
- src: "{{ ansible_env.HOME }}/dotfiles/.gitignore"
|
||||
dest: "{{ xdg_config_dir }}/git/ignore"
|
||||
|
||||
- name: Copy git configuration
|
||||
ansible.builtin.template:
|
||||
src: 'templates/gitconfig.j2'
|
||||
dest: '{{ xdg_config_dir }}/git/config'
|
||||
mode: '0755'
|
||||
src: "templates/gitconfig.j2"
|
||||
dest: "{{ xdg_config_dir }}/git/config"
|
||||
mode: "0755"
|
||||
|
||||
- name: Create script directory
|
||||
ansible.builtin.file:
|
||||
path: '{{ ansible_env.HOME }}/.local/bin'
|
||||
path: "{{ ansible_env.HOME }}/.local/bin"
|
||||
state: directory
|
||||
mode: '0755'
|
||||
mode: "0755"
|
||||
|
||||
- name: Copy tmux toggle script
|
||||
ansible.builtin.template:
|
||||
src: 'templates/tmux-toggle.j2'
|
||||
dest: '{{ ansible_env.HOME }}/.local/bin/tmux-toggle.sh'
|
||||
mode: '0755'
|
||||
src: "templates/tmux-toggle.j2"
|
||||
dest: "{{ ansible_env.HOME }}/.local/bin/tmux-toggle.sh"
|
||||
mode: "0755"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
---
|
||||
- name: Ensure neovim configuration directories exist
|
||||
ansible.builtin.file:
|
||||
path: "{{ item }}"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue