jannik
/
ansible-role-common
1
1
Fork 0
Code Issues 2 Releases Activity

[TIDY] yaml auto-format

This commit is contained in:
Jannik Beyerstedt 2019-11-12 21:42:58 +01:00
parent 5d919b4443
commit 79910f93cf
17 changed files with 65 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
meta/main.yml
View File

@ -7,17 +7,19 @@ galaxy_info:
min_ansible_version: 2.4 min_ansible_version: 2.4
platforms: platforms:
- name: Debian - name: Debian
versions: versions:
- all - all
- name: Darwin - name: Darwin
versions: versions:
- all - all
galaxy_tags: [] galaxy_tags:
[]
# List tags for your role here, one per line. # List tags for your role here, one per line.
# Be sure to remove the '[]' above, if you add tags to this list. # Be sure to remove the '[]' above, if you add tags to this list.
dependencies: [] dependencies:
[]
# List your role dependencies here, one per line. # List your role dependencies here, one per line.
# Be sure to remove the '[]' above, if you add tags to this list. # Be sure to remove the '[]' above, if you add tags to this list.

10
tasks/essentials-Darwin.yml
View File

@ -7,8 +7,8 @@
state: present state: present
vars: vars:
packages: packages:
- git - git
- curl - curl
- zsh - zsh
- vim - vim
- tmux - tmux

12
tasks/essentials-Debian.yml
View File

@ -8,9 +8,9 @@
state: present state: present
vars: vars:
packages: packages:
- git - git
- curl - curl
- wget - wget
- zsh - zsh
- vim - vim
- tmux - tmux

2
tasks/main.yml
View File

@ -12,7 +12,6 @@
include_tasks: update.yml include_tasks: update.yml
when: common_settingsonly == false when: common_settingsonly == false
# if role has not changed, this will not be needed when just installing updates # if role has not changed, this will not be needed when just installing updates
- name: Install essential tools - name: Install essential tools
include_tasks: essentials.yml include_tasks: essentials.yml
@ -23,7 +22,6 @@
include_tasks: tools.yml include_tasks: tools.yml
when: common_settingsonly == false when: common_settingsonly == false
# this will just run once, because of a lock-file # this will just run once, because of a lock-file
- name: Basics - Setup user shell - name: Basics - Setup user shell
include_tasks: usersetup.yml include_tasks: usersetup.yml

2
tasks/tools-Darwin.yml
View File

@ -8,4 +8,4 @@
update_homebrew: yes update_homebrew: yes
vars: vars:
packages: packages:
- rsync - rsync

8
tasks/tools-Debian.yml
View File

@ -9,7 +9,7 @@
state: present state: present
vars: vars:
packages: packages:
- rsync - rsync
- dnsutils - dnsutils
- htop - htop
- unzip - unzip

27
tasks/usersettings.yml
View File

