From: Ralph Ronnquist <ralph.ronnquist@gmail.com>
Date: Mon, 3 Jan 2022 13:43:55 +0000 (+1100)
Subject: updated settings
X-Git-Tag: 0.1~14
X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=166ca47a44dbbe5461c389e6e5b2fe06da049339;p=rrq%2Fhourglass.git

updated settings
---

diff --git a/hourglass.conf b/hourglass.conf
index 7a9bfe2..838e137 100644
--- 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 ceefed4..6652ed4 100644
--- 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 6c229c9..1050918 100644
--- 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)
          )
  )