Renaming variables *vhost* -> *site*

Vhost is an Apache configuration, not Nginx.
Manages backward compatibility.

tasks/main.yml

@@ -25,6 +25,5 @@
 - name: INCLUDE | SSL configuration
   include: ssl.yml
 
-- name: INCLUDE | Vhosts configuration
-  include: vhost.yml
-
+- name: INCLUDE | Sites configuration
+  include: site.yml

tasks/prepare.yml

@@ -1,5 +1,20 @@
 ---
 
+- name: SET_FACT | Backward compatibility (nginx_vhosts)
+  set_fact:
+    nginx_sites: "{{ nginx_vhosts }}"
+  when: nginx_vhosts is defined
+
+- name: SET_FACT | Backward compatibility (nginx_default_vhost_ssl)
+  set_fact:
+    nginx_default_site_ssl: "{{ nginx_default_vhost_ssl }}"
+  when: nginx_default_vhost_ssl is defined
+
+- name: SET_FACT | Backward compatibility (nginx_default_vhost)
+  set_fact:
+    nginx_default_site: "{{ nginx_default_vhost }}"
+  when: nginx_default_vhost is defined
+
 - name: SHELL | Get Nginx version
   shell: nginx -v 2>&1 | sed -r 's#.*/##;' | cut -d ' ' -f 1
   args:

tasks/site.yml

@@ -1,82 +1,82 @@
 ---
 
 - name: FAIL | Check filenames
-  fail: msg="Forbidden keyword default on vhost {{ item.name if item.name is string else item.name[0] }}"
+  fail: msg="Forbidden keyword default on site {{ item.name if item.name is string else item.name[0] }}"
   when: item.filename is defined and item.filename == 'default'
-  with_items: "{{ nginx_vhosts }}"
+  with_items: "{{ nginx_sites }}"
 
 - name: FAIL | Check HTTPS redir and proto
   fail: msg="You can't have HTTP proto and HTTPS redirection at the same time"
   when: >
     ((item.proto is defined and 'http' in item.proto) or (item.proto is not defined)) and
     (item.redirect_http is defined and item.redirect_http)
-  with_items: "{{ nginx_vhosts }}"
+  with_items: "{{ nginx_sites }}"
 
 - name: FILE | Create root directory
   file: >
     path={{ nginx_root }}
     state=directory
 
-- name: FILE | Create root public folders (foreach nginx_vhosts)
+- name: FILE | Create root public folders (foreach nginx_sites)
   file: >
     path={{ nginx_root }}/{{ item.filename | default(item.name if item.name is string else item.name[0]) }}/public
     state=directory
     owner={{ item.owner | default(nginx_user) }}
     group={{ item.group | default(nginx_user) }}
     mode={{ item.mode | default('0755') }}
-  with_items: "{{ nginx_vhosts }}"
+  with_items: "{{ nginx_sites }}"
   when: >
     item.root is not defined and
     (item.template is defined and item.template not in nginx_templates_no_dir) and
     (item.state is not defined or not item.state != 'absent') and
     item.redirect_to is not defined
 
-- name: TEMPLATE | Create vhosts
+- name: TEMPLATE | Create sites
   template: >
     src=etc/nginx/sites-available/{{ item.template if item.redirect_to is not defined else '_redirect' }}.j2
     dest={{ nginx_etc_dir }}/sites-available/{{ item.filename | default(item.name if item.name is string else item.name[0]) }}
-  with_items: "{{ nginx_vhosts }}"
+  with_items: "{{ nginx_sites }}"
   notify: ['reload nginx', 'restart nginx freebsd']
   when: item.state is not defined or item.state != 'absent'
 
-- name: FILE | Delete vhosts
+- name: FILE | Delete sites
   file: path={{ nginx_etc_dir }}/{{ item.1 }}/{{ item.0.filename | default(item.0.name if item.0.name is string else item.0.name[0]) }} state=absent
   with_nested:
-    - "{{ nginx_vhosts }}"
+    - "{{ nginx_sites }}"
     - ['sites-available', 'sites-enabled']
   notify: ['reload nginx', 'restart nginx freebsd']
   when: item.state is defined and item.state == 'absent'
 
-- name: FILE | Enable vhosts
+- name: FILE | Enable sites
   file: >
     src={{ nginx_etc_dir }}/sites-available/{{ item.filename | default(item.name if item.name is string else item.name[0]) }}
     dest={{ nginx_etc_dir }}/sites-enabled/{{ item.filename | default(item.name if item.name is string else item.name[0]) }}
     state=link
-  with_items: "{{ nginx_vhosts }}"
+  with_items: "{{ nginx_sites }}"
   notify: ['reload nginx', 'restart nginx freebsd']
   when: >
     item.state is not defined or item.state == 'present'
 
-- name: FILE | Disable vhosts
+- name: FILE | Disable sites
   file: path={{ nginx_etc_dir}}/sites-enabled/{{ item.filename | default(item.name if item.name is string else item.name[0]) }} state=absent
-  with_items: "{{ nginx_vhosts }}"
+  with_items: "{{ nginx_sites }}"
   notify: ['reload nginx', 'restart nginx freebsd']
   when: item.state is defined and item.state == 'disabled'
 
-- name: FILE | Delete default vhost when explicitely defined
+- name: FILE | Delete default site when explicitely defined
   file: >
     path={{ nginx_etc_dir }}/sites-enabled/default
     state=absent
   notify: ['reload nginx', 'restart nginx freebsd']
-  when: nginx_default_vhost is not none
+  when: nginx_default_site is not none
 
-- name: FILE | Auto set default vhost
+- name: FILE | Auto set default site
   file: >
     src={{ nginx_etc_dir }}/sites-available/default
     dest={{ nginx_etc_dir }}/sites-enabled/default
     state=link
   notify: ['reload nginx', 'restart nginx freebsd']
-  when: nginx_default_vhost is none
+  when: nginx_default_site is none
 
 - name: TEMPLATE | Deploy facts
   template: