summaryrefslogtreecommitdiffstats
path: root/aconf/modules
diff options
context:
space:
mode:
Diffstat (limited to 'aconf/modules')
-rw-r--r--aconf/modules/dns-zone.lua2
-rw-r--r--aconf/modules/dnsmasq.lua9
-rw-r--r--aconf/modules/network.lua14
-rw-r--r--aconf/modules/openssh.lua4
4 files changed, 13 insertions, 16 deletions
diff --git a/aconf/modules/dns-zone.lua b/aconf/modules/dns-zone.lua
index f0bd3e1..6527d62 100644
--- a/aconf/modules/dns-zone.lua
+++ b/aconf/modules/dns-zone.lua
@@ -69,7 +69,7 @@ M.register(
type=M.Collection{
type=M.List{
type=M.Model{model=Record, addr='*/*'},
- be_mode=M.addr.special.enum_keys,
+ be_mode='enumerate',
ui_member='Record'
},
ui_member=''
diff --git a/aconf/modules/dnsmasq.lua b/aconf/modules/dnsmasq.lua
index f46e4a0..770a1d1 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{be_mode=M.addr.special.value}
+Address.address = M.net.IPAddress{be_mode='parent-value'}
Address.domain = M.String
local Filter = M.new()
@@ -43,15 +43,12 @@ local Dnsmasq = M.new()
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
- }
+ be_mode={server='value', ['server/\\#/domain']='enumerate'}
}
Dnsmasq.conf_file = M.Set{
type=M.String,
addr='/augeas/etc/dnsmasq.conf/conf-file',
- be_mode=M.addr.special.enum_keys,
+ be_mode='enumerate',
visible=false
}
diff --git a/aconf/modules/network.lua b/aconf/modules/network.lua
index 05d8576..51d7589 100644
--- a/aconf/modules/network.lua
+++ b/aconf/modules/network.lua
@@ -13,7 +13,7 @@ Host.address = M.net.IPAddress{required=true, addr='ipaddr'}
Host.canonical = M.String{required=true, ui_name='Canonical name'}
Host.alias = M.Set{
type=M.String,
- be_mode=M.addr.special.enum_keys,
+ be_mode='enumerate',
ui_name='Aliases',
ui_member='Alias',
detail=false
@@ -23,13 +23,13 @@ local Resolv = M.new()
Resolv.servers = M.List{
type=M.net.IPAddress,
addr='nameserver',
- be_mode=M.addr.special.enum_keys,
+ be_mode='enumerate',
widget='inline'
}
Resolv.search_domains = M.List{
type=M.String,
addr='search/domain',
- be_mode=M.addr.special.enum_keys,
+ be_mode='enumerate',
widget='inline'
}
@@ -255,16 +255,16 @@ Net.resolver = M.Model{
Net.enabled_ifaces = M.Set{
type=M.Reference{scope='../interfaces', addr='*/*', on_delete='set-null'},
addr=iface_aug_addr..'/auto',
- be_mode=M.addr.special.enum_keys,
+ be_mode='enumerate',
visible=false
}
Net.interfaces = M.Collection{
type=Interface,
addr=iface_aug_addr..'/iface',
be_mode={
- ['.']=M.addr.special.value_equals(),
- ['*']=M.addr.special.value_equals('family'),
- ['*/link']=M.addr.special.value_equals('method')
+ ['.']='value',
+ ['*']='child-value:family',
+ ['*/link']='child-value:method'
},
widget='inline'
}
diff --git a/aconf/modules/openssh.lua b/aconf/modules/openssh.lua
index 4592c71..c1db8b9 100644
--- a/aconf/modules/openssh.lua
+++ b/aconf/modules/openssh.lua
@@ -17,7 +17,7 @@ SshKey.type = M.String{
{'ssh-rsa', 'ssh-rsa'}
}
}
-SshKey.key = M.String{be_mode=M.addr.special.value}
+SshKey.key = M.String{be_mode='parent-value'}
SshKey.comment = M.String
local Sshd = M.service('sshd')
@@ -36,7 +36,7 @@ Sshd.agent_forward = M.Boolean{
Sshd.root_auth_keys = M.List{
type=SshKey,
addr='/augeas/root/.ssh/authorized_keys/key',
- be_mode=M.addr.special.enum_keys,
+ be_mode='enumerate',
ui_name='Root login keys',
ui_member='Key'
}