diff options
author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2014-03-25 09:19:21 +0200 |
---|---|---|
committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2014-03-25 09:27:31 +0200 |
commit | 23613ea3bc6ca862c876d701c689ec8b92efaefa (patch) | |
tree | f3541eebc3936f346b87f0776cc625c7627c50bf | |
parent | 54861e9f2546d5d1b07795992c99f69e9608118c (diff) | |
download | aconf-23613ea3bc6ca862c876d701c689ec8b92efaefa.tar.bz2 aconf-23613ea3bc6ca862c876d701c689ec8b92efaefa.tar.xz |
model: dedicated file for audit trail
-rw-r--r-- | Makefile | 3 | ||||
-rw-r--r-- | aconf/model/aaa.lua | 17 | ||||
-rw-r--r-- | config/audit.json | 1 | ||||
-rw-r--r-- | config/auth.json (renamed from config/aaa.json) | 0 |
4 files changed, 12 insertions, 9 deletions
@@ -44,7 +44,8 @@ $(eval $(call link,aconf,$(luadir))) $(eval $(call rcopy,aconf,$(luadir),lua,-not -path 'aconf/modules/demo-*')) $(eval $(call link,config,$(confdir))) -$(eval $(call copy,config,$(confdir),aaa.json,600)) +$(eval $(call copy,config,$(confdir),audit.json,600)) +$(eval $(call copy,config,$(confdir),auth.json,600)) $(eval $(call copy,.,$(resdir),LICENSE)) diff --git a/aconf/model/aaa.lua b/aconf/model/aaa.lua index f956d9e..203b85c 100644 --- a/aconf/model/aaa.lua +++ b/aconf/model/aaa.lua @@ -10,6 +10,9 @@ local object = require('aconf.object') local digest = require('crypto').digest +local conf_addr = '/json'..require('posix').getcwd()..'/config' + + local Role = M.new() Role.permissions = M.Set{type=M.Reference{scope='../../../permissions'}} @@ -77,7 +80,11 @@ Aaa.users = M.Collection{type=User} Aaa.roles = M.Collection{type=Role} Aaa.permissions = M.Set{type=M.String, addr='/volatile/aaa/permissions'} Aaa.audit_trail = M.List{ - type=Record, editable=false, ui_name='Audit trail', ui_member='Record' + type=Record, + addr=conf_addr..'/audit.json', + editable=false, + ui_name='Audit trail', + ui_member='Record' } Aaa.action_log = M.List{type=Record, addr=node.null_addr, visible=false} @@ -90,12 +97,6 @@ function Aaa:validate() end -M.register( - 'aaa', - Aaa, - { - addr='/json'..require('posix').getcwd()..'/config/aaa.json', ui_name='AAA' - } -) +M.register('aaa', Aaa, {addr=conf_addr..'/auth.json', ui_name='AAA'}) M.permission.defaults('/aaa') diff --git a/config/audit.json b/config/audit.json new file mode 100644 index 0000000..fe51488 --- /dev/null +++ b/config/audit.json @@ -0,0 +1 @@ +[] diff --git a/config/aaa.json b/config/auth.json index a182371..a182371 100644 --- a/config/aaa.json +++ b/config/auth.json |