Merge pull request #1745 from jvonau/patch-1

Update computed_services.yml [dnsmasq should/generally run, by default]

roles/network/tasks/computed_services.yml

@@ -45,8 +45,8 @@
   set_fact:
     named_enabled: False
     dhcpd_enabled: False
-    dnsmasq_enabled: False
-    dhcp_service2: "dnsmasq disabled"
+    dnsmasq_enabled: True
+    dhcp_service2: "dnsmasq"
   when: dnsmasq_install and iiab_network_mode == "Appliance"
 
 - name: Add 'network' variable values (from computed_services.yml) to {{ iiab_ini_file }}

roles/network/templates/network/dhcpcd.conf.j2

@@ -61,5 +61,5 @@ static domain_name_servers=127.0.0.1
 interface {{ iiab_wan_iface }}
 static ip_address={{ wan_ip }}/24
 static routers={{ wan_gateway }}
-domain_name_servers= {{ wan_nameserver }}
+static domain_name_servers={{ wan_nameserver }}
 {% endif %}