Remove custom nginx vhost task as geerlingguy.nginx supports custom templates

Author: oxyc

README.md

@@ -91,7 +91,7 @@ Note: *If there are any errors during the course of running `vagrant up`, and it
 ### 3 - Configure your host machine to access the VM.
 
   1. [Edit your hosts file](http://www.rackspace.com/knowledge_center/article/how-do-i-modify-my-hosts-file), adding the line `192.168.88.88  drupalvm.dev` so you can connect to the VM.
-    - You can have Vagrant automatically configure your hosts file if you install the `hostsupdater` plugin (`vagrant plugin install vagrant-hostsupdater`). All hosts defined in `apache_vhosts` or `nginx_hosts` will be automatically managed. `vagrant-hostmanager` is also supported.
+    - You can have Vagrant automatically configure your hosts file if you install the `hostsupdater` plugin (`vagrant plugin install vagrant-hostsupdater`). All hosts defined in `apache_vhosts` or `nginx_vhosts` will be automatically managed. `vagrant-hostmanager` is also supported.
     - The `auto_network` plugin (`vagrant plugin install vagrant-auto_network`) can help with IP address management if you set `vagrant_ip` to `0.0.0.0` inside `config.yml`.
   2. Open your browser and access [http://drupalvm.dev/](http://drupalvm.dev/). The default login for the admin account is `admin` for both the username and password.
 

docs/configurations/webservers-nginx.md

@@ -1,6 +1,6 @@
 To use Nginx instead of Apache, change the `drupalvm_webserver` variable inside your customized `config.yml`, from `apache` to `nginx`.
 
-Because Nginx server directives behave a little differently than Apache's VirtualHosts, Drupal VM includes a custom Drupal-optimized Nginx server block configuration, and you can control all the servers ('virtual hosts') Nginx will run using the `nginx_hosts` configuration. A few simple examples are shown in `default.config.yml`, but you have some extra flexibility if you need it. See the `nginx-vhost.conf.j2` template for more information.
+Because Nginx server directives behave a little differently than Apache's VirtualHosts, Drupal VM includes a custom Drupal-optimized Nginx server block configuration, and you can control all the servers ('virtual hosts') Nginx will run using the `nginx_vhosts` configuration. A few simple examples are shown in `default.config.yml`, but you have some extra flexibility if you need it. See the `nginx-vhost.conf.j2` template for more information.
 
 Also, see the examples included in the [`geerlingguy.nginx` Ansible role's README](https://github.com/geerlingguy/ansible-role-nginx#readme) for more info, as well as many other variables you can override to configure Nginx exactly how you like it.
 
@@ -10,7 +10,7 @@ _Note: if you're using php-fpm, you may want to reflect your use of nginx by set
 
 To enable SSL support for you virtual hosts you first need a certificate file. See the same section under the [Apache documentation](webservers-apache.md#enable-ssl-support-with-apache) for how to generate a self-signed certficiate.
 
-Modify your nginx host configuration by adding the following `extra_parameters` to the first entry in `nginx_hosts`:
+Modify your nginx host configuration by adding the following `extra_parameters` to the first entry in `nginx_vhosts`:
 
 ```yaml
 - server_name: "{{ drupal_domain }} www.{{ drupal_domain }}"
@@ -48,7 +48,7 @@ If you can't customize via variables because an option isn't exposed, you can ov
 nginx_vhost_template: "{{ config_dir }}/templates/nginx-vhost.conf.j2"
 ```
 
-You can either copy and modify the provided `nginx-vhost.conf.j2` template, or extend it and override the specific template block you need to change.
+You can either copy and modify the provided `nginx-vhost.conf.j2` template, or extend it and use [template inheritace](http://jinja.pocoo.org/docs/2.9/templates/#template-inheritance) to override the specific template block you need to change.
 
 _If you extend Drupal VM's provided base template, the path referenced should to be relative to playbook.yml._
 

docs/deployment/multisite.md

@@ -1,4 +1,4 @@
-For multisite installations, make the changes outlined in the [Local Drupal codebase](local-codebase.md) guide, but, using the `apache_vhosts` variable (or `nginx_hosts` if using Nginx), configure as many domains pointing to the same docroot as you need:
+For multisite installations, make the changes outlined in the [Local Drupal codebase](local-codebase.md) guide, but, using the `apache_vhosts` variable (or `nginx_vhosts` if using Nginx), configure as many domains pointing to the same docroot as you need:
 
 ```yaml
 drupal_core_path: "/var/www/my-drupal-site"

examples/prod/prod.config.yml

@@ -3,7 +3,7 @@
 drupal_domain: "drupalvm.dev"
 vagrant_hostname: "{{ drupal_domain }}"
 
-# Add only the `apache_vhosts` or `nginx_hosts` you need. If installing a
+# Add only the `apache_vhosts` or `nginx_vhosts` you need. If installing a
 # single Drupal site, the variable should look like this (Apache):
 apache_vhosts:
   - servername: "{{ drupal_domain }}"

provisioning/roles/drupalvm.www/tasks/main.yml

@@ -85,15 +85,3 @@
     mode: 0755
     recurse: true
   when: drupalvm_webserver == 'apache'
-
-- name: Copy Nginx vhosts into place.
-  template:
-    src: "{{ nginx_vhost_template }}"
-    dest: "{{ nginx_vhost_path }}/{{ item.server_name.split(' ')[0] }}.conf"
-    force: yes
-    owner: root
-    group: root
-    mode: 0644
-  with_items: "{{ nginx_hosts }}"
-  notify: restart nginx
-  when: drupalvm_webserver == 'nginx'

provisioning/templates/dashboard.html.j2

@@ -33,7 +33,7 @@
           {%- endif -%}
         {%- endfor -%}
       {%- elif drupalvm_webserver == 'nginx' -%}
-        {%- for host in nginx_hosts -%}
+        {%- for host in nginx_vhosts -%}
           {%- if host.root == path -%}
             {{ host.server_name }}
           {%- endif -%}
@@ -73,7 +73,7 @@
 
           {%- endfor -%}
         {%- elif drupalvm_webserver == 'nginx' -%}
-          {%- for host in nginx_hosts -%}
+          {%- for host in nginx_vhosts -%}
 
             {% for server_name in host.server_name.split(' ') -%}
               {{ printHostsEntry(vagrant_ip, server_name) }}
@@ -107,7 +107,7 @@
               {%- endif -%}
             {%- endfor -%}
           {%- elif drupalvm_webserver == 'nginx' -%}
-            {%- for host in nginx_hosts -%}
+            {%- for host in nginx_vhosts -%}
               {%- if host.root is defined -%}
                 {%- for hostname in host.server_name.split() -%}
                   {{ printSite(hostname, host.root) }}

provisioning/templates/drupalvm-local.aliases.drushrc.php.j2

@@ -27,7 +27,7 @@ $aliases['{{ host }}'] = array(
     {%- endif -%}
   {%- endfor -%}
 {%- elif drupalvm_webserver == 'nginx' -%}
-  {%- for host in nginx_hosts -%}
+  {%- for host in nginx_vhosts -%}
     {%- for server_name in host.server_name.split() -%}
       {{ alias(server_name, host.root) }}
     {%- endfor -%}

provisioning/templates/drupalvm.aliases.drushrc.php.j2

@@ -33,7 +33,7 @@ $aliases['{{ host }}'] = array(
     {%- endif -%}
   {%- endfor -%}
 {%- elif drupalvm_webserver == 'nginx' -%}
-  {%- for host in nginx_hosts -%}
+  {%- for host in nginx_vhosts -%}
     {%- for server_name in host.server_name.split() -%}
       {{ alias(server_name, host.root) }}
     {%- endfor -%}