@ -10,8 +10,7 @@
git: git:
repo: https://github.com/junegunn/fzf.git repo: https://github.com/junegunn/fzf.git
dest: .fzf dest: .fzf
register: register: fzf_git
fzf_git
- name: (Re-)Install fzf - name: (Re-)Install fzf
shell: ".fzf/install --key-bindings --no-completion --no-update-rc" shell: ".fzf/install --key-bindings --no-completion --no-update-rc"
when: when:
@ -22,18 +21,18 @@
src: "{{ item.src }}" src: "{{ item.src }}"
dest: "{{ item.dest }}" dest: "{{ item.dest }}"
with_items: with_items:
- { src: '{{ role_path }}/files/dotfiles/_gitignore_global', dest: '.gitignore_global' } - { src: "{{ role_path }}/files/dotfiles/_gitignore_global", dest: ".gitignore_global" }
- { src: '{{ role_path }}/files/dotfiles/_tmux.conf', dest: '.tmux.conf' } - { src: "{{ role_path }}/files/dotfiles/_tmux.conf", dest: ".tmux.conf" }
- { src: '{{ role_path }}/files/dotfiles/_vimrc', dest: '.vimrc' } - { src: "{{ role_path }}/files/dotfiles/_vimrc", dest: ".vimrc" }
- { src: '{{ role_path }}/files/dotfiles/_zshrc', dest: '.zshrc' } - { src: "{{ role_path }}/files/dotfiles/_zshrc", dest: ".zshrc" }
- { src: '{{ role_path }}/files/dotfiles/_oh-my-zsh/custom/themes/agnoster.zsh-theme', dest: '.oh-my-zsh/custom/themes/agnoster.zsh-theme' } - { src: "{{ role_path }}/files/dotfiles/_oh-my-zsh/custom/themes/agnoster.zsh-theme", dest: ".oh-my-zsh/custom/themes/agnoster.zsh-theme" }
- { src: '{{ role_path }}/files/dotfiles/_oh-my-zsh/custom/themes/jtbx.zsh-theme', dest: '.oh-my-zsh/custom/themes/jtbx.zsh-theme' } - { src: "{{ role_path }}/files/dotfiles/_oh-my-zsh/custom/themes/jtbx.zsh-theme", dest: ".oh-my-zsh/custom/themes/jtbx.zsh-theme" }
- name: usersettings - Set global gitconfig - name: usersettings - Set global gitconfig
copy: copy:
src: "{{ item.src }}" src: "{{ item.src }}"
dest: "{{ item.dest }}" dest: "{{ item.dest }}"
with_items: with_items:
- { src: '{{ role_path }}/files/dotfiles/_gitconfig', dest: '.gitconfig' } - { src: "{{ role_path }}/files/dotfiles/_gitconfig", dest: ".gitconfig" }
when: usersetup_gitconfig == true when: usersetup_gitconfig == true
- name: usersettings - Create .vim directory - name: usersettings - Create .vim directory
@ -51,8 +50,8 @@
repo: "{{ item.repo }}" repo: "{{ item.repo }}"
dest: "{{ item.dest }}" dest: "{{ item.dest }}"
with_items: with_items:
- { repo: 'https://github.com/itchyny/lightline.vim', dest: '.vim/bundle/lightline' } - { repo: "https://github.com/itchyny/lightline.vim", dest: ".vim/bundle/lightline" }
- { repo: 'https://github.com/w0rp/ale', dest: '.vim/bundle/ale' } - { repo: "https://github.com/w0rp/ale", dest: ".vim/bundle/ale" }
- { repo: 'https://github.com/airblade/vim-gitgutter', dest: '.vim/bundle/vim-gitgutter' } - { repo: "https://github.com/airblade/vim-gitgutter", dest: ".vim/bundle/vim-gitgutter" }
- { repo: 'https://github.com/sheerun/vim-polyglot', dest: '.vim/bundle/vim-polyglot' } - { repo: "https://github.com/sheerun/vim-polyglot", dest: ".vim/bundle/vim-polyglot" }
- { repo: 'https://github.com/tpope/vim-commentary', dest: '.vim/bundle/vim-commentary' } - { repo: "https://github.com/tpope/vim-commentary", dest: ".vim/bundle/vim-commentary" }

3
tasks/usersetup-Darwin.yml
View File

@ -5,8 +5,7 @@
- name: usersetup - Check, if usersetup already ran - name: usersetup - Check, if usersetup already ran
stat: stat:
path: .ansbl-common-usersetup path: .ansbl-common-usersetup
register: register: common_usersetup
common_usersetup
- name: usersetup - Change login shell to zsh for current user - name: usersetup - Change login shell to zsh for current user
become: yes become: yes

3
tasks/usersetup-Debian.yml
View File

@ -5,8 +5,7 @@
- name: usersetup - Check, if usersetup already ran - name: usersetup - Check, if usersetup already ran
stat: stat:
path: .ansbl-common-usersetup path: .ansbl-common-usersetup
register: register: common_usersetup
common_usersetup
- name: usersetup - Change login shell to zsh for current user - name: usersetup - Change login shell to zsh for current user
become: yes become: yes

10
tasks/usertools-Archlinux.yml
View File

@ -7,8 +7,8 @@
state: present state: present
vars: vars:
packages: packages:
- nmap - nmap
- rsync - rsync
- icdiff - icdiff
- iftop - iftop
- ansible - ansible

10
tasks/usertools-Darwin.yml
View File

@ -7,8 +7,8 @@
state: present state: present
vars: vars:
packages: packages:
- nmap - nmap
- rsync - rsync
- icdiff - icdiff
- iftop - iftop
- ansible - ansible

10
tasks/usertools-Debian.yml
View File

@ -8,8 +8,8 @@
state: present state: present
vars: vars:
packages: packages:
- nmap - nmap
- rsync - rsync
- icdiff - icdiff
- iftop - iftop
- ansible - ansible

9
tasks/vscode-Archlinux.yml
View File

@ -10,14 +10,13 @@
state: present state: present
vars: vars:
packages: packages:
- visual-studio-code - visual-studio-code
- name: vscode - Basics - Copy global settings - name: vscode - Basics - Copy global settings
copy: copy:
src: "{{ role_path }}/files/vscode-settings.json" src: "{{ role_path }}/files/vscode-settings.json"
dest: ~/.config/Code/User/settings.json dest: ~/.config/Code/User/settings.json
when: user_vscode == true when: user_vscode == true
# VS Code - C/C++ Development Tools # VS Code - C/C++ Development Tools
- name: vscode - C/C++ - name: vscode - C/C++
block: block:
@ -27,14 +26,12 @@
state: present state: present
vars: vars:
packages: packages:
- clang-format - clang-format
when: user_lang_cpp == true when: user_lang_cpp == true
# VS Code - Python Development Tools # VS Code - Python Development Tools
# all done in vscode.yml # all done in vscode.yml
# VS Code - Golang Development Tools # VS Code - Golang Development Tools
- name: vscode - Golang - name: vscode - Golang
block: block:
@ -44,5 +41,5 @@
state: present state: present
vars: vars:
packages: packages:
- go - go
when: user_lang_golang == true when: user_lang_golang == true

