jetty_base_dir -> jetty_base

README.md

@@ -10,7 +10,7 @@ There are three defaults that can be altered:
 - `jetty_version: 9.4.9.v20180320`
     - the jetty version - currently this is the only version supported
     - the distribution file is pulled from `files`
-- `jetty_base_dir: /opt`
+- `jetty_base: /opt`
     - where to unzip the jetty distribution
 - `jetty_home: /opt/jetty`
     - symlink to become `JETTY_HOME`

defaults/main.yml

@@ -2,7 +2,7 @@
 # defaults file for ansible-role-jetty
 
 jetty_version: 9.4.9.v20180320
-jetty_base_dir: /opt
+jetty_base: /opt
 jetty_home: /opt/jetty
 jetty_user: jetty
 jetty_group: jetty

tasks/main.yml

@@ -31,30 +31,30 @@
     path: "{{ jetty_home | dirname }}"
     state: directory
 
-- name: Make sure jetty_base_dir exists
+- name: Make sure jetty_base exists
   file: 
-    path: "{{ jetty_base_dir }}"
+    path: "{{ jetty_base }}"
     state: directory
 
 - name: Copy Jetty distribution files 
   copy:
     src: "{{ role_path }}/files/jetty-distribution-{{ jetty_version }}.tar.gz"
-    dest: "{{ jetty_base_dir }}"
+    dest: "{{ jetty_base }}"
   tags: ['jetty']
 
 - name: Unzip Jetty distribution files 
   unarchive:
-    src: "{{ jetty_base_dir }}/jetty-distribution-{{ jetty_version }}.tar.gz"
-    dest: "{{ jetty_base_dir }}"
-    creates: "{{ jetty_base_dir }}/jetty-distribution-{{ jetty_version }}"
+    src: "{{ jetty_base }}/jetty-distribution-{{ jetty_version }}.tar.gz"
+    dest: "{{ jetty_base }}"
+    creates: "{{ jetty_base }}/jetty-distribution-{{ jetty_version }}"
     remote_src: true
     owner:  "{{ jetty_user }}"
     group: "{{ jetty_group }}"
   tags: ['jetty']
 
 - name: Create symlink to Jetty distribution
   file:
-    src: "{{ jetty_base_dir }}/jetty-distribution-{{ jetty_version }}"
+    src: "{{ jetty_base }}/jetty-distribution-{{ jetty_version }}"
     dest: "{{ jetty_home }}"
     state: "link"
   tags: ['jetty']