aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGaƫtan <36162164+gaetanfl@users.noreply.github.com>2018-11-14 15:46:44 +0100
committerGitHub <noreply@github.com>2018-11-14 15:46:44 +0100
commitb570ba036adb74095c712705d686f630d41f4ed0 (patch)
treee6c051813cd5af7cf61194f2f1e2ff145daf2f5a
parent729e0bcf8bf2cfb9105af0e91edb0dc8535cc3f0 (diff)
parent8056915b4c26d4c8bd13b31e839dc4ca630cd895 (diff)
downloadansible-clever-b570ba036adb74095c712705d686f630d41f4ed0.tar.gz
ansible-clever-b570ba036adb74095c712705d686f630d41f4ed0.tar.zst
ansible-clever-b570ba036adb74095c712705d686f630d41f4ed0.zip
Merge pull request #17 from gaetanfl/change_clever_app_root_defaultv1.8
change default value for clever_app_root
-rw-r--r--README.md2
-rw-r--r--defaults/main.yml2
2 files changed, 2 insertions, 2 deletions
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
35Variables specific to deployment, default should be fine: 35Variables specific to deployment, default should be fine:
36- `clever_cli_version`: Version of clever cli tools, default to `0.9.3`. 36- `clever_cli_version`: Version of clever cli tools, default to `0.9.3`.
37- `clever_user_path`: Path relative to ansible_user home dir where cli tools and helpers are installed default to `.local/bin`. 37- `clever_user_path`: Path relative to ansible_user home dir where cli tools and helpers are installed default to `.local/bin`.
38- `clever_app_root`: Path of the application to deploy, default to `"{{ playbook_dir }}/.."`, ie ansible directory in the root of the application. 38- `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.
39- `clever_app_confdir`: Path where to store clever cloud data specific to this application, default to `"{{ clever_app_root }}/.clever_cloud"` 39- `clever_app_confdir`: Path where to store clever cloud data specific to this application, default to `"{{ clever_app_root }}/.clever_cloud"`
40- `clever_login_file`: Path to store login information. Default to `"{{ clever_app_confdir }}/login"`. 40- `clever_login_file`: Path to store login information. Default to `"{{ clever_app_confdir }}/login"`.
41 41
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 @@
2# defaults file for clever 2# defaults file for clever
3clever_cli_version: 0.9.3 3clever_cli_version: 0.9.3
4clever_user_path: .local/bin 4clever_user_path: .local/bin
5clever_app_root: "{{ playbook_dir }}/.." 5clever_app_root: "{{ app_root | default(playbook_dir + '/..') }}"
6clever_app_confdir: "{{ clever_app_root }}/.clever_cloud" 6clever_app_confdir: "{{ clever_app_root }}/.clever_cloud"
7clever_login_file: "{{ clever_app_confdir }}/login" 7clever_login_file: "{{ clever_app_confdir }}/login"
8 8