From: Gaƫtan Duchaussois Date: Wed, 14 Nov 2018 14:28:54 +0000 (+0100) Subject: change default value for clever_app_root X-Git-Tag: v1.8^2 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;ds=sidebyside;h=8056915b4c26d4c8bd13b31e839dc4ca630cd895;hp=729e0bcf8bf2cfb9105af0e91edb0dc8535cc3f0;p=github%2Ffretlink%2Fansible-clever.git change default value for clever_app_root --- diff --git a/README.md b/README.md index ff31653..86153af 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Variables for the application Variables specific to deployment, default should be fine: - `clever_cli_version`: Version of clever cli tools, default to `0.9.3`. - `clever_user_path`: Path relative to ansible_user home dir where cli tools and helpers are installed default to `.local/bin`. -- `clever_app_root`: Path of the application to deploy, default to `"{{ playbook_dir }}/.."`, ie ansible directory in the root of the application. +- `clever_app_root`: Path of the application to deploy, default to `app_root` if defined or `"{{ playbook_dir }}/.."`, ie ansible directory in the root of the application. - `clever_app_confdir`: Path where to store clever cloud data specific to this application, default to `"{{ clever_app_root }}/.clever_cloud"` - `clever_login_file`: Path to store login information. Default to `"{{ clever_app_confdir }}/login"`. diff --git a/defaults/main.yml b/defaults/main.yml index 66149b0..1fbea48 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -2,7 +2,7 @@ # defaults file for clever clever_cli_version: 0.9.3 clever_user_path: .local/bin -clever_app_root: "{{ playbook_dir }}/.." +clever_app_root: "{{ app_root | default(playbook_dir + '/..') }}" clever_app_confdir: "{{ clever_app_root }}/.clever_cloud" clever_login_file: "{{ clever_app_confdir }}/login"