Merge pull request #1326 from oxyc/issue-1324

Issue #1324: Remove geerlingguy.nginx hard dependency from drupalvm.www
geerlingguy · Apr 22, 2017 · 0577da7 · 0577da7
2 parents 9d6ba3f + 177c678
commit 0577da7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/provisioning/roles/drupalvm.www/README.md b/provisioning/roles/drupalvm.www/README.md
@@ -12,7 +12,7 @@ There are a few defaults defined, but you shouldn't really need to worry about t
 
 ## Dependencies
 
-  - geerlingguy.nginx
+  - geerlingguy.nginx if `drupalvm_webserver` is set to `nginx`.
 
 ## Example Playbook
 

diff --git a/provisioning/roles/drupalvm.www/meta/main.yml b/provisioning/roles/drupalvm.www/meta/main.yml
@@ -28,4 +28,4 @@ galaxy_info:
     - vagrant
 
 dependencies:
-  - geerlingguy.nginx
+  - { role: geerlingguy.nginx, when: drupalvm_webserver == 'nginx' }