This commit is contained in:
Paul van Noort 2021-04-07 13:26:28 +02:00
parent 5d5b39588d
commit 01c1e0d2a1
7 changed files with 66 additions and 42 deletions

View File

@ -1,3 +1,5 @@
[defaults] [defaults]
nocows = True nocows = True
roles_path = ./roles:/etc/ansible/roles roles_path = ./roles:/etc/ansible/roles
inventory = inventory
become = true

View File

@ -2,7 +2,7 @@
downloads: ~/.ansible-downloads/ downloads: ~/.ansible-downloads/
configure_dotfiles: true configure_dotfiles: true
configure_terminal: true configure_terminal: false
configure_osx: true configure_osx: true
configure_sudoers: false configure_sudoers: false
@ -12,7 +12,7 @@ sudoers_custom_config: ''
# # Allow users in admin group to use sudo with no password. # # Allow users in admin group to use sudo with no password.
# %admin ALL=(ALL) NOPASSWD: ALL # %admin ALL=(ALL) NOPASSWD: ALL
dotfiles_repo: https://github.com/geerlingguy/dotfiles.git dotfiles_repo: https://github.com/dspolleke/dotfiles.git
dotfiles_repo_accept_hostkey: true dotfiles_repo_accept_hostkey: true
dotfiles_repo_local_destination: ~/Development/GitHub/dotfiles dotfiles_repo_local_destination: ~/Development/GitHub/dotfiles
dotfiles_files: dotfiles_files:
@ -83,15 +83,15 @@ composer_packages: []
# - name: drush # - name: drush
# state: present # present/absent, default: present # state: present # present/absent, default: present
# version: "^8.1" # default: N/A # version: "^8.1" # default: N/A
gem_packages: [] gem_packages:
# - name: bundler - name: showoff
# state: present # present/absent/latest, default: present # state: present # present/absent/latest, default: present
# version: "~> 1.15.1" # default: N/A # version: "~> 1.15.1" # default: N/A
npm_packages: [] npm_packages: []
# - name: webpack # - name: webpack
# state: present # present/absent/latest, default: present # state: present # present/absent/latest, default: present
# version: "^2.6" # default: N/A # version: "^2.6" # default: N/A
pip_packages: [] #pip_packages: []
# - name: mkdocs # - name: mkdocs
# state: present # present/absent/latest, default: present # state: present # present/absent/latest, default: present
# version: "0.16.3" # default: N/A # version: "0.16.3" # default: N/A

View File

@ -1,2 +1,3 @@
[all] [all]
127.0.0.1 ansible_connection=local #127.0.0.1 ansible_connection=local
192.168.2.49

View File

@ -36,6 +36,14 @@
- include_tasks: tasks/extra-packages.yml - include_tasks: tasks/extra-packages.yml
tags: ['extra-packages'] tags: ['extra-packages']
- name: Install global Ruby gems.
gem:
name: "{{ item.name | default(item) }}"
state: "{{ item.state | default('present') }}"
version: "{{ item.version | default(omit) }}"
user_install: false
executable: "{{ item.executable | default(omit) }}"
loop: "{{ gem_packages }}"
- name: Run configured post-provision ansible task files. - name: Run configured post-provision ansible task files.
include_tasks: "{{ outer_item }}" include_tasks: "{{ outer_item }}"

View File

@ -3,3 +3,5 @@ roles:
- name: geerlingguy.dotfiles - name: geerlingguy.dotfiles
- name: geerlingguy.homebrew - name: geerlingguy.homebrew
- name: geerlingguy.mas - name: geerlingguy.mas
collections:
- name: community.general

View File

@ -1,34 +1,38 @@
--- ---
- name: Install global Composer packages. - name: Ensure extra packages are installed
block:
- name: Install global Composer packages.
composer: composer:
command: "{{ (item.state | default('present') == 'absent') | ternary('remove', 'require') }}" command: "{{ (item.state | default('present') == 'absent') | ternary('remove', 'require') }}"
arguments: "{{ item.name | default(item) }} {{ item.version | default('@stable') }}" arguments: "{{ item.name | default(item) }} {{ item.version | default('@stable') }}"
# Ansible 2.4 supports `global_command` making `working_dir` optional. # Ansible 2.4 supports `global_command` making `working_dir` optional.
working_dir: "{{ lookup('env', 'COMPOSER_HOME') | default('~/.composer', true) }}" working_dir: "{{ lookup('env', 'COMPOSER_HOME') | default('~/.composer', true) }}"
with_items: "{{ composer_packages }}" loop: "{{ composer_packages }}"
- name: Install global NPM packages. - name: Install global NPM packages.
npm: ansible.builtin.npm:
name: "{{ item.name | default(item) }}" name: "{{ item.name | default(item) }}"
state: "{{ item.state | default('present') }}" state: "{{ item.state | default('present') }}"
version: "{{ item.version | default(omit) }}" version: "{{ item.version | default(omit) }}"
global: true global: true
executable: "{{ item.executable | default(omit) }}" executable: "{{ item.executable | default(omit) }}"
with_items: "{{ npm_packages }}" loop: "{{ npm_packages }}"
- name: Install global Pip packages. - name: Install global Pip packages.
pip: ansible.builtin.pip:
name: "{{ item.name | default(item) }}" name: "{{ item.name | default(item) }}"
state: "{{ item.state | default('present') }}" state: "{{ item.state | default('present') }}"
version: "{{ item.version | default(omit) }}" version: "{{ item.version | default(omit) }}"
executable: "{{ item.executable | default(omit) }}" executable: "{{ pip_executable | default(omit) }}"
with_items: "{{ pip_packages }}" loop: "{{ pip_packages }}"
- name: Install global Ruby gems. - name: Install global Ruby gems.
gem: ansible.builtin.gem:
name: "{{ item.name | default(item) }}" name: "{{ item.name | default(item) }}"
state: "{{ item.state | default('present') }}" state: "{{ item.state | default('present') }}"
version: "{{ item.version | default(omit) }}" version: "{{ item.version | default(omit) }}"
user_install: false user_install: false
executable: "{{ item.executable | default(omit) }}" install_dir: "{{ gem_dir }}"
with_items: "{{ gem_packages }}" executable: "{{ gem_executable | default(omit) }}"
loop: "{{ gem_packages }}"
tags: ['extra-packages']

View File

@ -6,8 +6,15 @@
changed_when: false changed_when: false
check_mode: false check_mode: false
- name: Ensure custom Terminal profile is added. - name: ensure JJG-Term
command: open files/terminal/JJG-Term.terminal block:
- name: transfer the file
copy:
src: files/terminal/JJG-Term.terminal
dest: /tmp/JJG-Term.terminal
- name: Ensure custom Terminal profile is added.
command: open /tmp/JJG-Term.terminal
changed_when: false changed_when: false
when: "'JJG-Term' not in terminal_theme.stdout" when: "'JJG-Term' not in terminal_theme.stdout"