1 files changed, 14 insertions, 4 deletions
diff --git a/aconf/modules/dnsmasq.lua b/aconf/modules/dnsmasq.lua
index 5fd831c..f46e4a0 100644
--- a/aconf/modules/dnsmasq.lua
+++ b/aconf/modules/dnsmasq.lua
@@ -8,7 +8,7 @@ local M = require('aconf.model')
 local filter_conf = '/etc/dnsmasq-filter.conf'
 
 local Address = M.new()
-Address.address = M.net.IPAddress{addr='&'}
+Address.address = M.net.IPAddress{be_mode=M.addr.special.value}
 Address.domain = M.String
 
 local Filter = M.new()
@@ -34,15 +34,25 @@ Filter.redirect_address = M.net.IPAddress{
 Filter.address = M.Model{model=Address, visible=false}
 Filter.whitelist = M.Set{
    type=M.net.DomainName,
-   addr='server/@/\\#/domain/#',
+   addr='server/\\#/domain',
    ui_name='Domain whitelist',
    widget='inline'
 }
 
 local Dnsmasq = M.new()
-Dnsmasq.filter = M.Model{model=Filter, addr='/augeas'..filter_conf}
+Dnsmasq.filter = M.Model{
+   model=Filter,
+   addr='/augeas'..filter_conf,
+   be_mode={
+      server=M.addr.special.value_equals(),
+      ['server/\\#/domain']=M.addr.special.enum_keys
+   }
+}
 Dnsmasq.conf_file = M.Set{
-   type=M.String, addr='/augeas/etc/dnsmasq.conf/conf-file/#', visible=false
+   type=M.String,
+   addr='/augeas/etc/dnsmasq.conf/conf-file',
+   be_mode=M.addr.special.enum_keys,
+   visible=false
 }
 
 M.register('dnsmasq', Dnsmasq)