Issue geerlingguy#649: Fix ufw service failure when using vagrant-lxc

oxyc · Dec 30, 2016 · 2438177 · 2438177
1 parent 26b2dfe
commit 2438177
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
@@ -12,9 +12,14 @@
     - sudo
     - unzip
 
+- name: Define drupalvm_disable_ufw_firewall.
+  set_fact:
+    drupalvm_disable_ufw_firewall: (ansible_virtualization_type != 'docker') and (ansible_virtualization_type != 'lxc')
+  when: drupalvm_disable_ufw_firewall is undefined
+
 - name: Disable the ufw firewall (since we use a simple iptables firewall).
   service: name=ufw state=stopped
-  when: ansible_distribution == "Ubuntu" and {{ drupalvm_disable_ufw_firewall | default(true) }}
+  when: ansible_distribution == "Ubuntu" and drupalvm_disable_ufw_firewall
 
 - name: Add repository for Apache 2.4 on Ubuntu 12.
   apt_repository: repo='ppa:ondrej/apache2'

diff --git a/tests/config.yml b/tests/config.yml
@@ -1,6 +1,3 @@
 ---
 # Update the composer_home_path for global installs.
 composer_home_path: "/{{ drupalvm_user }}/.composer"
-
-# Don't run the 'disable ufw firewall' task in tests.
-drupalvm_disable_ufw_firewall: false