9
tasks/vscode-Darwin.yml
View File

@ -10,14 +10,13 @@
state: present state: present
vars: vars:
packages: packages:
- visual-studio-code - visual-studio-code
- name: vscode - Basics - Copy global settings - name: vscode - Basics - Copy global settings
copy: copy:
src: "{{ role_path }}/files/vscode-settings.json" src: "{{ role_path }}/files/vscode-settings.json"
dest: ~/Library/Application Support/Code/User/settings.json dest: ~/Library/Application Support/Code/User/settings.json
when: user_vscode == true when: user_vscode == true
# VS Code - C/C++ Development Tools # VS Code - C/C++ Development Tools
- name: vscode - C/C++ - name: vscode - C/C++
block: block:
@ -27,14 +26,12 @@
state: present state: present
vars: vars:
packages: packages:
- clang-format - clang-format
when: user_lang_cpp == true when: user_lang_cpp == true
# VS Code - Python Development Tools # VS Code - Python Development Tools
# all done in vscode.yml # all done in vscode.yml
# VS Code - Golang Development Tools # VS Code - Golang Development Tools
- name: vscode - Golang - name: vscode - Golang
block: block:
@ -44,5 +41,5 @@
state: present state: present
vars: vars:
packages: packages:
- go - go
when: user_lang_golang == true when: user_lang_golang == true

9
tasks/vscode-Debian.yml
View File

@ -11,14 +11,13 @@
state: present state: present
vars: vars:
packages: packages:
- visual-studio-code - visual-studio-code
- name: vscode - Basics - Copy global settings - name: vscode - Basics - Copy global settings
copy: copy:
src: "{{ role_path }}/files/vscode-settings.json" src: "{{ role_path }}/files/vscode-settings.json"
dest: ~/.config/Code/User/settings.json dest: ~/.config/Code/User/settings.json
when: user_vscode == true when: user_vscode == true
# VS Code - C/C++ Development Tools # VS Code - C/C++ Development Tools
- name: vscode - C/C++ - name: vscode - C/C++
block: block:
@ -29,14 +28,12 @@
state: present state: present
vars: vars:
packages: packages:
- clang-format - clang-format
when: user_lang_cpp == true when: user_lang_cpp == true
# VS Code - Python Development Tools # VS Code - Python Development Tools
# all done in vscode.yml # all done in vscode.yml
# VS Code - Golang Development Tools # VS Code - Golang Development Tools
- name: vscode - Golang - name: vscode - Golang
block: block:
@ -47,5 +44,5 @@
state: present state: present
vars: vars:
packages: packages:
- golang - golang
when: user_lang_golang == true when: user_lang_golang == true

4
tasks/vscode.yml
View File

@ -12,7 +12,6 @@
# - user_lang_golang: Boolean for Golang # - user_lang_golang: Boolean for Golang
# - user_lang_golang_gopath: Go workspace directory # - user_lang_golang_gopath: Go workspace directory
- name: vscode - Install and configure VS Code - name: vscode - Install and configure VS Code
include_tasks: "{{ item }}" include_tasks: "{{ item }}"
with_first_found: with_first_found:
@ -34,7 +33,6 @@
# code --install-extension ban.spellright # code --install-extension ban.spellright
when: user_vscode == true when: user_vscode == true
# VS Code - C/C++ Development Tools # VS Code - C/C++ Development Tools
- name: vscode - C/C++ - name: vscode - C/C++
block: block:
@ -44,7 +42,6 @@
code --install-extension ms-vscode.cpptools code --install-extension ms-vscode.cpptools
when: user_vscode == true and user_lang_cpp == true when: user_vscode == true and user_lang_cpp == true
# VS Code - Python Development Tools # VS Code - Python Development Tools
- name: vscode - Python - Install python dev packages - name: vscode - Python - Install python dev packages
pip: pip:
@ -61,7 +58,6 @@
code --install-extension ms-python.python code --install-extension ms-python.python
when: user_vscode == true and user_lang_python == true when: user_vscode == true and user_lang_python == true
# VC Code - Golang Development Tools # VC Code - Golang Development Tools
# https://golang.org/doc/install # https://golang.org/doc/install
- name: vscode - Golang - Setup Environment - name: vscode - Golang - Setup Environment

2
vars/main.yml
View File

@ -1,2 +0,0 @@
---
# vars file for common