From 0046dee0ba7a31f1c7f3f98ee1615b683f6038b4 Mon Sep 17 00:00:00 2001 From: Ralph Ronnquist Date: Sun, 2 Jan 2022 16:08:52 +1100 Subject: [PATCH] moved GAP and CLIP to be site conf --- control-logic.lsp | 7 ++----- hourglass.conf | 2 ++ manager/tmpl/controls-form.html | 16 ---------------- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/control-logic.lsp b/control-logic.lsp index d75a913..bdf291d 100644 --- a/control-logic.lsp +++ b/control-logic.lsp @@ -27,6 +27,8 @@ DAY (list YEAR MONTH DATE) HM (list HOUR MINUTE) TOTAL '() + GAP SITE:control.activity.gap + CLIP SITE:control.activity.clip ) # Load CONTROL.DAT @@ -40,11 +42,6 @@ (list DOW (6 30) 120 (20 0))) ) -(setf - GAP (or (lookup 'gap CONTROL) 15) - CLIP (or (lookup 'clip CONTROL) 1000) - ) - # Load the configured control mechanism (if (lookup 'control CONTROL) (load $it) (die "** Unknown control mechanism. Exiting!!")) diff --git a/hourglass.conf b/hourglass.conf index c424ffb..7a9bfe2 100644 --- a/hourglass.conf +++ b/hourglass.conf @@ -8,6 +8,8 @@ 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 diff --git a/manager/tmpl/controls-form.html b/manager/tmpl/controls-form.html index 84b2611..e048b00 100644 --- a/manager/tmpl/controls-form.html +++ b/manager/tmpl/controls-form.html @@ -55,22 +55,6 @@ -
-
- - idle minutes between activity sessions. -
-
- - networks packets in a minute, to count as activity. -
-
-- 2.39.2