updated settings

diff --git a/hourglass.conf b/hourglass.conf
index 7a9bfe2ab5fa4403b030fe5a20db31ef9fc2e3e7..838e1374b631fd0e494bef1e148af3574f5b02a9 100644 (file)
--- a/hourglass.conf
+++ b/hourglass.conf
@@ -1,23 +1,23 @@
 ; Hourglass site configuration
-libc = /lib/x86_64-linux-gnu/libc.so.6
-
 listener.net = 192.168.255
 listener.ports = 80 443
 listener.activity.dir = activity
 listener.tap = hourglass
-listener.tundev = /dev/net/tun
 
 control.action = ipset-control.lsp
-control.activity.gap = 10
-control.activity.clip = 1000
 control.dat = control.dat
 control.net = 10.0.0.0/8
 control.extra.dat = control-extra.dat
 control.usage.dat = usage.dat
 control.usage.tmp = .usage.dat
+control.activity.gap = 10
+control.activity.clip = 1000
 
 ipset.bin = /sbin/ipset
 ipset.table = TIMO
 
 wui.port = 1070
 wui.passwd = .htpassswd
+
+libc = /lib/x86_64-linux-gnu/libc.so.6
+tundev = /dev/net/tun

diff --git a/listener.lsp b/listener.lsp
index ceefed46da0b86bfec0e5549aebce86f6b9f9e40..6652ed456c22f928cd2d7df78fbeb98ebd1aa263 100644 (file)
--- a/listener.lsp
+++ b/listener.lsp
@@ -36,7 +36,7 @@
  'listener-log-ip SITE:listener.ip
  'IFNAME SITE:listener.tap
  'PORTS SITE:listener.ports
- 'IFD (open SITE:listener.tundev "u")
+ 'IFD (open SITE:tundev "u")
  'ACTNAMEFMT "%d%02d%02d-network.dat"
  'ACTDIR SITE:listener.activity.dir
  'ACTFILEFMT (format "%s/%s" ACTDIR ACTNAMEFMT )

diff --git a/siteconfig.lsp b/siteconfig.lsp
index 6c229c958cdaa0a4689f1b9cefd946b2e46d0b07..1050918a475f7621b20948b04c1273eef41398ab 100644 (file)
--- a/siteconfig.lsp
+++ b/siteconfig.lsp
@@ -11,19 +11,28 @@
 (constant
  'FILE "hourglass.conf"
  'KEYS '(
-         ("libc" set)
          ("listener.ports" set-ints)
          ("listener.ip" set)
          ("listener.activity.dir" set)
+         ("listener.tap" set)
+
          ("control.action" set)
          ("control.dat" set)
          ("control.net" set)
          ("control.extra.dat" set)
          ("control.usage.dat" set)
          ("control.usage.tmp" set)
+         ("control.activity.gap" set-int)
+         ("control.activity.clip" set)
 
+         ("ipset.bin" set)
+         ("ipset.table" set)
+         
          ("wui.port" set-int)
          ("wui.passwd" set)
+
+         ("libc" set)
+         ("tundev" set)
          )
  )