From 23613ea3bc6ca862c876d701c689ec8b92efaefa Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Tue, 25 Mar 2014 09:19:21 +0200
Subject: model: dedicated file for audit trail

---
 Makefile            |  3 ++-
 aconf/model/aaa.lua | 17 +++++++++--------
 config/aaa.json     |  1 -
 config/audit.json   |  1 +
 config/auth.json    |  1 +
 5 files changed, 13 insertions(+), 10 deletions(-)
 delete mode 100644 config/aaa.json
 create mode 100644 config/audit.json
 create mode 100644 config/auth.json

diff --git a/Makefile b/Makefile
index 7ac47e2..feb0c3e 100644
--- a/Makefile
+++ b/Makefile
@@ -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/aaa.json b/config/aaa.json
deleted file mode 100644
index a182371..0000000
--- a/config/aaa.json
+++ /dev/null
@@ -1 +0,0 @@
-{"users":{"admin":{"password":"sha256$MVxudi8b1F8n$b42ec168b4bb9e893d3d666807d9fed0b0d05cfef5b0dc53984f58443531d56a","superuser":true}}}
\ No newline at end of file
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/auth.json b/config/auth.json
new file mode 100644
index 0000000..a182371
--- /dev/null
+++ b/config/auth.json
@@ -0,0 +1 @@
+{"users":{"admin":{"password":"sha256$MVxudi8b1F8n$b42ec168b4bb9e893d3d666807d9fed0b0d05cfef5b0dc53984f58443531d56a","superuser":true}}}
\ No newline at end of file
-- 
cgit v1.2.3