diff options
author | Romain Porte <microjoe@microjoe.org> | 2017-09-27 21:04:58 +0200 |
---|---|---|
committer | Romain Porte <microjoe@microjoe.org> | 2017-09-27 21:04:58 +0200 |
commit | 7faffba9262d2ea2c6de6c925af4c9a63f49a275 (patch) | |
tree | 3e94d31454a340b02e703deba635bb3e09f35b37 | |
parent | ffc5c412c9f1a07bcb00edd07e0f3c5923ddf4e5 (diff) | |
download | MicroJoe.nginx-staticwebsite-7faffba9262d2ea2c6de6c925af4c9a63f49a275.tar.gz MicroJoe.nginx-staticwebsite-7faffba9262d2ea2c6de6c925af4c9a63f49a275.zip |
Fixed nginx_domain overrides
-rw-r--r-- | defaults/main.yml | 2 | ||||
-rw-r--r-- | tasks/main.yml | 2 | ||||
-rw-r--r-- | vars/main.yml | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/defaults/main.yml b/defaults/main.yml index e5d061a..ce3dd06 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,8 +1,6 @@ --- # defaults file for MicroJoe.staticwebsite -nginx_root: "/var/www/{{ nginx_domain }}/" -nginx_filename: "static-{{ nginx_domain }}" nginx_rewrite_html: false nginx_customize: "" nginx_auth_file: "" diff --git a/tasks/main.yml b/tasks/main.yml index f32b490..cf66cb4 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -20,7 +20,7 @@ owner: "{{ upload_user }}" group: "{{ upload_group }}" -- name: Make sure root directory exists +- name: Make sure root directory {{ nginx_root }} exists file: path: "{{ nginx_root }}" state: directory diff --git a/vars/main.yml b/vars/main.yml index 71c6dd9..7d4fb5f 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,2 +1,5 @@ --- -# vars file for MicroJoe.staticwebsite
\ No newline at end of file +# vars file for MicroJoe.staticwebsite + +nginx_root: "/var/www/{{ nginx_domain }}/" +nginx_filename: "static-{{ nginx_domain }}" |