Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/roles/debian_base/tasks/50-crowdsec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

- name: Add crowdsec apt repository
ansible.builtin.apt_repository:
repo: deb https://packagecloud.io/crowdsec/crowdsec/{{ ansible_distribution | lower }}/ {{ ansible_distribution_release }} main
repo: deb https://packagecloud.io/crowdsec/crowdsec/{{ ansible_facts["distribution"] | lower }}/ {{ ansible_facts["distribution_release"] }} main
state: present
filename: crowdsec
update_cache: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

- name: Add Docker Repository (on Debian)
ansible.builtin.apt_repository:
repo: deb https://download.docker.com/linux/debian {{ ansible_distribution_release }} stable
repo: deb https://download.docker.com/linux/debian {{ ansible_facts["distribution_release"] }} stable
state: present

- name: Update apt and install Docker packages
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

- name: Add Docker Repository (on Ubuntu)
ansible.builtin.apt_repository:
repo: deb https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable
repo: deb https://download.docker.com/linux/ubuntu {{ ansible_facts["distribution_release"] }} stable
state: present

- name: Update apt and install Docker packages
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/debian_docker_host/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
ansible.builtin.include_tasks: "{{ item }}"
with_first_found:
- files:
- "10-docker-{{ ansible_distribution }}.yaml"
- "10-docker-{{ ansible_facts['distribution'] }}.yaml"

- name: Configure Docker
ansible.builtin.import_tasks: 20-docker-config.yaml
2 changes: 1 addition & 1 deletion ansible/roles/debian_tools/tasks/20-homebrew.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
name: "{{ debian_tools_brew_cask_packages }}"
state: latest
when:
- ansible_system == "Darwin"
- ansible_facts["system"] == "Darwin"
- debian_tools_brew_cask_packages is defined
- debian_tools_brew_cask_packages | type_debug == 'list'
- debian_tools_brew_cask_packages | length > 0
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/mac_base/tasks/10-homebrew.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
ansible.builtin.stat:
path: /home/linuxbrew/.linuxbrew/bin/brew
register: mac_base_homebrew_check
when: ansible_system == "Linux"
when: ansible_facts["system"] == "Linux"

- name: Check if Homebrew is installed
ansible.builtin.stat:
path: /opt/homebrew/bin/brew
register: mac_base_homebrew_check
when: ansible_system == "Darwin"
when: ansible_facts["system"] == "Darwin"

- name: Install Homebrew
ansible.builtin.shell: /bin/bash -c "NONINTERACTIVE=true $(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
Expand Down
Loading