dan/mac-setup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed it the way GG wants it fixed

Browse Source
This commit is contained in:
dspolleke 2021-04-12 17:43:47 +02:00 committed by Paul van Noort
parent 87dd16f677
commit 5f77296043
2 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main.yml
View File

@ -22,19 +22,22 @@
tags: ['mas'] tags: ['mas']
tasks: tasks:
- include_tasks: tasks/ansible-setup.yml - import_tasks: tasks/ansible-setup.yml
tags: ['setup']
- include_tasks: tasks/sudoers.yml - import_tasks: tasks/sudoers.yml
when: configure_sudoers when: configure_sudoers
tags: ['sudoers']
- include_tasks: tasks/terminal.yml - import_tasks: tasks/terminal.yml
when: configure_terminal when: configure_terminal
tags: ['terminal']
- include_tasks: tasks/osx.yml - import_tasks: tasks/osx.yml
when: configure_osx when: configure_osx
tags: ['osx'] tags: ['osx']
- include_tasks: tasks/extra-packages.yml - import_tasks: tasks/extra-packages.yml
tags: ['extra-packages'] tags: ['extra-packages']
- name: Install global Ruby gems. - name: Install global Ruby gems.
gem: gem:
@ -46,7 +49,8 @@
loop: "{{ gem_packages }}" loop: "{{ gem_packages }}"
- name: Run configured post-provision ansible task files. - name: Run configured post-provision ansible task files.
include_tasks: "{{ outer_item }}" import_tasks: "{{ outer_item }}"
loop_control: loop_control:
loop_var: outer_item loop_var: outer_item
with_fileglob: "{{ post_provision_tasks|default(omit) }}" with_fileglob: "{{ post_provision_tasks|default(omit) }}"
tags: ['post']

22
tasks/extra-packages.yml
View File

@ -1,7 +1,5 @@
--- ---
- name: Ensure extra packages are installed - name: Install global Composer packages.
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') }}"
@ -9,8 +7,8 @@
working_dir: "{{ lookup('env', 'COMPOSER_HOME') | default('~/.composer', true) }}" working_dir: "{{ lookup('env', 'COMPOSER_HOME') | default('~/.composer', true) }}"
loop: "{{ composer_packages }}" loop: "{{ composer_packages }}"
- name: Install global NPM packages. - name: Install global NPM packages.
ansible.builtin.npm: 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) }}"
@ -18,21 +16,19 @@
executable: "{{ item.executable | default(omit) }}" executable: "{{ item.executable | default(omit) }}"
loop: "{{ npm_packages }}" loop: "{{ npm_packages }}"
- name: Install global Pip packages. - name: Install global Pip packages.
ansible.builtin.pip: 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: "{{ pip_executable | default(omit) }}" executable: "{{ item.executable | default(omit) }}"
loop: "{{ pip_packages }}" loop: "{{ pip_packages }}"
- name: Install global Ruby gems. - name: Install global Ruby gems.
ansible.builtin.gem: 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
install_dir: "{{ gem_dir }}" executable: "{{ item.executable | default(omit) }}"
executable: "{{ gem_executable | default(omit) }}"
loop: "{{ gem_packages }}" loop: "{{ gem_packages }}"
tags: ['extra-packages']