From 4e0f79fba268ed0c1aa5de77c33351a3b4c6992d Mon Sep 17 00:00:00 2001 From: L3D Date: Mon, 2 Mar 2020 15:09:17 +0100 Subject: [PATCH] ? --- defaults/main.yml | 11 +++++++---- tasks/main.yml | 4 ++++ vars/main.yml | 7 +++++++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 940e2bf..c2f6ec5 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,9 @@ --- -submodules_versioncheck: true +# should we do a version check? (recomended) +submodules_versioncheck: false -ranger_repo: 'https://github.com/ranger/ranger.git' -ranger_branch: 'master' -ranger_download_directory: "{{ x_ansible_download_dir | default('~/.ansible/tmp/downloads/ranger') }}" +# variables for ranger +ranger: + repo: 'https://github.com/ranger/ranger.git' + branch: 'master' + download_directory: "{{ x_ansible_download_dir | default('~/.ansible/tmp/downloads/ranger') }}" diff --git a/tasks/main.yml b/tasks/main.yml index 300fa93..0e0bc00 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,4 +1,8 @@ --- +- name: combine ranger configuration + set_fact: + ranger: "{{ _ranger|combine(ranger, recursive=True) }}" + - include_tasks: versioncheck.yml when: submodules_versioncheck|bool diff --git a/vars/main.yml b/vars/main.yml index 264ec8f..9892adf 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,3 +1,10 @@ --- +# versionscheck playbook_version_number: 1025 # should be over ninethousand playbook_version_path: 'role-ranger_chaos-bodensee_github.com.version' + +# variables for ranger +ranger: + repo: 'https://github.com/ranger/ranger.git' + branch: 'master' + download_directory: "{{ x_ansible_download_dir | default('~/.ansible/tmp/downloads/ranger') }}"