diff options
Diffstat (limited to 'acf/modules')
-rw-r--r-- | acf/modules/aaa.lua | 6 | ||||
-rw-r--r-- | acf/modules/awall.lua | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/acf/modules/aaa.lua b/acf/modules/aaa.lua index 23cb6df..e98e686 100644 --- a/acf/modules/aaa.lua +++ b/acf/modules/aaa.lua @@ -8,18 +8,18 @@ module(..., package.seeall) local M = require('acf.model') Role = M.new() -Role.permissions = M.Collection{type=M.Reference{scope='../../../permissions'}} +Role.permissions = M.Set{type=M.Reference{scope='../../../permissions'}} User = M.new() User.password = M.String User.real_name = M.String -User.roles = M.Collection{type=M.Reference{scope='../../../roles'}} +User.roles = M.Set{type=M.Reference{scope='../../../roles'}} function User:check_password(password) return password == self.password end Authentication = M.new() Authentication.users = M.Collection{type=User} Authentication.roles = M.Collection{type=Role} -Authentication.permissions = M.PrimitiveList{type=M.String} +Authentication.permissions = M.Set{type=M.String} M.register('auth', '/json'..require('lfs').currentdir()..'/config/aaa.json', diff --git a/acf/modules/awall.lua b/acf/modules/awall.lua index dbb335a..2920bdb 100644 --- a/acf/modules/awall.lua +++ b/acf/modules/awall.lua @@ -55,8 +55,8 @@ Service['icmp-type'] = M.String -- TODO fw zone Zone = M.new() -Zone.iface = M.PrimitiveList{type=M.String} -Zone.addr = M.PrimitiveList{type=M.String} +Zone.iface = M.Set{type=M.String} +Zone.addr = M.Set{type=M.String} Zone['route-back'] = M.Boolean{default=false} LogClass = M.new() |